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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.216 by root, Fri May 19 16:43:57 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 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 }
159
160 $widget->reconfigure;
127 } 161 }
128} 162}
129 163
130############################################################################# 164#############################################################################
131 165
… …
150 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
152 } 186 }
153 } 187 }
154 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
155 $self 191 $self
156} 192}
157 193
158sub destroy { 194sub destroy {
159 my ($self) = @_; 195 my ($self) = @_;
… …
224 $self->{y} = $y; 260 $self->{y} = $y;
225 $self->update; 261 $self->update;
226 } 262 }
227 263
228 if ($self->{w} != $w || $self->{h} != $h) { 264 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 266 }
235} 267}
236 268
237sub size_allocate { 269sub size_allocate {
238 # nothing to be done 270 # nothing to be done
239} 271}
240 272
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
241sub children { 280sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252} 281}
253 282
254sub set_max_size { 283sub set_max_size {
255 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
256 285
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
259} 288}
260 289
261# return top left coordinates 290sub set_tooltip {
262sub _topleft {
263 my ($self, $x, $y) = @_; 291 my ($self, $tooltip) = @_;
264 292
265 $self->{parent} 293 $self->{tooltip} = $tooltip;
266 or Carp::confess "no parent widget in _topleft\n";#d#
267 294
268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
269} 299}
270 300
271# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
272sub coord2local { 302sub coord2local {
273 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
274 304
275 my ($X, $Y) = $self->_topleft; 305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 306}
278 307
279# translate local coordinates to global coordinate system 308# translate local coordinates to global coordinate system
280sub coord2global { 309sub coord2global {
281 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
282 311
283 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 313}
286 314
287sub focus_in { 315sub focus_in {
288 my ($self) = @_; 316 my ($self) = @_;
289 317
… …
361 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
364 glEnd; 392 glEnd;
365 glPopMatrix; 393 glPopMatrix;
366 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
367 } 395 }
368} 396}
369 397
370sub _draw { 398sub _draw {
371 my ($self) = @_; 399 my ($self) = @_;
… …
387 415
388sub set_parent { 416sub set_parent {
389 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
390 418
391 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
392} 424}
393 425
394sub check_size { 426sub check_size {
395 my ($self) = @_; 427 my ($self, $forced) = @_;
396 428
397 $self->{parent} 429 $self->{force_alloc} = 1 if $forced;
398 or return 1; 430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418} 431}
419 432
420sub update { 433sub update {
421 my ($self) = @_; 434 my ($self) = @_;
422 435
… …
437} 450}
438 451
439sub DESTROY { 452sub DESTROY {
440 my ($self) = @_; 453 my ($self) = @_;
441 454
455 delete $WIDGET{$self+0};
442 #$self->deactivate; 456 #$self->deactivate;
443} 457}
444 458
445############################################################################# 459#############################################################################
446 460
… …
455 my $class = shift; 469 my $class = shift;
456 470
457 # range [value, low, high, page] 471 # range [value, low, high, page]
458 472
459 $class->SUPER::new ( 473 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
462 @_ 476 @_
463 ) 477 )
464} 478}
465 479
466sub _draw { 480sub _draw {
467 my ($self) = @_; 481 my ($self) = @_;
468 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
470 489
471 glEnable GL_BLEND; 490 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
474 493
475 glBegin GL_QUADS; 494 glBegin GL_QUADS;
476 glVertex 0 , 0; 495 glVertex 0 , 0;
477 glVertex 0 , $h; 496 glVertex 0 , $h;
478 glVertex $w, $h; 497 glVertex $w, $h;
479 glVertex $w, 0; 498 glVertex $w, 0;
480 glEnd; 499 glEnd;
481 500
482 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
483} 503}
484 504
485############################################################################# 505#############################################################################
486 506
487package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
519 539
520 $self 540 $self
521} 541}
522 542
523sub add { 543sub add {
524 my ($self, $child) = @_; 544 my ($self, @widgets) = @_;
525 545
526 $child->set_parent ($self); 546 $_->set_parent ($self)
547 for @widgets;
527 548
528 use sort 'stable'; 549 use sort 'stable';
529 550
530 $self->{children} = [ 551 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 553 @{$self->{children}}, @widgets
533 ]; 554 ];
534 555
535 $child->check_size; 556 $self->check_size (1);
557 $self->update;
536} 558}
537 559
538sub children { 560sub children {
539 @{ $_[0]{children} } 561 @{ $_[0]{children} }
540} 562}
… …
559 581
560 for (@$children) { 582 for (@$children) {
561 delete $_->{parent}; 583 delete $_->{parent};
562 $_->hide; 584 $_->hide;
563 } 585 }
586
587 $self->check_size;
588 $self->update;
564} 589}
565 590
566sub find_widget { 591sub find_widget {
567 my ($self, $x, $y) = @_; 592 my ($self, $x, $y) = @_;
568 593
… …
643} 668}
644 669
645sub update { 670sub update {
646 my ($self) = @_; 671 my ($self) = @_;
647 672
648 # we want to do this delayed... 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 674 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 675}
662 676
663sub size_allocate { 677sub size_allocate {
664 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
665 679
666 $self->child->configure (0, 0, $w, $h); 680 $self->SUPER::size_allocate ($w, $h);
681 $self->update;
682}
667 683
684sub _render {
685 $_[0]{children}[0]->draw;
686}
687
688sub render_child {
689 my ($self) = @_;
690
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT;
694
668 $self->render_chld; 695 $self->_render;
696 };
669} 697}
670 698
671sub _draw { 699sub _draw {
672 my ($self) = @_; 700 my ($self) = @_;
673 701
674 my ($w, $h) = ($self->w, $self->h); 702 my ($w, $h) = ($self->w, $self->h);
675 703
676 my $tex = $self->{texture} 704 my $tex = $self->{texture}
677 or return; 705 or return;
678 706
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709 glColor 1, 1, 1, 1;
683 710
684 $tex->draw_quad (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 712
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
688} 714}
689 715
690############################################################################# 716#############################################################################
691 717
692package CFClient::UI::ViewPort; 718package CFClient::UI::ViewPort;
693 719
694our @ISA = CFClient::UI::Window::; 720our @ISA = CFClient::UI::Window::;
695 721
696sub new { die }
697
698sub size_request { 722sub size_request {
699 my ($self) = @_; 723 my ($self) = @_;
700 724
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
703 727
704 @$self{qw(child_w child_h)} 728 @$self{qw(child_w child_h)}
705} 729}
706 730
707sub _draw { 731sub size_allocate {
708 my ($self) = @_; 732 my ($self, $w, $h) = @_;
709 733
710 $self->{children}[1]->draw; 734 $self->update;
711} 735}
712 736
737sub set_offset {
738 my ($self, $x, $y) = @_;
713 739
714############################################################################# 740 $self->{view_x} = int $x;
741 $self->{view_y} = int $y;
715 742
743 $self->update;
744}
745
746# hmm, this does not work for topleft of $self... but we should not ask for that
747sub coord2local {
748 my ($self, $x, $y) = @_;
749
750 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
751}
752
753sub coord2global {
754 my ($self, $x, $y) = @_;
755
756 $x = List::Util::min $self->{w}, $x - $self->{view_x};
757 $y = List::Util::min $self->{h}, $y - $self->{view_y};
758
759 $self->SUPER::coord2global ($x, $y)
760}
761
762sub find_widget {
763 my ($self, $x, $y) = @_;
764
765 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
766 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
767 ) {
768 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
769 } else {
770 $self->CFClient::UI::Base::find_widget ($x, $y)
771 }
772}
773
774sub _render {
775 my ($self) = @_;
776
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778
779 $self->SUPER::_render;
780}
781
782#############################################################################
783
716package CFClient::UI::Frame; 784package CFClient::UI::ScrolledWindow;
717 785
718our @ISA = CFClient::UI::Bin::; 786our @ISA = CFClient::UI::HBox::;
719
720use CFClient::OpenGL;
721 787
722sub new { 788sub new {
723 my $class = shift; 789 my $class = shift;
724 790
791 my $self;
792
793 my $slider = new CFClient::UI::Slider
794 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
798 },
799 ;
800
725 my $self = $class->SUPER::new ( 801 $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1], 802 vp => (new CFClient::UI::ViewPort),
727 border_bg => [1, 1, 1, 1], 803 slider => $slider,
728 border => 0.8,
729 @_ 804 @_,
730 ); 805 );
731 806
807 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp});
809 $self->add ($self->{slider});
810
732 $self 811 $self
733} 812}
734 813
814#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll
816
817#############################################################################
818
819package CFClient::UI::Frame;
820
821our @ISA = CFClient::UI::Bin::;
822
823use CFClient::OpenGL;
824
825sub new {
826 my $class = shift;
827
828 $class->SUPER::new (
829 bg => undef,
830 @_,
831 )
832}
833
735sub _draw { 834sub _draw {
736 my ($self) = @_; 835 my ($self) = @_;
737 836
738 my ($w, $h) = ($self->{w}, $self->{h}); 837 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)};
739 839
740 glEnable GL_BLEND; 840 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D; 842 glColor @{ $self->{bg} };
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 843
745# glBegin GL_QUADS; 844 glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0; 845 glVertex 0 , 0;
748# glVertex 0 , $h; 846 glVertex 0 , $h;
749# glVertex $w, $h; 847 glVertex $w, $h;
750# glVertex $w, 0; 848 glVertex $w, 0;
751# glEnd; 849 glEnd;
752 850
753
754 $self->child->draw;
755 glDisable GL_BLEND; 851 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D; 852 }
853
854 $self->SUPER::_draw;
757} 855}
758 856
759############################################################################# 857#############################################################################
760 858
761package CFClient::UI::FancyFrame; 859package CFClient::UI::FancyFrame;
… …
774 # TODO: user_x, user_y, overwrite moveto? 872 # TODO: user_x, user_y, overwrite moveto?
775 873
776 my $self = $class->SUPER::new ( 874 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
779 border => 0.8, 877 border => 0.6,
878 toplevel => 1,
780 can_events => 1, 879 can_events => 1,
781 @_ 880 @_
782 ); 881 );
783 882
784 $self->{title} &&= new CFClient::UI::Label 883 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 884 align => 0,
786 valign => 1, 885 valign => 1,
787 text => $self->{title}, 886 text => $self->{title},
788 fontsize => 1; 887 fontsize => $self->{border};
789 888
790 $self 889 $self
791} 890}
792 891
793sub border { 892sub border {
… …
809 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
810 909
811 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
812 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
813 912
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
815 if $self->{title}; 914 if $self->{title};
816 915
817 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
818} 917}
819 918
820sub button_down { 919sub button_down {
821 my ($self, $ev, $x, $y) = @_; 920 my ($self, $ev, $x, $y) = @_;
822 921
922 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 923 my $border = $self->border;
824 924
825 if ($x < $self->{w} && $x >= $self->{w} - $border 925 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 926 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 927
928 if ($lr & $td) {
929 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 930 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 931 my ($bw, $bh) = ($self->{w}, $self->{h});
830 932
933 my $mx = $x < $border;
934 my $my = $y < $border;
935
831 $self->{motion} = sub { 936 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 937 my ($ev, $x, $y) = @_;
833 938
834 ($x, $y) = ($ev->{x}, $ev->{y}); 939 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy;
835 941
836 $self->{user_w} = $bw + $x - $ox; 942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
838 $self->check_size; 945 $self->check_size;
839 }; 946 };
840 947
841 } elsif ($x >= 0 && $x < $self->{w} 948 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 949 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 950 my ($bx, $by) = ($self->{x}, $self->{y});
846 951
847 $self->{motion} = sub { 952 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 953 my ($ev, $x, $y) = @_;
… …
871 my ($self) = @_; 976 my ($self) = @_;
872 977
873 my ($w, $h ) = ($self->{w}, $self->{h}); 978 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
875 980
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 981 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 983
881 my $border = $self->border; 984 my $border = $self->border;
882 985
883 glColor @{ $self->{border_bg} }; 986 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
888 991
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
889 my $bg = $tex[0]; 993 my $bg = $tex[0];
890 994
891 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 996 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h}; 997 my $rep_y = $ch / $bg->{h};
894 998
895 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
896 1000
897 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 }
901 1006
902 glDisable GL_TEXTURE_2D; 1007 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1008
905 $self->{title}->draw if $self->{title}; 1009 $self->{title}->draw if $self->{title};
1010
906 $self->child->draw; 1011 $self->child->draw;
907} 1012}
908 1013
909############################################################################# 1014#############################################################################
910 1015
… …
1134} 1239}
1135 1240
1136sub size_allocate { 1241sub size_allocate {
1137 my ($self, $w, $h) = @_; 1242 my ($self, $w, $h) = @_;
1138 1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1139 my $children = $self->{children}; 1246 my $children = $self->{children};
1140 1247
1141 my @h = map $_->{req_h}, @$children; 1248 my @h = map $_->{req_h}, @$children;
1142 1249
1143 my $req_h = List::Util::sum @h; 1250 my $req_h = List::Util::sum @h;
… …
1172 1279
1173############################################################################# 1280#############################################################################
1174 1281
1175package CFClient::UI::Label; 1282package CFClient::UI::Label;
1176 1283
1177our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1178 1285
1179use CFClient::OpenGL; 1286use CFClient::OpenGL;
1180 1287
1181sub new { 1288sub new {
1182 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1183 1290
1184 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1186 #font => default_font 1295 #font => default_font
1296 #text => initial text
1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1300 layout => (new CFClient::Layout),
1187 fontsize => 1, 1301 fontsize => 1,
1188 text => "",
1189 align => -1, 1302 align => -1,
1190 valign => -1, 1303 valign => -1,
1191 padding => 2, 1304 padding => 2,
1192 layout => new CFClient::Layout,
1193 can_events => 0, 1305 can_events => 0,
1194 %arg 1306 %arg
1195 ); 1307 );
1196 1308
1197 if (exists $self->{template}) { 1309 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1310 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1311 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1312 $self->{template} = $layout;
1201 } 1313 }
1202 1314
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1315 if (exists $self->{markup}) {
1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1316 $self->set_markup (delete $self->{markup});
1317 } else {
1318 $self->set_text (delete $self->{text});
1319 }
1205 1320
1206 $self 1321 $self
1207} 1322}
1208 1323
1209sub escape { 1324sub escape($) {
1210 local $_ = $_[1]; 1325 local $_ = $_[0];
1211 1326
1212 s/&/&amp;/g; 1327 s/&/&amp;/g;
1213 s/>/&gt;/g; 1328 s/>/&gt;/g;
1214 s/</&lt;/g; 1329 s/</&lt;/g;
1215 1330
1216 $_[1] 1331 $_
1217} 1332}
1218 1333
1219sub update { 1334sub update {
1220 my ($self) = @_; 1335 my ($self) = @_;
1221 1336
1222 delete $self->{texture}; 1337 delete $self->{texture};
1223 $self->SUPER::update; 1338 $self->SUPER::update;
1224} 1339}
1225 1340
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1341sub set_text {
1233 my ($self, $text) = @_; 1342 my ($self, $text) = @_;
1234 1343
1235 return if $self->{text} eq "T$text"; 1344 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1345 $self->{text} = "T$text";
1237 1346
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1348 $self->{layout}->set_text ($text);
1239 1349
1240 delete $self->{texture};
1241 $self->update; 1350 $self->update;
1242 $self->check_size; 1351 $self->check_size;
1243} 1352}
1244 1353
1245sub set_markup { 1354sub set_markup {
1246 my ($self, $markup) = @_; 1355 my ($self, $markup) = @_;
1247 1356
1248 return if $self->{text} eq "M$markup"; 1357 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1358 $self->{text} = "M$markup";
1250 1359
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1363 $self->{layout}->set_markup ($markup);
1252 1364
1253 delete $self->{texture};
1254 $self->update; 1365 $self->update;
1255 $self->check_size; 1366 $self->check_size;
1256} 1367}
1257 1368
1258sub size_request { 1369sub size_request {
1259 my ($self) = @_; 1370 my ($self) = @_;
1260 1371
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1); 1373 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 1377
1265 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1266 1379
1267 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1289sub set_fontsize { 1402sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1291 1404
1292 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1294 $self->check_size; 1409 $self->check_size;
1295 $self->update;
1296} 1410}
1297 1411
1298sub _draw { 1412sub _draw {
1299 my ($self) = @_; 1413 my ($self) = @_;
1300 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1301 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424
1305 new_from_layout CFClient::Texture $self->{layout} 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1306 }; 1436 };
1307 1437
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1440
1441 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1442 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $tex->draw_quad ($self->{ox}, $self->{oy}); 1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 }
1328 1447
1329 glDisable GL_TEXTURE_2D; 1448 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1449}
1332 1450
1333############################################################################# 1451#############################################################################
1334 1452
1335package CFClient::UI::EntryBase; 1453package CFClient::UI::EntryBase;
… …
1370 $self->{layout}->set_text ("$text "); 1488 $self->{layout}->set_text ("$text ");
1371 1489
1372 $self->emit (changed => $self->{text}); 1490 $self->emit (changed => $self->{text});
1373} 1491}
1374 1492
1375sub get_text {
1376 $_[0]{text}
1377}
1378
1379sub size_request {
1380 my ($self) = @_;
1381
1382 my ($w, $h) = $self->SUPER::size_request;
1383
1384 ($w + 1, $h) # add 1 for cursor
1385}
1386
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391}
1392
1393sub set_text { 1493sub set_text {
1394 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1395 1495
1396 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1397 $self->_set_text ($text); 1497 $self->_set_text ($text);
1398 $self->update; 1498 $self->update;
1499 $self->check_size;
1500}
1501
1502sub get_text {
1503 $_[0]{text}
1504}
1505
1506sub size_request {
1507 my ($self) = @_;
1508
1509 my ($w, $h) = $self->SUPER::size_request;
1510
1511 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1399} 1518}
1400 1519
1401sub key_down { 1520sub key_down {
1402 my ($self, $ev) = @_; 1521 my ($self, $ev) = @_;
1403 1522
… …
1405 my $sym = $ev->{sym}; 1524 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1525 my $uni = $ev->{unicode};
1407 1526
1408 my $text = $self->get_text; 1527 my $text = $self->get_text;
1409 1528
1410 if ($sym == 8) { 1529 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1531 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1541 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1542 $self->emit ('escape');
1424 } elsif ($uni) { 1543 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1426 } 1545 }
1427 1546
1428 $self->_set_text ($text); 1547 $self->_set_text ($text);
1429 $self->update; 1548 $self->update;
1549 $self->check_size;
1430} 1550}
1431 1551
1432sub focus_in { 1552sub focus_in {
1433 my ($self) = @_; 1553 my ($self) = @_;
1434 1554
… …
1563 my $class = shift; 1683 my $class = shift;
1564 1684
1565 $class->SUPER::new ( 1685 $class->SUPER::new (
1566 padding => 4, 1686 padding => 4,
1567 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1570 can_hover => 1, 1689 can_hover => 1,
1571 align => 0, 1690 align => 0,
1572 valign => 0, 1691 valign => 0,
1573 can_events => 1, 1692 can_events => 1,
… …
1591 1710
1592 if ($GRAB == $self) { 1711 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1712 $self->{fg} = $self->{active_fg};
1594 } 1713 }
1595 1714
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1715 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1717 glColor 0, 0, 0, 1;
1601 1718
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1719 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1720
1604 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1722
1607 $self->SUPER::_draw; 1723 $self->SUPER::_draw;
1608} 1724}
1609 1725
1610############################################################################# 1726#############################################################################
… …
1624 1740
1625 $class->SUPER::new ( 1741 $class->SUPER::new (
1626 padding => 2, 1742 padding => 2,
1627 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1628 active_fg => [1, 1, 0], 1744 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5],
1629 state => 0, 1747 state => 0,
1630 can_hover => 1, 1748 can_hover => 1,
1631 @_ 1749 @_
1632 ) 1750 )
1633} 1751}
… …
1657 1775
1658 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1659 1777
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1779
1662 glEnable GL_BLEND; 1780 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781
1663 glEnable GL_TEXTURE_2D; 1782 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1783 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1784 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1785}
1673 1786
1674############################################################################# 1787#############################################################################
1675 1788
1676package CFClient::UI::Image; 1789package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 1832 glTranslate 0, -$self->{w}, 0;
1720 1833
1721 ($w, $h) = ($h, $w); 1834 ($w, $h) = ($h, $w);
1722 } 1835 }
1723 1836
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 1839
1729 $tex->draw_quad (0, 0, $w, $h); 1840 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 1841
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 1842 glDisable GL_TEXTURE_2D;
1733} 1843}
1734 1844
1735############################################################################# 1845#############################################################################
1736 1846
… …
1925 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
1926 2036
1927sub new { 2037sub new {
1928 my $class = shift; 2038 my $class = shift;
1929 2039
1930 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
1931 2041
1932 # TODO: 0-width page 2042 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2044 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1937 active_fg => [0, 0, 0], 2047 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
1938 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
1939 req_w => 20, 2051 req_w => $::WIDTH / 80,
1940 req_h => 20, 2052 req_h => $::WIDTH / 80,
1941 vertical => 0, 2053 vertical => 0,
1942 can_hover => 1, 2054 can_hover => 1,
1943 inner_pad => 5, 2055 inner_pad => .05,
1944 @_ 2056 @_
1945 ); 2057 );
1946 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
1947 $self 2062 $self
2063}
2064
2065sub set_value {
2066 my ($self, $value) = @_;
2067
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069
2070 $hi = $lo + 1 if $hi <= $lo;
2071
2072 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi;
2074
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081
2082 if ($value != $old_value) {
2083 $self->emit (changed => $value);
2084 $self->update;
2085 }
1948} 2086}
1949 2087
1950sub size_request { 2088sub size_request {
1951 my ($self) = @_; 2089 my ($self) = @_;
1952 2090
… …
1965 2103
1966sub mouse_motion { 2104sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
1968 2106
1969 if ($GRAB == $self) { 2107 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109
2110 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2113
2114 $self->set_value ($x * ($hi - $lo) + $lo);
2115 }
2116}
2117
2118sub update {
2119 my ($self) = @_;
2120
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]);
2123
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
1971 2125
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
1973 2127
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1976 2129
1977 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $value = $self->{scale} * ($value - $lo);
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2132
1983 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
1984 $self->update; 2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value;
2139 $self->{knob_w} = $page;
1985 } 2140 });
1986}
1987 2141
1988# the inner_* stuff is for generating a padding for the slider handle, 2142 $self->SUPER::update;
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994} 2143}
1995 2144
1996sub _draw { 2145sub _draw {
1997 my ($self) = @_; 2146 my ($self) = @_;
1998 2147
1999 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
2000 2149
2001 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
2002 2151
2003 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2005 2154
2155 glTranslate 1, 0, 0;
2006 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2157 }
2011 2158
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2161
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2162 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2164
2038 # draw background 2165 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2167
2041 # draw handle 2168 # draw handle
2042 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2043 2170
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
2046} 2172}
2047 2173
2048############################################################################# 2174#############################################################################
2049 2175
… …
2060 fontsize => 1, 2186 fontsize => 1,
2061 can_events => 0, 2187 can_events => 0,
2062 #font => default_font 2188 #font => default_font
2063 @_, 2189 @_,
2064 2190
2065 layout => (new CFClient::Layout), 2191 layout => (new CFClient::Layout 1),
2066 par => [], 2192 par => [],
2067 height => 0, 2193 height => 0,
2068 children => [ 2194 children => [
2069 (new CFClient::UI::Empty expand => 1), 2195 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2196 (new CFClient::UI::Slider vertical => 1),
2071 ], 2197 ],
2072 ); 2198 );
2073 2199
2074 $self->{children}[1]->connect (changed => sub { 2200 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2201
2078 $self 2202 $self
2079} 2203}
2080 2204
2081sub set_fontsize { 2205sub set_fontsize {
… …
2089 my ($self, $text) = @_; 2213 my ($self, $text) = @_;
2090 2214
2091 my $layout = $self->{layout}; 2215 my $layout = $self->{layout};
2092 2216
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w}); 2218 $layout->set_width ($self->{children}[0]{w});
2095 $layout->set_text ($text); 2219 $layout->set_markup ($text);
2096 2220
2097 ($layout->size)[1] 2221 ($layout->size)[1]
2098} 2222}
2099 2223
2100sub reflow { 2224sub reflow {
… …
2138 2262
2139 return unless $self->{h} > 0; 2263 return unless $self->{h} > 0;
2140 2264
2141 delete $self->{texture}; 2265 delete $self->{texture};
2142 2266
2143 $ROOT->on_refresh ($self, sub { 2267 $ROOT->on_post_alloc ($self, sub {
2144 if (delete $self->{need_reflow}) { 2268 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2269 my $height = 0;
2146 2270
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2271 $height += $_->[0] = $self->text_height ($_->[2])
2148 for @{$self->{par}}; 2272 for @{$self->{par}};
… …
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2153 2277
2154 delete $self->{texture}; 2278 delete $self->{texture};
2155 } 2279 }
2156 2280
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2158 glClearColor 0, 0, 0, 1; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2160 2284
2161 glEnable GL_BLEND;
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165 2287
2166 my $top = int $self->{children}[1]{range}[0]; 2288 my $top = int $self->{children}[1]{range}[0];
2167 2289
… …
2176 2298
2177 for my $par (@{$self->{par}}) { 2299 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2300 my $h = $par->[0];
2179 2301
2180 if ($y0 < $y + $h && $y < $y1) { 2302 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] });
2181 $layout->set_text ($par->[2]); 2304 $layout->set_markup ($par->[2]);
2182 2305
2183 glColor @{ $par->[1] };
2184 my ($W, $H) = $layout->size; 2306 my ($W, $H) = $layout->size;
2185 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2186 } 2308 }
2187 2309
2188 $y += $h; 2310 $y += $h;
2189 } 2311 }
2190 2312
2191 glDisable GL_TEXTURE_2D; 2313 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND;
2193 }; 2314 };
2194 }); 2315 });
2195} 2316}
2196 2317
2197sub _draw { 2318sub _draw {
2198 my ($self) = @_; 2319 my ($self) = @_;
2199 2320
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2323 glColor 1, 1, 1, 1;
2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2206 }
2207 2326
2208 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2209 2328
2210} 2329}
2211 2330
… …
2305 @_, 2424 @_,
2306 can_events => 0, 2425 can_events => 0,
2307 ) 2426 )
2308} 2427}
2309 2428
2310sub set_markup { 2429sub set_tooltip_from {
2311 my ($self, $text) = @_; 2430 my ($self, $widget) = @_;
2312 2431
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2432 $self->add (new CFClient::UI::Label
2314 $self->{label}->set_markup ($text); 2433 markup => $widget->{tooltip},
2315 $self->add ($self->{label}); 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8,
2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2439 );
2316} 2440}
2317 2441
2318sub size_request { 2442sub size_request {
2319 my ($self) = @_; 2443 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2444
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2446
2325 ($w + 4, $h + 4) 2447 ($w + 4, $h + 4)
2326} 2448}
… …
2332} 2454}
2333 2455
2334sub _draw { 2456sub _draw {
2335 my ($self) = @_; 2457 my ($self) = @_;
2336 2458
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2459 glTranslate 0.375, 0.375;
2339 2460
2340 my ($w, $h) = @$self{qw(w h)}; 2461 my ($w, $h) = @$self{qw(w h)};
2341 2462
2342 glColor 1, 0.8, 0.4; 2463 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2474 glVertex 0 , $h;
2354 glVertex $w, $h; 2475 glVertex $w, $h;
2355 glVertex $w, 0; 2476 glVertex $w, 0;
2356 glEnd; 2477 glEnd;
2357 2478
2358 glPopMatrix; 2479 glTranslate 2 - 0.375, 2 - 0.375;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2480 $self->SUPER::_draw;
2362} 2481}
2363 2482
2364############################################################################# 2483#############################################################################
2365 2484
… …
2380 2499
2381sub size_request { 2500sub size_request {
2382 (32, 8) 2501 (32, 8)
2383} 2502}
2384 2503
2385sub draw { 2504sub _draw {
2386 my ($self) = @_; 2505 my ($self) = @_;
2387 2506
2507 return unless $::CONN;#d# manage and cache textures differently
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389 2509
2510 # TODO animation
2390 if ($tex) { 2511 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2512 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2514 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2516 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND; 2517 }
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::InventoryItem;
2523
2524our @ISA = CFClient::UI::HBox::;
2525
2526sub _item_to_desc {
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668}
2669
2670#############################################################################
2671
2672package CFClient::UI::Menu;
2673
2674our @ISA = CFClient::UI::FancyFrame::;
2675
2676use CFClient::OpenGL;
2677
2678sub new {
2679 my $class = shift;
2680
2681 my $self = $class->SUPER::new (
2682 items => [],
2683 z => 100,
2684 @_,
2685 );
2686
2687 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2688
2689 for my $item (@{ $self->{items} }) {
2690 my ($widget, $cb) = @$item;
2691
2692 # handle various types of items, only text for now
2693 if (!ref $widget) {
2694 $widget = new CFClient::UI::Label
2695 can_hover => 1,
2696 can_events => 1,
2697 text => $widget;
2698 }
2699
2700 $self->{item}{$widget} = $item;
2701
2702 $self->{vbox}->add ($widget);
2703 }
2704
2705 $self
2706}
2707
2708# popup given the event (must be a mouse button down event currently)
2709sub popup {
2710 my ($self, $ev) = @_;
2711
2712 $self->emit ("popdown");
2713
2714 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self;
2716 $self->{button} = $ev->{button};
2717
2718 $self->show;
2719 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2720}
2721
2722sub mouse_motion {
2723 my ($self, $ev, $x, $y) = @_;
2724
2725 # TODO: should use vbox->find_widget or so
2726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727 $self->{hover} = $self->{item}{$HOVER};
2728}
2729
2730sub button_up {
2731 my ($self, $ev, $x, $y) = @_;
2732
2733 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB;
2735 $self->hide;
2736
2737 $self->emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover};
2739 }
2740}
2741
2742#############################################################################
2743
2744package CFClient::UI::Statusbox;
2745
2746our @ISA = CFClient::UI::VBox::;
2747
2748sub new {
2749 my $class = shift;
2750
2751 $class->SUPER::new (
2752 fontsize => 0.8,
2753 @_,
2399 } 2754 )
2755}
2756
2757sub reorder {
2758 my ($self) = @_;
2759 my $NOW = time;
2760
2761 while (my ($k, $v) = each %{ $self->{item} }) {
2762 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2763 }
2764
2765 my @widgets;
2766
2767 my @items = sort {
2768 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} };
2771
2772 my $count = 10 + 1;
2773 for my $item (@items) {
2774 last unless --$count;
2775
2776 push @widgets, $item->{label} ||= do {
2777 # TODO: doesn't handle markup well (read as: at all)
2778 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text};
2781
2782 for ($short) {
2783 s/^\s+//;
2784 s/\s+/ /g;
2785 }
2786
2787 new CFClient::UI::Label
2788 markup => $short,
2789 tooltip => $item->{tooltip},
2790 tooltip_font => $::FONT_PROP,
2791 tooltip_width => 0.67,
2792 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44,
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;
2838}
2839
2840sub reconfigure {
2841 my ($self) = @_;
2842
2843 delete $_->{label}
2844 for values %{ $self->{item} || {} };
2845
2846 $self->reorder;
2847 $self->SUPER::reconfigure;
2400} 2848}
2401 2849
2402############################################################################# 2850#############################################################################
2403 2851
2404package CFClient::UI::Root; 2852package CFClient::UI::Root;
2405 2853
2406our @ISA = CFClient::UI::Container::; 2854our @ISA = CFClient::UI::Container::;
2407 2855
2408use CFClient::OpenGL; 2856use CFClient::OpenGL;
2409 2857
2410sub check_size { 2858sub new {
2411 my ($self) = @_; 2859 my $class = shift;
2412 2860
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2861 $class->SUPER::new (
2414} 2862 @_,
2415 2863 )
2416sub size_request {
2417 ($::WIDTH, $::HEIGHT)
2418} 2864}
2419 2865
2420sub configure { 2866sub configure {
2421 my ($self, $x, $y, $w, $h) = @_; 2867 my ($self, $x, $y, $w, $h) = @_;
2422 2868
2423 $self->SUPER::configure ($x, $y, $w, $h); 2869 $self->{w} = $w;
2870 $self->{h} = $h;
2871}
2424 2872
2873sub check_size {
2874 my ($self) = @_;
2875
2876 $self->size_allocate ($self->{w}, $self->{h})
2877 if $self->{w};
2878}
2879
2880sub size_request {
2881 my ($self) = @_;
2882
2883 ($self->{w}, $self->{h})
2884}
2885
2886sub size_allocate {
2887 my ($self, $w, $h) = @_;
2888
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894
2425 for my $child (@{$self->{children}}) { 2895 for my $child ($self->children) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427 2897
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899 if exists $child->{req_x};
2900
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2902 if exists $child->{req_y};
2903
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906
2430 $child->configure ($X, $Y, $W,$H); 2907 $child->configure ($X, $Y, $W, $H);
2431 } 2908 }
2432} 2909}
2433 2910
2434sub _topleft { 2911sub coord2local {
2435 my ($self, $x, $y) = @_; 2912 my ($self, $x, $y) = @_;
2436 2913
2437 ($x, $y) 2914 ($x, $y)
2438} 2915}
2439 2916
2917sub coord2global {
2918 my ($self, $x, $y) = @_;
2919
2920 ($x, $y)
2921}
2922
2440sub update { 2923sub update {
2441 my ($self) = @_; 2924 my ($self) = @_;
2442 2925
2443 $self->check_size; 2926 $self->check_size;
2444 ::refresh (); 2927 $::WANT_REFRESH++;
2445} 2928}
2446 2929
2447sub add { 2930sub add {
2448 my ($self, $child) = @_; 2931 my ($self, @children) = @_;
2449 2932
2933 for my $child (@children) {
2934 $child->{toplevel} = 1;
2935
2450 # integerize window positions 2936 # integerise window positions
2451 $child->{x} = int $child->{x}; 2937 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y}; 2938 $child->{y} = int $child->{y};
2939 }
2453 2940
2454 $self->SUPER::add ($child); 2941 $self->SUPER::add (@children);
2455} 2942}
2456 2943
2457sub on_refresh { 2944sub on_refresh {
2458 my ($self, $id, $cb) = @_; 2945 my ($self, $id, $cb) = @_;
2459 2946
2460 $self->{refresh_hook}{$id} = $cb; 2947 $self->{refresh_hook}{$id} = $cb;
2461} 2948}
2462 2949
2950sub on_post_alloc {
2951 my ($self, $id, $cb) = @_;
2952
2953 $self->{post_alloc_hook}{$id} = $cb;
2954}
2955
2463sub draw { 2956sub draw {
2464 my ($self) = @_; 2957 my ($self) = @_;
2465 2958
2466 while (my $rcb = delete $self->{refresh_hook}) { 2959 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 2960 $_->()
2961 for values %{delete $self->{refresh_hook}};
2962 }
2963
2964 if ($self->{check_size}) {
2965 my @queue = ([], []);
2966
2967 for (;;) {
2968 if ($self->{check_size}) {
2969 # heuristic: check containers last
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2971 for values %{delete $self->{check_size}}
2972 }
2973
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2975
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2977 ? @$widget{qw(user_w user_h)}
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983
2984 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h;
2986
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2988
2989 $widget->{parent}->check_size
2990 if $widget->{parent};
2991 }
2992 }
2993 }
2994
2995 while ($self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) {
2997 my ($widget, $w, $h) = @$_;
2998
2999 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0;
3001
3002 $widget->{w} = $w;
3003 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h);
3005 $widget->emit (size_allocate => $w, $h);
3006 }
3007 }
3008
3009 while ($self->{post_alloc_hook}) {
3010 $_->()
3011 for values %{delete $self->{post_alloc_hook}};
2468 } 3012 }
2469 3013
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3014 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 3016 glClear GL_COLOR_BUFFER_BIT;
… …
2483############################################################################# 3027#############################################################################
2484 3028
2485package CFClient::UI; 3029package CFClient::UI;
2486 3030
2487$ROOT = new CFClient::UI::Root; 3031$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 3032$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2489 3033
24901 30341
2491 3035

Diff Legend

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