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.172 by root, Tue Apr 25 09:52:04 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
241sub children { 277sub children {
242} 278}
243 279
244sub set_max_size { 280sub set_max_size {
245 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
246 282
247 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
249} 285}
250 286
251# return top left coordinates 287sub set_tooltip {
252sub _topleft {
253 my ($self, $x, $y) = @_; 288 my ($self, $tooltip) = @_;
254 289
255 $self->{parent} 290 $self->{tooltip} = $tooltip;
256 or Carp::confess "no parent widget in _topleft\n";#d#
257 291
258 $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 }
259} 296}
260 297
261# translate global coordinates to local coordinate system 298# translate global coordinates to local coordinate system
262sub coord2local { 299sub coord2local {
263 my ($self, $x, $y) = @_; 300 my ($self, $x, $y) = @_;
264 301
265 my ($X, $Y) = $self->_topleft; 302 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266 ($x - $X, $y - $Y)
267} 303}
268 304
269# translate local coordinates to global coordinate system 305# translate local coordinates to global coordinate system
270sub coord2global { 306sub coord2global {
271 my ($self, $x, $y) = @_; 307 my ($self, $x, $y) = @_;
272 308
273 my ($X, $Y) = $self->_topleft; 309 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274 ($x + $X, $y + $Y)
275} 310}
276 311
277sub focus_in { 312sub focus_in {
278 my ($self) = @_; 313 my ($self) = @_;
279 314
… …
351 glVertex $self->{w}, 0; 386 glVertex $self->{w}, 0;
352 glVertex $self->{w}, $self->{h}; 387 glVertex $self->{w}, $self->{h};
353 glVertex 0 , $self->{h}; 388 glVertex 0 , $self->{h};
354 glEnd; 389 glEnd;
355 glPopMatrix; 390 glPopMatrix;
356 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;
357 } 392 }
358} 393}
359 394
360sub _draw { 395sub _draw {
361 my ($self) = @_; 396 my ($self) = @_;
… …
377 412
378sub set_parent { 413sub set_parent {
379 my ($self, $parent) = @_; 414 my ($self, $parent) = @_;
380 415
381 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};
382} 421}
383 422
384sub check_size { 423sub check_size {
385 my ($self) = @_; 424 my ($self, $forced) = @_;
386 425
387 $self->{parent} 426 $self->{force_alloc} = 1 if $forced;
388 or return 1; 427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
395 $self->{req_w} = $w;
396 $self->{req_h} = $h;
397
398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
407 }
408} 428}
409 429
410sub update { 430sub update {
411 my ($self) = @_; 431 my ($self) = @_;
412 432
… …
427} 447}
428 448
429sub DESTROY { 449sub DESTROY {
430 my ($self) = @_; 450 my ($self) = @_;
431 451
452 delete $WIDGET{$self+0};
432 #$self->deactivate; 453 #$self->deactivate;
433} 454}
434 455
435############################################################################# 456#############################################################################
436 457
… …
445 my $class = shift; 466 my $class = shift;
446 467
447 # range [value, low, high, page] 468 # range [value, low, high, page]
448 469
449 $class->SUPER::new ( 470 $class->SUPER::new (
450 bg => [0, 0, 0, 0.2], 471 #bg => [0, 0, 0, 0.2],
451 active_bg => [1, 1, 1, 0.5], 472 #active_bg => [1, 1, 1, 0.5],
452 @_ 473 @_
453 ) 474 )
454} 475}
455 476
456sub _draw { 477sub _draw {
457 my ($self) = @_; 478 my ($self) = @_;
458 479
480 my $color = $FOCUS == $self && $self->{active_bg}
481 ? $self->{active_bg}
482 : $self->{bg};
483
484 if ($color && (@$color < 4 || $color->[3])) {
459 my ($w, $h) = @$self{qw(w h)}; 485 my ($w, $h) = @$self{qw(w h)};
460 486
461 glEnable GL_BLEND; 487 glEnable GL_BLEND;
462 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
463 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 489 glColor @$color;
464 490
465 glBegin GL_QUADS; 491 glBegin GL_QUADS;
466 glVertex 0 , 0; 492 glVertex 0 , 0;
467 glVertex 0 , $h; 493 glVertex 0 , $h;
468 glVertex $w, $h; 494 glVertex $w, $h;
469 glVertex $w, 0; 495 glVertex $w, 0;
470 glEnd; 496 glEnd;
471 497
472 glDisable GL_BLEND; 498 glDisable GL_BLEND;
499 }
473} 500}
474 501
475############################################################################# 502#############################################################################
476 503
477package CFClient::UI::Empty; 504package CFClient::UI::Empty;
… …
509 536
510 $self 537 $self
511} 538}
512 539
513sub add { 540sub add {
514 my ($self, $child) = @_; 541 my ($self, @widgets) = @_;
515 542
516 $child->set_parent ($self); 543 $_->set_parent ($self)
544 for @widgets;
517 545
518 use sort 'stable'; 546 use sort 'stable';
519 547
520 $self->{children} = [ 548 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 549 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 550 @{$self->{children}}, @widgets
523 ]; 551 ];
524 552
525 $child->check_size; 553 $self->check_size (1);
554 $self->update;
526} 555}
527 556
528sub children { 557sub children {
529 @{ $_[0]{children} } 558 @{ $_[0]{children} }
530} 559}
… …
549 578
550 for (@$children) { 579 for (@$children) {
551 delete $_->{parent}; 580 delete $_->{parent};
552 $_->hide; 581 $_->hide;
553 } 582 }
583
584 $self->check_size;
585 $self->update;
554} 586}
555 587
556sub find_widget { 588sub find_widget {
557 my ($self, $x, $y) = @_; 589 my ($self, $x, $y) = @_;
558 590
… …
633} 665}
634 666
635sub update { 667sub update {
636 my ($self) = @_; 668 my ($self) = @_;
637 669
638 # we want to do this delayed... 670 $ROOT->on_post_alloc ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 671 $self->SUPER::update;
641}
642
643sub render_chld {
644 my ($self) = @_;
645
646 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647 glClearColor 0, 0, 0, 1;
648 glClear GL_COLOR_BUFFER_BIT;
649 $self->child->draw;
650 };
651} 672}
652 673
653sub size_allocate { 674sub size_allocate {
654 my ($self, $w, $h) = @_; 675 my ($self, $w, $h) = @_;
655 676
656 $self->child->configure (0, 0, $w, $h); 677 $self->SUPER::size_allocate ($w, $h);
678 $self->update;
679}
657 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
658 $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 };
659} 701}
660 702
661sub _draw { 703sub _draw {
662 my ($self) = @_; 704 my ($self) = @_;
663 705
664 my ($w, $h) = ($self->w, $self->h); 706 my ($w, $h) = ($self->w, $self->h);
665 707
666 my $tex = $self->{texture} 708 my $tex = $self->{texture}
667 or return; 709 or return;
668 710
669 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 711 glEnable GL_TEXTURE_2D;
672 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;
673 714
674 $tex->draw_quad (0, 0, $w, $h); 715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675 716
676 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 717 glDisable GL_TEXTURE_2D;
678} 718}
679 719
680############################################################################# 720#############################################################################
681 721
682package CFClient::UI::ViewPort; 722package CFClient::UI::ViewPort;
683 723
684our @ISA = CFClient::UI::Window::; 724our @ISA = CFClient::UI::Window::;
685 725
686sub new { die }
687
688sub size_request { 726sub size_request {
689 my ($self) = @_; 727 my ($self) = @_;
690 728
691 @$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)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
693 731
694 @$self{qw(child_w child_h)} 732 @$self{qw(child_w child_h)}
695} 733}
696 734
697sub _draw { 735sub size_allocate {
698 my ($self) = @_; 736 my ($self, $w, $h) = @_;
699 737
700 $self->{children}[1]->draw; 738 $self->update;
701} 739}
702 740
741sub set_offset {
742 my ($self, $x, $y) = @_;
703 743
704############################################################################# 744 $self->{view_x} = int $x;
745 $self->{view_y} = int $y;
705 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
706package CFClient::UI::Frame; 788package CFClient::UI::ScrolledWindow;
707 789
708our @ISA = CFClient::UI::Bin::; 790our @ISA = CFClient::UI::HBox::;
709
710use CFClient::OpenGL;
711 791
712sub new { 792sub new {
713 my $class = shift; 793 my $class = shift;
714 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
715 my $self = $class->SUPER::new ( 805 $self = $class->SUPER::new (
716 bg => [1, 1, 1, 1], 806 vp => (new CFClient::UI::ViewPort),
717 border_bg => [1, 1, 1, 1], 807 slider => $slider,
718 border => 0.8,
719 @_ 808 @_,
720 ); 809 );
721 810
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider});
814
722 $self 815 $self
723} 816}
724 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
725sub _draw { 838sub _draw {
726 my ($self) = @_; 839 my ($self) = @_;
727 840
728 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
729 843
730 glEnable GL_BLEND; 844 glEnable GL_BLEND;
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
732 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734 847
735# glBegin GL_QUADS; 848 glBegin GL_QUADS;
736# glColor 0, 0, 0, 0;
737# glVertex 0 , 0; 849 glVertex 0 , 0;
738# glVertex 0 , $h; 850 glVertex 0 , $h;
739# glVertex $w, $h; 851 glVertex $w, $h;
740# glVertex $w, 0; 852 glVertex $w, 0;
741# glEnd; 853 glEnd;
742 854
743
744 $self->child->draw;
745 glDisable GL_BLEND; 855 glDisable GL_BLEND;
746 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
747} 859}
748 860
749############################################################################# 861#############################################################################
750 862
751package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
764 # TODO: user_x, user_y, overwrite moveto? 876 # TODO: user_x, user_y, overwrite moveto?
765 877
766 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
769 border => 0.8, 881 border => 0.6,
882 toplevel => 1,
770 can_events => 1, 883 can_events => 1,
771 @_ 884 @_
772 ); 885 );
773 886
774 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
775 align => 0, 888 align => 0,
776 valign => 1, 889 valign => 1,
777 text => $self->{title}, 890 text => $self->{title},
778 fontsize => 1; 891 fontsize => $self->{border};
779 892
780 $self 893 $self
781} 894}
782 895
783sub border { 896sub border {
… …
799 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
800 913
801 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
802 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
803 916
804 $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)
805 if $self->{title}; 918 if $self->{title};
806 919
807 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
808} 921}
809 922
810sub button_down { 923sub button_down {
811 my ($self, $ev, $x, $y) = @_; 924 my ($self, $ev, $x, $y) = @_;
812 925
926 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 927 my $border = $self->border;
814 928
815 if ($x < $self->{w} && $x >= $self->{w} - $border 929 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 930 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 931
932 if ($lr & $td) {
933 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 934 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 935 my ($bw, $bh) = ($self->{w}, $self->{h});
820 936
937 my $mx = $x < $border;
938 my $my = $y < $border;
939
821 $self->{motion} = sub { 940 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 941 my ($ev, $x, $y) = @_;
823 942
824 ($x, $y) = ($ev->{x}, $ev->{y}); 943 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy;
825 945
826 $self->{user_w} = $bw + $x - $ox; 946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
827 $self->{user_h} = $bh + $y - $oy; 947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
828 $self->check_size; 949 $self->check_size;
829 }; 950 };
830 951
831 } elsif ($x >= 0 && $x < $self->{w} 952 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 953 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 954 my ($bx, $by) = ($self->{x}, $self->{y});
836 955
837 $self->{motion} = sub { 956 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 957 my ($ev, $x, $y) = @_;
… …
861 my ($self) = @_; 980 my ($self) = @_;
862 981
863 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
864 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
865 984
866 glEnable GL_BLEND;
867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870 987
871 my $border = $self->border; 988 my $border = $self->border;
872 989
873 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
874 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
878 995
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
879 my $bg = $tex[0]; 997 my $bg = $tex[0];
880 998
881 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 1000 my $rep_x = $cw / $bg->{w};
883 my $rep_y = $ch / $bg->{h}; 1001 my $rep_y = $ch / $bg->{h};
884 1002
885 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
886 1004
887 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
891 1010
892 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND;
894 1012
895 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
1014
896 $self->child->draw; 1015 $self->child->draw;
897} 1016}
898 1017
899############################################################################# 1018#############################################################################
900 1019
… …
1124} 1243}
1125 1244
1126sub size_allocate { 1245sub size_allocate {
1127 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h) = @_;
1128 1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1129 my $children = $self->{children}; 1250 my $children = $self->{children};
1130 1251
1131 my @h = map $_->{req_h}, @$children; 1252 my @h = map $_->{req_h}, @$children;
1132 1253
1133 my $req_h = List::Util::sum @h; 1254 my $req_h = List::Util::sum @h;
… …
1162 1283
1163############################################################################# 1284#############################################################################
1164 1285
1165package CFClient::UI::Label; 1286package CFClient::UI::Label;
1166 1287
1167our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1168 1289
1169use CFClient::OpenGL; 1290use CFClient::OpenGL;
1170 1291
1171sub new { 1292sub new {
1172 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1173 1294
1174 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1175 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1176 #font => default_font 1299 #font => default_font
1300 #text => initial text
1301 #markup => initial narkup
1302 layout => (new CFClient::Layout),
1177 fontsize => 1, 1303 fontsize => 1,
1178 text => "",
1179 align => -1, 1304 align => -1,
1180 valign => -1, 1305 valign => -1,
1181 padding => 2, 1306 padding => 2,
1182 layout => new CFClient::Layout,
1183 can_events => 0, 1307 can_events => 0,
1184 %arg 1308 %arg
1185 ); 1309 );
1186 1310
1187 if (exists $self->{template}) { 1311 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout; 1312 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template}); 1313 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout; 1314 $self->{template} = $layout;
1191 } 1315 }
1192 1316
1193 $self->set_text (delete $self->{text}) if exists $self->{text}; 1317 if (exists $self->{markup}) {
1194 $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 }
1195 1322
1196 $self 1323 $self
1197} 1324}
1198 1325
1199sub escape { 1326sub escape($) {
1200 local $_ = $_[1]; 1327 local $_ = $_[0];
1201 1328
1202 s/&/&amp;/g; 1329 s/&/&amp;/g;
1203 s/>/&gt;/g; 1330 s/>/&gt;/g;
1204 s/</&lt;/g; 1331 s/</&lt;/g;
1205 1332
1206 $_[1] 1333 $_
1334}
1335
1336sub update {
1337 my ($self) = @_;
1338
1339 delete $self->{texture};
1340 $self->SUPER::update;
1207} 1341}
1208 1342
1209sub set_text { 1343sub set_text {
1210 my ($self, $text) = @_; 1344 my ($self, $text) = @_;
1211 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;
1212 $self->{layout}->set_text ($text); 1350 $self->{layout}->set_text ($text);
1213 1351
1214 delete $self->{texture}; 1352 $self->update;
1215 $self->check_size; 1353 $self->check_size;
1216 $self->update;
1217} 1354}
1218 1355
1219sub set_markup { 1356sub set_markup {
1220 my ($self, $markup) = @_; 1357 my ($self, $markup) = @_;
1221 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;
1222 $self->{layout}->set_markup ($markup); 1365 $self->{layout}->set_markup ($markup);
1223 1366
1224 delete $self->{texture}; 1367 $self->update;
1225 $self->check_size; 1368 $self->check_size;
1226 $self->update;
1227} 1369}
1228 1370
1229sub size_request { 1371sub size_request {
1230 my ($self) = @_; 1372 my ($self) = @_;
1231 1373
… …
1260sub set_fontsize { 1402sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1262 1404
1263 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1265 $self->check_size; 1409 $self->check_size;
1266 $self->update;
1267} 1410}
1268 1411
1269sub _draw { 1412sub _draw {
1270 my ($self) = @_; 1413 my ($self) = @_;
1271 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1272 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1273 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1274 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1275 $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
1276 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
1277 }; 1434 };
1278 1435
1279 glEnable GL_BLEND;
1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283 1438
1439 if ($tex->{format} == GL_ALPHA) {
1284 glColor @{$self->{fg}}; 1440 glColor @{$self->{fg}};
1285
1286 $self->{ox} = int (
1287 $self->{align} < 0 ? $self->{padding}
1288 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1289 : ($self->{w} - $tex->{w}) * 0.5
1290 );
1291
1292 $self->{oy} = int (
1293 $self->{valign} < 0 ? $self->{padding}
1294 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1295 : ($self->{h} - $tex->{h}) * 0.5
1296 );
1297
1298 $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 }
1299 1445
1300 glDisable GL_TEXTURE_2D; 1446 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302} 1447}
1303 1448
1304############################################################################# 1449#############################################################################
1305 1450
1306package CFClient::UI::EntryBase; 1451package CFClient::UI::EntryBase;
… …
1341 $self->{layout}->set_text ("$text "); 1486 $self->{layout}->set_text ("$text ");
1342 1487
1343 $self->emit (changed => $self->{text}); 1488 $self->emit (changed => $self->{text});
1344} 1489}
1345 1490
1346sub get_text {
1347 $_[0]{text}
1348}
1349
1350sub size_request {
1351 my ($self) = @_;
1352
1353 my ($w, $h) = $self->SUPER::size_request;
1354
1355 ($w + 1, $h) # add 1 for cursor
1356}
1357
1358sub size_allocate {
1359 my ($self, $w, $h) = @_;
1360
1361 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1362}
1363
1364sub set_text { 1491sub set_text {
1365 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1366 1493
1367 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1368 $self->_set_text ($text); 1495 $self->_set_text ($text);
1369 $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
1370} 1516}
1371 1517
1372sub key_down { 1518sub key_down {
1373 my ($self, $ev) = @_; 1519 my ($self, $ev) = @_;
1374 1520
… …
1376 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1377 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1378 1524
1379 my $text = $self->get_text; 1525 my $text = $self->get_text;
1380 1526
1381 if ($sym == 8) { 1527 if ($uni == 8) {
1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1384 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1385 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1386 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1387 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1388 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1389 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1390 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1391 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1392 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1393 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1394 $self->emit ('escape'); 1540 $self->emit ('escape');
1395 } elsif ($uni) { 1541 } elsif ($uni) {
1396 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1397 } 1543 }
1398 1544
1399 $self->_set_text ($text); 1545 $self->_set_text ($text);
1400 $self->update; 1546 $self->update;
1547 $self->check_size;
1401} 1548}
1402 1549
1403sub focus_in { 1550sub focus_in {
1404 my ($self) = @_; 1551 my ($self) = @_;
1405 1552
… …
1534 my $class = shift; 1681 my $class = shift;
1535 1682
1536 $class->SUPER::new ( 1683 $class->SUPER::new (
1537 padding => 4, 1684 padding => 4,
1538 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1539 bg => [1, 1, 1, 0.2],
1540 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1541 can_hover => 1, 1687 can_hover => 1,
1542 align => 0, 1688 align => 0,
1543 valign => 0, 1689 valign => 0,
1544 can_events => 1, 1690 can_events => 1,
… …
1562 1708
1563 if ($GRAB == $self) { 1709 if ($GRAB == $self) {
1564 $self->{fg} = $self->{active_fg}; 1710 $self->{fg} = $self->{active_fg};
1565 } 1711 }
1566 1712
1567 glEnable GL_BLEND;
1568 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569 glEnable GL_TEXTURE_2D; 1713 glEnable GL_TEXTURE_2D;
1570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571 glColor 0, 0, 0, 1; 1715 glColor 0, 0, 0, 1;
1572 1716
1573 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1717 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574 1718
1575 glDisable GL_TEXTURE_2D; 1719 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577 1720
1578 $self->SUPER::_draw; 1721 $self->SUPER::_draw;
1579} 1722}
1580 1723
1581############################################################################# 1724#############################################################################
… …
1595 1738
1596 $class->SUPER::new ( 1739 $class->SUPER::new (
1597 padding => 2, 1740 padding => 2,
1598 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1599 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],
1600 state => 0, 1745 state => 0,
1601 can_hover => 1, 1746 can_hover => 1,
1602 @_ 1747 @_
1603 ) 1748 )
1604} 1749}
… …
1628 1773
1629 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;
1630 1775
1631 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632 1777
1633 glEnable GL_BLEND; 1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1634 glEnable GL_TEXTURE_2D; 1780 glEnable GL_TEXTURE_2D;
1635 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636
1637 my $tex = $self->{state} ? $tex[1] : $tex[0];
1638
1639 $tex->draw_quad (0, 0, $s, $s); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1642 glDisable GL_BLEND;
1643} 1783}
1644 1784
1645############################################################################# 1785#############################################################################
1646 1786
1647package CFClient::UI::Image; 1787package CFClient::UI::Image;
… …
1690 glTranslate 0, -$self->{w}, 0; 1830 glTranslate 0, -$self->{w}, 0;
1691 1831
1692 ($w, $h) = ($h, $w); 1832 ($w, $h) = ($h, $w);
1693 } 1833 }
1694 1834
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699 1837
1700 $tex->draw_quad (0, 0, $w, $h); 1838 $tex->draw_quad_alpha (0, 0, $w, $h);
1701 1839
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1704} 1841}
1705 1842
1706############################################################################# 1843#############################################################################
1707 1844
… …
1755} 1892}
1756 1893
1757sub set_max { 1894sub set_max {
1758 my ($self, $max) = @_; 1895 my ($self, $max) = @_;
1759 1896
1897 return if $self->{max_val} == $max;
1898
1760 $self->{max_val} = $max; 1899 $self->{max_val} = $max;
1900 $self->update;
1761} 1901}
1762 1902
1763sub set_value { 1903sub set_value {
1764 my ($self, $val, $max) = @_; 1904 my ($self, $val, $max) = @_;
1765 1905
1766 $self->set_max ($max) 1906 $self->set_max ($max)
1767 if defined $max; 1907 if defined $max;
1768 1908
1769 $max = $self->{max_val}; 1909 return if $self->{val} == $val;
1910
1770 $self->{val} = $val; 1911 $self->{val} = $val;
1771
1772 $self->update; 1912 $self->update;
1773} 1913}
1774 1914
1775sub _draw { 1915sub _draw {
1776 my ($self) = @_; 1916 my ($self) = @_;
… …
1859 1999
1860 $self->{value}->set_fontsize ($fsize); 2000 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 2001 $self->{max} ->set_fontsize ($fsize);
1862} 2002}
1863 2003
2004sub set_max {
2005 my ($self, $max) = @_;
2006
2007 $self->{gauge}->set_max ($max);
2008 $self->{max}->set_text ($max);
2009}
2010
1864sub set_value { 2011sub set_value {
1865 my ($self, $val, $max) = @_; 2012 my ($self, $val, $max) = @_;
1866 2013
1867 $self->set_max ($max) 2014 $self->set_max ($max)
1868 if defined $max; 2015 if defined $max;
1869 2016
1870 $self->{gauge}->set_value ($val, $max); 2017 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 2018 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879} 2019}
1880 2020
1881############################################################################# 2021#############################################################################
1882 2022
1883package CFClient::UI::Slider; 2023package CFClient::UI::Slider;
… …
1893 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
1894 2034
1895sub new { 2035sub new {
1896 my $class = shift; 2036 my $class = shift;
1897 2037
1898 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
1899 2039
1900 # TODO: 0-width page 2040 # TODO: 0-width page
1901 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
1902 # TODO: calculations are off 2042 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
1905 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],
1906 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
1907 req_w => 20, 2049 req_w => $::WIDTH / 80,
1908 req_h => 20, 2050 req_h => $::WIDTH / 80,
1909 vertical => 0, 2051 vertical => 0,
1910 can_hover => 1, 2052 can_hover => 1,
1911 inner_pad => 5, 2053 inner_pad => .05,
1912 @_ 2054 @_
1913 ); 2055 );
1914 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
1915 $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 }
1916} 2084}
1917 2085
1918sub size_request { 2086sub size_request {
1919 my ($self) = @_; 2087 my ($self) = @_;
1920 2088
… …
1933 2101
1934sub mouse_motion { 2102sub mouse_motion {
1935 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
1936 2104
1937 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
1938 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
1939 2123
1940 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
1941 2125
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1944 2127
1945 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1946 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $value = $self->{scale} * ($value - $lo);
1947 $x = $lo if $x < $lo;
1948 $x = $hi - $page if $x > $hi - $page;
1949 $self->{range}[0] = $x;
1950 2130
1951 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
1952 $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;
1953 } 2138 });
1954}
1955 2139
1956# the inner_* stuff is for generating a padding for the slider handle, 2140 $self->SUPER::update;
1957# so that the handle doesn't leave the texture. This calculation isn't 100%
1958# correct propably, but it does the job for now
1959sub _calc_inner_pad_px {
1960 my ($self, $w) = @_;
1961 ($w / 100) * $self->{inner_pad} # % to pixels
1962} 2141}
1963 2142
1964sub _draw { 2143sub _draw {
1965 my ($self) = @_; 2144 my ($self) = @_;
1966 2145
1967 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
1968 2147
1969 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
1970 2149
1971 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
1972 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
1973 2152
1974 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
1975 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
1976
1977 ($w, $h) = ($h, $w);
1978 } 2155 }
1979 2156
1980 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1981 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1982 2159
1983 my ($value, $lo, $hi, $page) = @{$self->{range}};
1984
1985 $hi = $value + 1 if $lo == $hi;
1986
1987 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1988 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1989
1990 $page = int $page * $inner_w / ($hi - $lo);
1991 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1992
1993 $w -= $page;
1994 $page &= ~1;
1995 glTranslate $page * 0.5, 0, 0;
1996 $page ||= 2;
1997
1998 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000
2001 glEnable GL_BLEND;
2002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003 glEnable GL_TEXTURE_2D; 2160 glEnable GL_TEXTURE_2D;
2004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005 2162
2006 # draw background 2163 # draw background
2007 $tex[1]->draw_quad (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2008 2165
2009 # draw handle 2166 # draw handle
2010 $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);
2011 2168
2012 glDisable GL_BLEND;
2013 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
2014} 2170}
2015 2171
2016############################################################################# 2172#############################################################################
2017 2173
… …
2028 fontsize => 1, 2184 fontsize => 1,
2029 can_events => 0, 2185 can_events => 0,
2030 #font => default_font 2186 #font => default_font
2031 @_, 2187 @_,
2032 2188
2033 layout => (new CFClient::Layout), 2189 layout => (new CFClient::Layout 1),
2034 par => [], 2190 par => [],
2035 height => 0, 2191 height => 0,
2036 children => [ 2192 children => [
2037 (new CFClient::UI::Empty expand => 1), 2193 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2194 (new CFClient::UI::Slider vertical => 1),
2039 ], 2195 ],
2040 ); 2196 );
2041 2197
2042 $self->{children}[1]->connect (changed => sub { 2198 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2199
2046 $self 2200 $self
2047} 2201}
2048 2202
2049sub set_fontsize { 2203sub set_fontsize {
… …
2057 my ($self, $text) = @_; 2211 my ($self, $text) = @_;
2058 2212
2059 my $layout = $self->{layout}; 2213 my $layout = $self->{layout};
2060 2214
2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062 $layout->set_width ($self->{w}); 2216 $layout->set_width ($self->{children}[0]{w});
2063 $layout->set_text ($text); 2217 $layout->set_markup ($text);
2064 2218
2065 ($layout->size)[1] 2219 ($layout->size)[1]
2066} 2220}
2067 2221
2068sub reflow { 2222sub reflow {
… …
2106 2260
2107 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
2108 2262
2109 delete $self->{texture}; 2263 delete $self->{texture};
2110 2264
2111 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
2112 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
2113 my $height = 0; 2267 my $height = 0;
2114 2268
2115 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
2116 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2121 2275
2122 delete $self->{texture}; 2276 delete $self->{texture};
2123 } 2277 }
2124 2278
2125 $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 {
2126 glClearColor 0, 0, 0, 1; 2280 glClearColor 0, 0, 0, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2281 glClear GL_COLOR_BUFFER_BIT;
2128 2282
2129 glEnable GL_BLEND;
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D; 2283 glEnable GL_TEXTURE_2D;
2132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133 2285
2134 my $top = int $self->{children}[1]{range}[0]; 2286 my $top = int $self->{children}[1]{range}[0];
2135 2287
… …
2144 2296
2145 for my $par (@{$self->{par}}) { 2297 for my $par (@{$self->{par}}) {
2146 my $h = $par->[0]; 2298 my $h = $par->[0];
2147 2299
2148 if ($y0 < $y + $h && $y < $y1) { 2300 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2149 $layout->set_text ($par->[2]); 2302 $layout->set_markup ($par->[2]);
2150 2303
2151 glColor @{ $par->[1] };
2152 my ($W, $H) = $layout->size; 2304 my ($W, $H) = $layout->size;
2153 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);
2154 } 2306 }
2155 2307
2156 $y += $h; 2308 $y += $h;
2157 } 2309 }
2158 2310
2159 glDisable GL_TEXTURE_2D; 2311 glDisable GL_TEXTURE_2D;
2160 glDisable GL_BLEND;
2161 }; 2312 };
2162 }); 2313 });
2163} 2314}
2164 2315
2165sub _draw { 2316sub _draw {
2166 my ($self) = @_; 2317 my ($self) = @_;
2167 2318
2168 if ($self->{texture}) {
2169 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2321 glColor 1, 1, 1, 1;
2172 $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});
2173 glDisable GL_TEXTURE_2D; 2323 glDisable GL_TEXTURE_2D;
2174 }
2175 2324
2176 $self->{children}[1]->draw; 2325 $self->{children}[1]->draw;
2177 2326
2178} 2327}
2179 2328
… …
2273 @_, 2422 @_,
2274 can_events => 0, 2423 can_events => 0,
2275 ) 2424 )
2276} 2425}
2277 2426
2278sub set_markup { 2427sub set_tooltip_from {
2279 my ($self, $text) = @_; 2428 my ($self, $widget) = @_;
2280 2429
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2430 $self->add (new CFClient::UI::Label
2282 $self->{label}->set_markup ($text); 2431 markup => $widget->{tooltip},
2283 $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 );
2284} 2437}
2285 2438
2286sub size_request { 2439sub size_request {
2287 my ($self) = @_; 2440 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290 2441
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292 2443
2293 ($w + 4, $h + 4) 2444 ($w + 4, $h + 4)
2294} 2445}
… …
2300} 2451}
2301 2452
2302sub _draw { 2453sub _draw {
2303 my ($self) = @_; 2454 my ($self) = @_;
2304 2455
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2307 2457
2308 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2309 2459
2310 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2321 glVertex 0 , $h; 2471 glVertex 0 , $h;
2322 glVertex $w, $h; 2472 glVertex $w, $h;
2323 glVertex $w, 0; 2473 glVertex $w, 0;
2324 glEnd; 2474 glEnd;
2325 2475
2326 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2327
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2330} 2478}
2331 2479
2332############################################################################# 2480#############################################################################
2333 2481
… …
2348 2496
2349sub size_request { 2497sub size_request {
2350 (32, 8) 2498 (32, 8)
2351} 2499}
2352 2500
2353sub draw { 2501sub _draw {
2354 my ($self) = @_; 2502 my ($self) = @_;
2355 2503
2504 return unless $::CONN;#d# manage and cache textures differently
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357 2506
2507 # TODO animation
2358 if ($tex) { 2508 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2509 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1; 2511 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D; 2513 glDisable GL_TEXTURE_2D;
2366 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 @_,
2367 } 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;
2368} 2838}
2369 2839
2370############################################################################# 2840#############################################################################
2371 2841
2372package CFClient::UI::Root; 2842package CFClient::UI::Root;
2373 2843
2374our @ISA = CFClient::UI::Container::; 2844our @ISA = CFClient::UI::Container::;
2375 2845
2376use CFClient::OpenGL; 2846use CFClient::OpenGL;
2377 2847
2378sub check_size { 2848sub new {
2379 my ($self) = @_; 2849 my $class = shift;
2380 2850
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2851 $class->SUPER::new (
2382} 2852 @_,
2383 2853 )
2384sub size_request {
2385 ($::WIDTH, $::HEIGHT)
2386} 2854}
2387 2855
2388sub configure { 2856sub configure {
2389 my ($self, $x, $y, $w, $h) = @_; 2857 my ($self, $x, $y, $w, $h) = @_;
2390 2858
2391 $self->SUPER::configure ($x, $y, $w, $h); 2859 $self->{w} = $w;
2860 $self->{h} = $h;
2861}
2392 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
2393 for my $child (@{$self->{children}}) { 2885 for my $child ($self->children) {
2394 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)};
2395 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
2396 $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;
2397 $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
2398 $child->configure ($X, $Y, $W,$H); 2897 $child->configure ($X, $Y, $W, $H);
2399 } 2898 }
2400} 2899}
2401 2900
2402sub _topleft { 2901sub coord2local {
2403 my ($self, $x, $y) = @_; 2902 my ($self, $x, $y) = @_;
2404 2903
2405 ($x, $y) 2904 ($x, $y)
2406} 2905}
2407 2906
2907sub coord2global {
2908 my ($self, $x, $y) = @_;
2909
2910 ($x, $y)
2911}
2912
2408sub update { 2913sub update {
2409 my ($self) = @_; 2914 my ($self) = @_;
2410 2915
2411 $self->check_size; 2916 $self->check_size;
2412 ::refresh (); 2917 $::WANT_REFRESH++;
2413} 2918}
2414 2919
2415sub add { 2920sub add {
2416 my ($self, $child) = @_; 2921 my ($self, @children) = @_;
2417 2922
2923 for my $child (@children) {
2924 $child->{toplevel} = 1;
2925
2418 # integerize window positions 2926 # integerise window positions
2419 $child->{x} = int $child->{x}; 2927 $child->{x} = int $child->{x};
2420 $child->{y} = int $child->{y}; 2928 $child->{y} = int $child->{y};
2929 }
2421 2930
2422 $self->SUPER::add ($child); 2931 $self->SUPER::add (@children);
2423} 2932}
2424 2933
2425sub on_refresh { 2934sub on_refresh {
2426 my ($self, $id, $cb) = @_; 2935 my ($self, $id, $cb) = @_;
2427 2936
2428 $self->{refresh_hook}{$id} = $cb; 2937 $self->{refresh_hook}{$id} = $cb;
2429} 2938}
2430 2939
2940sub on_post_alloc {
2941 my ($self, $id, $cb) = @_;
2942
2943 $self->{post_alloc_hook}{$id} = $cb;
2944}
2945
2431sub draw { 2946sub draw {
2432 my ($self) = @_; 2947 my ($self) = @_;
2433 2948
2434 while (my $rcb = delete $self->{refresh_hook}) { 2949 while ($self->{refresh_hook}) {
2435 $_->() 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}};
2436 } 3002 }
2437 3003
2438 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3004 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440 glClear GL_COLOR_BUFFER_BIT; 3006 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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