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.213 by root, Wed May 17 15:18: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} 281}
243 282
244sub set_max_size { 283sub set_max_size {
245 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
246 285
247 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
249} 288}
250 289
251# return top left coordinates 290sub set_tooltip {
252sub _topleft {
253 my ($self, $x, $y) = @_; 291 my ($self, $tooltip) = @_;
254 292
255 $self->{parent} 293 $self->{tooltip} = $tooltip;
256 or Carp::confess "no parent widget in _topleft\n";#d#
257 294
258 $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 }
259} 299}
260 300
261# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
262sub coord2local { 302sub coord2local {
263 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
264 304
265 my ($X, $Y) = $self->_topleft; 305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266 ($x - $X, $y - $Y)
267} 306}
268 307
269# translate local coordinates to global coordinate system 308# translate local coordinates to global coordinate system
270sub coord2global { 309sub coord2global {
271 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
272 311
273 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274 ($x + $X, $y + $Y)
275} 313}
276 314
277sub focus_in { 315sub focus_in {
278 my ($self) = @_; 316 my ($self) = @_;
279 317
… …
351 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
352 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
353 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
354 glEnd; 392 glEnd;
355 glPopMatrix; 393 glPopMatrix;
356 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;
357 } 395 }
358} 396}
359 397
360sub _draw { 398sub _draw {
361 my ($self) = @_; 399 my ($self) = @_;
… …
377 415
378sub set_parent { 416sub set_parent {
379 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
380 418
381 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};
382} 424}
383 425
384sub check_size { 426sub check_size {
385 my ($self) = @_; 427 my ($self, $forced) = @_;
386 428
387 $self->{parent} 429 $self->{force_alloc} = 1 if $forced;
388 or return 1; 430 $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} 431}
409 432
410sub update { 433sub update {
411 my ($self) = @_; 434 my ($self) = @_;
412 435
… …
427} 450}
428 451
429sub DESTROY { 452sub DESTROY {
430 my ($self) = @_; 453 my ($self) = @_;
431 454
455 delete $WIDGET{$self+0};
432 #$self->deactivate; 456 #$self->deactivate;
433} 457}
434 458
435############################################################################# 459#############################################################################
436 460
… …
445 my $class = shift; 469 my $class = shift;
446 470
447 # range [value, low, high, page] 471 # range [value, low, high, page]
448 472
449 $class->SUPER::new ( 473 $class->SUPER::new (
450 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
451 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
452 @_ 476 @_
453 ) 477 )
454} 478}
455 479
456sub _draw { 480sub _draw {
457 my ($self) = @_; 481 my ($self) = @_;
458 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
459 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
460 489
461 glEnable GL_BLEND; 490 glEnable GL_BLEND;
462 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
463 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
464 493
465 glBegin GL_QUADS; 494 glBegin GL_QUADS;
466 glVertex 0 , 0; 495 glVertex 0 , 0;
467 glVertex 0 , $h; 496 glVertex 0 , $h;
468 glVertex $w, $h; 497 glVertex $w, $h;
469 glVertex $w, 0; 498 glVertex $w, 0;
470 glEnd; 499 glEnd;
471 500
472 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
473} 503}
474 504
475############################################################################# 505#############################################################################
476 506
477package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
509 539
510 $self 540 $self
511} 541}
512 542
513sub add { 543sub add {
514 my ($self, $child) = @_; 544 my ($self, @widgets) = @_;
515 545
516 $child->set_parent ($self); 546 $_->set_parent ($self)
547 for @widgets;
517 548
518 use sort 'stable'; 549 use sort 'stable';
519 550
520 $self->{children} = [ 551 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 553 @{$self->{children}}, @widgets
523 ]; 554 ];
524 555
525 $child->check_size; 556 $self->check_size (1);
557 $self->update;
526} 558}
527 559
528sub children { 560sub children {
529 @{ $_[0]{children} } 561 @{ $_[0]{children} }
530} 562}
… …
549 581
550 for (@$children) { 582 for (@$children) {
551 delete $_->{parent}; 583 delete $_->{parent};
552 $_->hide; 584 $_->hide;
553 } 585 }
586
587 $self->check_size;
588 $self->update;
554} 589}
555 590
556sub find_widget { 591sub find_widget {
557 my ($self, $x, $y) = @_; 592 my ($self, $x, $y) = @_;
558 593
… …
633} 668}
634 669
635sub update { 670sub update {
636 my ($self) = @_; 671 my ($self) = @_;
637 672
638 # we want to do this delayed... 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 674 $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} 675}
652 676
653sub size_allocate { 677sub size_allocate {
654 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
655 679
656 $self->child->configure (0, 0, $w, $h); 680 $self->SUPER::size_allocate ($w, $h);
681 $self->update;
682}
657 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
658 $self->render_chld; 695 $self->_render;
696# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 };
659} 704}
660 705
661sub _draw { 706sub _draw {
662 my ($self) = @_; 707 my ($self) = @_;
663 708
664 my ($w, $h) = ($self->w, $self->h); 709 my ($w, $h) = ($self->w, $self->h);
665 710
666 my $tex = $self->{texture} 711 my $tex = $self->{texture}
667 or return; 712 or return;
668 713
669 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 714 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1;
673 717
674 $tex->draw_quad (0, 0, $w, $h); 718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675 719
676 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 720 glDisable GL_TEXTURE_2D;
678} 721}
679 722
680############################################################################# 723#############################################################################
681 724
682package CFClient::UI::ViewPort; 725package CFClient::UI::ViewPort;
683 726
684our @ISA = CFClient::UI::Window::; 727our @ISA = CFClient::UI::Window::;
685 728
686sub new { die }
687
688sub size_request { 729sub size_request {
689 my ($self) = @_; 730 my ($self) = @_;
690 731
691 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 732 @$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)}); 733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
693 734
694 @$self{qw(child_w child_h)} 735 @$self{qw(child_w child_h)}
695} 736}
696 737
697sub _draw { 738sub size_allocate {
698 my ($self) = @_; 739 my ($self, $w, $h) = @_;
699 740
700 $self->{children}[1]->draw; 741 $self->update;
701} 742}
702 743
744sub set_offset {
745 my ($self, $x, $y) = @_;
703 746
704############################################################################# 747 $self->{view_x} = int $x;
748 $self->{view_y} = int $y;
705 749
750 $self->update;
751}
752
753# hmm, this does not work for topleft of $self... but we should not ask for that
754sub coord2local {
755 my ($self, $x, $y) = @_;
756
757 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
758}
759
760sub coord2global {
761 my ($self, $x, $y) = @_;
762
763 $x = List::Util::min $self->{w}, $x - $self->{view_x};
764 $y = List::Util::min $self->{h}, $y - $self->{view_y};
765
766 $self->SUPER::coord2global ($x, $y)
767}
768
769sub find_widget {
770 my ($self, $x, $y) = @_;
771
772 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
773 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
774 ) {
775 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
776 } else {
777 $self->CFClient::UI::Base::find_widget ($x, $y)
778 }
779}
780
781sub _render {
782 my ($self) = @_;
783
784 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
785
786 $self->SUPER::_render;
787}
788
789#############################################################################
790
706package CFClient::UI::Frame; 791package CFClient::UI::ScrolledWindow;
707 792
708our @ISA = CFClient::UI::Bin::; 793our @ISA = CFClient::UI::HBox::;
709
710use CFClient::OpenGL;
711 794
712sub new { 795sub new {
713 my $class = shift; 796 my $class = shift;
714 797
798 my $self;
799
800 my $slider = new CFClient::UI::Slider
801 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
805 },
806 ;
807
715 my $self = $class->SUPER::new ( 808 $self = $class->SUPER::new (
716 bg => [1, 1, 1, 1], 809 vp => (new CFClient::UI::ViewPort),
717 border_bg => [1, 1, 1, 1], 810 slider => $slider,
718 border => 0.8,
719 @_ 811 @_,
720 ); 812 );
721 813
814 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp});
816 $self->add ($self->{slider});
817
722 $self 818 $self
723} 819}
724 820
821#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll
823
824#############################################################################
825
826package CFClient::UI::Frame;
827
828our @ISA = CFClient::UI::Bin::;
829
830use CFClient::OpenGL;
831
832sub new {
833 my $class = shift;
834
835 $class->SUPER::new (
836 bg => undef,
837 @_,
838 )
839}
840
725sub _draw { 841sub _draw {
726 my ($self) = @_; 842 my ($self) = @_;
727 843
728 my ($w, $h) = ($self->{w}, $self->{h}); 844 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)};
729 846
730 glEnable GL_BLEND; 847 glEnable GL_BLEND;
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
732 glEnable GL_TEXTURE_2D; 849 glColor @{ $self->{bg} };
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734 850
735# glBegin GL_QUADS; 851 glBegin GL_QUADS;
736# glColor 0, 0, 0, 0;
737# glVertex 0 , 0; 852 glVertex 0 , 0;
738# glVertex 0 , $h; 853 glVertex 0 , $h;
739# glVertex $w, $h; 854 glVertex $w, $h;
740# glVertex $w, 0; 855 glVertex $w, 0;
741# glEnd; 856 glEnd;
742 857
743
744 $self->child->draw;
745 glDisable GL_BLEND; 858 glDisable GL_BLEND;
746 glDisable GL_TEXTURE_2D; 859 }
860
861 $self->SUPER::_draw;
747} 862}
748 863
749############################################################################# 864#############################################################################
750 865
751package CFClient::UI::FancyFrame; 866package CFClient::UI::FancyFrame;
… …
764 # TODO: user_x, user_y, overwrite moveto? 879 # TODO: user_x, user_y, overwrite moveto?
765 880
766 my $self = $class->SUPER::new ( 881 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 882 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 883 border_bg => [1, 1, 1, 1],
769 border => 0.8, 884 border => 0.6,
885 toplevel => 1,
770 can_events => 1, 886 can_events => 1,
771 @_ 887 @_
772 ); 888 );
773 889
774 $self->{title} &&= new CFClient::UI::Label 890 $self->{title} &&= new CFClient::UI::Label
775 align => 0, 891 align => 0,
776 valign => 1, 892 valign => 1,
777 text => $self->{title}, 893 text => $self->{title},
778 fontsize => 1; 894 fontsize => $self->{border};
779 895
780 $self 896 $self
781} 897}
782 898
783sub border { 899sub border {
… …
799 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
800 916
801 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
802 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
803 919
804 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
805 if $self->{title}; 921 if $self->{title};
806 922
807 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
808} 924}
809 925
810sub button_down { 926sub button_down {
811 my ($self, $ev, $x, $y) = @_; 927 my ($self, $ev, $x, $y) = @_;
812 928
929 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 930 my $border = $self->border;
814 931
815 if ($x < $self->{w} && $x >= $self->{w} - $border 932 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 933 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 934
935 if ($lr & $td) {
936 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 937 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 938 my ($bw, $bh) = ($self->{w}, $self->{h});
820 939
940 my $mx = $x < $border;
941 my $my = $y < $border;
942
821 $self->{motion} = sub { 943 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 944 my ($ev, $x, $y) = @_;
823 945
824 ($x, $y) = ($ev->{x}, $ev->{y}); 946 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy;
825 948
826 $self->{user_w} = $bw + $x - $ox; 949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
827 $self->{user_h} = $bh + $y - $oy; 950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
828 $self->check_size; 952 $self->check_size;
829 }; 953 };
830 954
831 } elsif ($x >= 0 && $x < $self->{w} 955 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 956 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 957 my ($bx, $by) = ($self->{x}, $self->{y});
836 958
837 $self->{motion} = sub { 959 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 960 my ($ev, $x, $y) = @_;
… …
861 my ($self) = @_; 983 my ($self) = @_;
862 984
863 my ($w, $h ) = ($self->{w}, $self->{h}); 985 my ($w, $h ) = ($self->{w}, $self->{h});
864 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
865 987
866 glEnable GL_BLEND;
867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868 glEnable GL_TEXTURE_2D; 988 glEnable GL_TEXTURE_2D;
869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870 990
871 my $border = $self->border; 991 my $border = $self->border;
872 992
873 glColor @{ $self->{border_bg} }; 993 glColor @{ $self->{border_bg} };
874 $tex[1]->draw_quad (0, 0, $w, $border); 994 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
878 998
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
879 my $bg = $tex[0]; 1000 my $bg = $tex[0];
880 1001
881 # TODO: repeat texture not scale 1002 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 1003 my $rep_x = $cw / $bg->{w};
883 my $rep_y = $ch / $bg->{h}; 1004 my $rep_y = $ch / $bg->{h};
884 1005
885 glColor @{ $self->{bg} }; 1006 glColor @{ $self->{bg} };
886 1007
887 $bg->{s} = $rep_x; 1008 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y; 1009 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1; 1010 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 }
891 1013
892 glDisable GL_TEXTURE_2D; 1014 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND;
894 1015
895 $self->{title}->draw if $self->{title}; 1016 $self->{title}->draw if $self->{title};
1017
896 $self->child->draw; 1018 $self->child->draw;
897} 1019}
898 1020
899############################################################################# 1021#############################################################################
900 1022
… …
1124} 1246}
1125 1247
1126sub size_allocate { 1248sub size_allocate {
1127 my ($self, $w, $h) = @_; 1249 my ($self, $w, $h) = @_;
1128 1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1129 my $children = $self->{children}; 1253 my $children = $self->{children};
1130 1254
1131 my @h = map $_->{req_h}, @$children; 1255 my @h = map $_->{req_h}, @$children;
1132 1256
1133 my $req_h = List::Util::sum @h; 1257 my $req_h = List::Util::sum @h;
… …
1162 1286
1163############################################################################# 1287#############################################################################
1164 1288
1165package CFClient::UI::Label; 1289package CFClient::UI::Label;
1166 1290
1167our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1168 1292
1169use CFClient::OpenGL; 1293use CFClient::OpenGL;
1170 1294
1171sub new { 1295sub new {
1172 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1173 1297
1174 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1175 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1176 #font => default_font 1302 #font => default_font
1303 #text => initial text
1304 #markup => initial narkup
1305 #max_w => maximum pixel width
1306 ellipsise => 3, # end
1307 layout => (new CFClient::Layout),
1177 fontsize => 1, 1308 fontsize => 1,
1178 text => "",
1179 align => -1, 1309 align => -1,
1180 valign => -1, 1310 valign => -1,
1181 padding => 2, 1311 padding => 2,
1182 layout => new CFClient::Layout,
1183 can_events => 0, 1312 can_events => 0,
1184 %arg 1313 %arg
1185 ); 1314 );
1186 1315
1187 if (exists $self->{template}) { 1316 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout; 1317 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template}); 1318 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout; 1319 $self->{template} = $layout;
1191 } 1320 }
1192 1321
1193 $self->set_text (delete $self->{text}) if exists $self->{text}; 1322 if (exists $self->{markup}) {
1194 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1323 $self->set_markup (delete $self->{markup});
1324 } else {
1325 $self->set_text (delete $self->{text});
1326 }
1195 1327
1196 $self 1328 $self
1197} 1329}
1198 1330
1199sub escape { 1331sub escape($) {
1200 local $_ = $_[1]; 1332 local $_ = $_[0];
1201 1333
1202 s/&/&amp;/g; 1334 s/&/&amp;/g;
1203 s/>/&gt;/g; 1335 s/>/&gt;/g;
1204 s/</&lt;/g; 1336 s/</&lt;/g;
1205 1337
1206 $_[1] 1338 $_
1339}
1340
1341sub update {
1342 my ($self) = @_;
1343
1344 delete $self->{texture};
1345 $self->SUPER::update;
1207} 1346}
1208 1347
1209sub set_text { 1348sub set_text {
1210 my ($self, $text) = @_; 1349 my ($self, $text) = @_;
1211 1350
1351 return if $self->{text} eq "T$text";
1352 $self->{text} = "T$text";
1353
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1212 $self->{layout}->set_text ($text); 1355 $self->{layout}->set_text ($text);
1213 1356
1214 delete $self->{texture}; 1357 $self->update;
1215 $self->check_size; 1358 $self->check_size;
1216 $self->update;
1217} 1359}
1218 1360
1219sub set_markup { 1361sub set_markup {
1220 my ($self, $markup) = @_; 1362 my ($self, $markup) = @_;
1221 1363
1364 return if $self->{text} eq "M$markup";
1365 $self->{text} = "M$markup";
1366
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1222 $self->{layout}->set_markup ($markup); 1370 $self->{layout}->set_markup ($markup);
1223 1371
1224 delete $self->{texture}; 1372 $self->update;
1225 $self->check_size; 1373 $self->check_size;
1226 $self->update;
1227} 1374}
1228 1375
1229sub size_request { 1376sub size_request {
1230 my ($self) = @_; 1377 my ($self) = @_;
1231 1378
1232 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $self->{layout}->set_width ($self->{max_w} || -1); 1380 $self->{layout}->set_width ($self->{max_w} || -1);
1381 $self->{layout}->set_ellipsise ($self->{ellipsise});
1382 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1235 1384
1236 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1237 1386
1238 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1260sub set_fontsize { 1409sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1410 my ($self, $fontsize) = @_;
1262 1411
1263 $self->{fontsize} = $fontsize; 1412 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1413 delete $self->{texture};
1414
1415 $self->update;
1265 $self->check_size; 1416 $self->check_size;
1266 $self->update;
1267} 1417}
1268 1418
1269sub _draw { 1419sub _draw {
1270 my ($self) = @_; 1420 my ($self) = @_;
1271 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1272 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1425 $self->{layout}->set_foreground (@{$self->{fg}});
1273 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1274 $self->{layout}->set_width ($self->{w}); 1427 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431
1276 new_from_layout CFClient::Texture $self->{layout} 1432 my $tex = new_from_layout CFClient::Texture $self->{layout};
1433
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1436 : ($self->{w} - $tex->{w}) * 0.5);
1437
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1440 : ($self->{h} - $tex->{h}) * 0.5);
1441
1442 $tex
1277 }; 1443 };
1278 1444
1279 glEnable GL_BLEND;
1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283 1447
1448 if ($tex->{format} == GL_ALPHA) {
1284 glColor @{$self->{fg}}; 1449 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}); 1450 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1451 } else {
1452 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1453 }
1299 1454
1300 glDisable GL_TEXTURE_2D; 1455 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302} 1456}
1303 1457
1304############################################################################# 1458#############################################################################
1305 1459
1306package CFClient::UI::EntryBase; 1460package CFClient::UI::EntryBase;
… …
1341 $self->{layout}->set_text ("$text "); 1495 $self->{layout}->set_text ("$text ");
1342 1496
1343 $self->emit (changed => $self->{text}); 1497 $self->emit (changed => $self->{text});
1344} 1498}
1345 1499
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 { 1500sub set_text {
1365 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1366 1502
1367 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1368 $self->_set_text ($text); 1504 $self->_set_text ($text);
1369 $self->update; 1505 $self->update;
1506 $self->check_size;
1507}
1508
1509sub get_text {
1510 $_[0]{text}
1511}
1512
1513sub size_request {
1514 my ($self) = @_;
1515
1516 my ($w, $h) = $self->SUPER::size_request;
1517
1518 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1370} 1525}
1371 1526
1372sub key_down { 1527sub key_down {
1373 my ($self, $ev) = @_; 1528 my ($self, $ev) = @_;
1374 1529
… …
1376 my $sym = $ev->{sym}; 1531 my $sym = $ev->{sym};
1377 my $uni = $ev->{unicode}; 1532 my $uni = $ev->{unicode};
1378 1533
1379 my $text = $self->get_text; 1534 my $text = $self->get_text;
1380 1535
1381 if ($sym == 8) { 1536 if ($uni == 8) {
1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1537 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383 } elsif ($sym == 127) { 1538 } elsif ($uni == 127) {
1384 substr $text, $self->{cursor}, 1, ""; 1539 substr $text, $self->{cursor}, 1, "";
1385 } elsif ($sym == CFClient::SDLK_LEFT) { 1540 } elsif ($sym == CFClient::SDLK_LEFT) {
1386 --$self->{cursor} if $self->{cursor}; 1541 --$self->{cursor} if $self->{cursor};
1387 } elsif ($sym == CFClient::SDLK_RIGHT) { 1542 } elsif ($sym == CFClient::SDLK_RIGHT) {
1388 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1543 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1389 } elsif ($sym == CFClient::SDLK_HOME) { 1544 } elsif ($sym == CFClient::SDLK_HOME) {
1390 $self->{cursor} = 0; 1545 $self->{cursor} = 0;
1391 } elsif ($sym == CFClient::SDLK_END) { 1546 } elsif ($sym == CFClient::SDLK_END) {
1392 $self->{cursor} = length $text; 1547 $self->{cursor} = length $text;
1393 } elsif ($sym == 27) { 1548 } elsif ($uni == 27) {
1394 $self->emit ('escape'); 1549 $self->emit ('escape');
1395 } elsif ($uni) { 1550 } elsif ($uni) {
1396 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1397 } 1552 }
1398 1553
1399 $self->_set_text ($text); 1554 $self->_set_text ($text);
1400 $self->update; 1555 $self->update;
1556 $self->check_size;
1401} 1557}
1402 1558
1403sub focus_in { 1559sub focus_in {
1404 my ($self) = @_; 1560 my ($self) = @_;
1405 1561
… …
1534 my $class = shift; 1690 my $class = shift;
1535 1691
1536 $class->SUPER::new ( 1692 $class->SUPER::new (
1537 padding => 4, 1693 padding => 4,
1538 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1539 bg => [1, 1, 1, 0.2],
1540 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1541 can_hover => 1, 1696 can_hover => 1,
1542 align => 0, 1697 align => 0,
1543 valign => 0, 1698 valign => 0,
1544 can_events => 1, 1699 can_events => 1,
… …
1562 1717
1563 if ($GRAB == $self) { 1718 if ($GRAB == $self) {
1564 $self->{fg} = $self->{active_fg}; 1719 $self->{fg} = $self->{active_fg};
1565 } 1720 }
1566 1721
1567 glEnable GL_BLEND;
1568 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569 glEnable GL_TEXTURE_2D; 1722 glEnable GL_TEXTURE_2D;
1570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571 glColor 0, 0, 0, 1; 1724 glColor 0, 0, 0, 1;
1572 1725
1573 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1726 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574 1727
1575 glDisable GL_TEXTURE_2D; 1728 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577 1729
1578 $self->SUPER::_draw; 1730 $self->SUPER::_draw;
1579} 1731}
1580 1732
1581############################################################################# 1733#############################################################################
… …
1595 1747
1596 $class->SUPER::new ( 1748 $class->SUPER::new (
1597 padding => 2, 1749 padding => 2,
1598 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1599 active_fg => [1, 1, 0], 1751 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5],
1600 state => 0, 1754 state => 0,
1601 can_hover => 1, 1755 can_hover => 1,
1602 @_ 1756 @_
1603 ) 1757 )
1604} 1758}
… …
1628 1782
1629 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1783 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1630 1784
1631 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632 1786
1633 glEnable GL_BLEND; 1787 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788
1634 glEnable GL_TEXTURE_2D; 1789 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); 1790 $tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641 glDisable GL_TEXTURE_2D; 1791 glDisable GL_TEXTURE_2D;
1642 glDisable GL_BLEND;
1643} 1792}
1644 1793
1645############################################################################# 1794#############################################################################
1646 1795
1647package CFClient::UI::Image; 1796package CFClient::UI::Image;
… …
1690 glTranslate 0, -$self->{w}, 0; 1839 glTranslate 0, -$self->{w}, 0;
1691 1840
1692 ($w, $h) = ($h, $w); 1841 ($w, $h) = ($h, $w);
1693 } 1842 }
1694 1843
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D; 1844 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1845 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699 1846
1700 $tex->draw_quad (0, 0, $w, $h); 1847 $tex->draw_quad_alpha (0, 0, $w, $h);
1701 1848
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D; 1849 glDisable GL_TEXTURE_2D;
1704} 1850}
1705 1851
1706############################################################################# 1852#############################################################################
1707 1853
… …
1755} 1901}
1756 1902
1757sub set_max { 1903sub set_max {
1758 my ($self, $max) = @_; 1904 my ($self, $max) = @_;
1759 1905
1906 return if $self->{max_val} == $max;
1907
1760 $self->{max_val} = $max; 1908 $self->{max_val} = $max;
1909 $self->update;
1761} 1910}
1762 1911
1763sub set_value { 1912sub set_value {
1764 my ($self, $val, $max) = @_; 1913 my ($self, $val, $max) = @_;
1765 1914
1766 $self->set_max ($max) 1915 $self->set_max ($max)
1767 if defined $max; 1916 if defined $max;
1768 1917
1769 $max = $self->{max_val}; 1918 return if $self->{val} == $val;
1919
1770 $self->{val} = $val; 1920 $self->{val} = $val;
1771
1772 $self->update; 1921 $self->update;
1773} 1922}
1774 1923
1775sub _draw { 1924sub _draw {
1776 my ($self) = @_; 1925 my ($self) = @_;
… …
1859 2008
1860 $self->{value}->set_fontsize ($fsize); 2009 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 2010 $self->{max} ->set_fontsize ($fsize);
1862} 2011}
1863 2012
2013sub set_max {
2014 my ($self, $max) = @_;
2015
2016 $self->{gauge}->set_max ($max);
2017 $self->{max}->set_text ($max);
2018}
2019
1864sub set_value { 2020sub set_value {
1865 my ($self, $val, $max) = @_; 2021 my ($self, $val, $max) = @_;
1866 2022
1867 $self->set_max ($max) 2023 $self->set_max ($max)
1868 if defined $max; 2024 if defined $max;
1869 2025
1870 $self->{gauge}->set_value ($val, $max); 2026 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 2027 $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} 2028}
1880 2029
1881############################################################################# 2030#############################################################################
1882 2031
1883package CFClient::UI::Slider; 2032package CFClient::UI::Slider;
… …
1893 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
1894 2043
1895sub new { 2044sub new {
1896 my $class = shift; 2045 my $class = shift;
1897 2046
1898 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
1899 2048
1900 # TODO: 0-width page 2049 # TODO: 0-width page
1901 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
1902 # TODO: calculations are off 2051 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
1905 active_fg => [0, 0, 0], 2054 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5],
1906 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
1907 req_w => 20, 2058 req_w => $::WIDTH / 80,
1908 req_h => 20, 2059 req_h => $::WIDTH / 80,
1909 vertical => 0, 2060 vertical => 0,
1910 can_hover => 1, 2061 can_hover => 1,
1911 inner_pad => 5, 2062 inner_pad => .05,
1912 @_ 2063 @_
1913 ); 2064 );
1914 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
1915 $self 2069 $self
2070}
2071
2072sub set_value {
2073 my ($self, $value) = @_;
2074
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076
2077 $hi = $lo + 1 if $hi <= $lo;
2078
2079 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi;
2081
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit;
2084
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088
2089 if ($value != $old_value) {
2090 $self->emit (changed => $value);
2091 $self->update;
2092 }
1916} 2093}
1917 2094
1918sub size_request { 2095sub size_request {
1919 my ($self) = @_; 2096 my ($self) = @_;
1920 2097
… …
1933 2110
1934sub mouse_motion { 2111sub mouse_motion {
1935 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
1936 2113
1937 if ($GRAB == $self) { 2114 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116
2117 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2120
2121 $self->set_value ($x * ($hi - $lo) + $lo);
2122 }
2123}
2124
2125sub update {
2126 my ($self) = @_;
2127
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]);
2130
1938 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
1939 2132
1940 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
1941 2134
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1944 2136
1945 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1946 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $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 2139
1951 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
1952 $self->update; 2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value;
2146 $self->{knob_w} = $page;
1953 } 2147 });
1954}
1955 2148
1956# the inner_* stuff is for generating a padding for the slider handle, 2149 $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} 2150}
1963 2151
1964sub _draw { 2152sub _draw {
1965 my ($self) = @_; 2153 my ($self) = @_;
1966 2154
1967 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
1968 2156
1969 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
1970 2158
1971 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
1972 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
1973 2161
1974 glRotate 90, 0, 0, 1; 2162 glRotate 90, 0, 0, 1;
1975 glTranslate 0, -$self->{w}, 0; 2163 glTranslate 0, 1, 0;
1976
1977 ($w, $h) = ($h, $w);
1978 } 2164 }
1979 2165
1980 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1981 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1982 2168
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; 2169 glEnable GL_TEXTURE_2D;
2004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005 2171
2006 # draw background 2172 # draw background
2007 $tex[1]->draw_quad (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2008 2174
2009 # draw handle 2175 # draw handle
2010 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2011 2177
2012 glDisable GL_BLEND;
2013 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
2014} 2179}
2015 2180
2016############################################################################# 2181#############################################################################
2017 2182
… …
2028 fontsize => 1, 2193 fontsize => 1,
2029 can_events => 0, 2194 can_events => 0,
2030 #font => default_font 2195 #font => default_font
2031 @_, 2196 @_,
2032 2197
2033 layout => (new CFClient::Layout), 2198 layout => (new CFClient::Layout 1),
2034 par => [], 2199 par => [],
2035 height => 0, 2200 height => 0,
2036 children => [ 2201 children => [
2037 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
2039 ], 2204 ],
2040 ); 2205 );
2041 2206
2042 $self->{children}[1]->connect (changed => sub { 2207 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2208
2046 $self 2209 $self
2047} 2210}
2048 2211
2049sub set_fontsize { 2212sub set_fontsize {
… …
2057 my ($self, $text) = @_; 2220 my ($self, $text) = @_;
2058 2221
2059 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
2060 2223
2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062 $layout->set_width ($self->{w}); 2225 $layout->set_width ($self->{children}[0]{w});
2063 $layout->set_text ($text); 2226 $layout->set_markup ($text);
2064 2227
2065 ($layout->size)[1] 2228 ($layout->size)[1]
2066} 2229}
2067 2230
2068sub reflow { 2231sub reflow {
… …
2106 2269
2107 return unless $self->{h} > 0; 2270 return unless $self->{h} > 0;
2108 2271
2109 delete $self->{texture}; 2272 delete $self->{texture};
2110 2273
2111 $ROOT->on_refresh ($self, sub { 2274 $ROOT->on_post_alloc ($self, sub {
2112 if (delete $self->{need_reflow}) { 2275 if (delete $self->{need_reflow}) {
2113 my $height = 0; 2276 my $height = 0;
2114 2277
2115 $height += $_->[0] = $self->text_height ($_->[2]) 2278 $height += $_->[0] = $self->text_height ($_->[2])
2116 for @{$self->{par}}; 2279 for @{$self->{par}};
… …
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2121 2284
2122 delete $self->{texture}; 2285 delete $self->{texture};
2123 } 2286 }
2124 2287
2125 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2126 glClearColor 0, 0, 0, 1; 2289 glClearColor 0, 0, 0, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
2128 2291
2129 glEnable GL_BLEND;
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D; 2292 glEnable GL_TEXTURE_2D;
2132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133 2294
2134 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2135 2296
… …
2144 2305
2145 for my $par (@{$self->{par}}) { 2306 for my $par (@{$self->{par}}) {
2146 my $h = $par->[0]; 2307 my $h = $par->[0];
2147 2308
2148 if ($y0 < $y + $h && $y < $y1) { 2309 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] });
2149 $layout->set_text ($par->[2]); 2311 $layout->set_markup ($par->[2]);
2150 2312
2151 glColor @{ $par->[1] };
2152 my ($W, $H) = $layout->size; 2313 my ($W, $H) = $layout->size;
2153 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2154 } 2315 }
2155 2316
2156 $y += $h; 2317 $y += $h;
2157 } 2318 }
2158 2319
2159 glDisable GL_TEXTURE_2D; 2320 glDisable GL_TEXTURE_2D;
2160 glDisable GL_BLEND;
2161 }; 2321 };
2162 }); 2322 });
2163} 2323}
2164 2324
2165sub _draw { 2325sub _draw {
2166 my ($self) = @_; 2326 my ($self) = @_;
2167 2327
2168 if ($self->{texture}) {
2169 glEnable GL_TEXTURE_2D; 2328 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2330 glColor 1, 1, 1, 1;
2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2173 glDisable GL_TEXTURE_2D; 2332 glDisable GL_TEXTURE_2D;
2174 }
2175 2333
2176 $self->{children}[1]->draw; 2334 $self->{children}[1]->draw;
2177 2335
2178} 2336}
2179 2337
… …
2273 @_, 2431 @_,
2274 can_events => 0, 2432 can_events => 0,
2275 ) 2433 )
2276} 2434}
2277 2435
2278sub set_markup { 2436sub set_tooltip_from {
2279 my ($self, $text) = @_; 2437 my ($self, $widget) = @_;
2280 2438
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2439 $self->add (new CFClient::UI::Label
2282 $self->{label}->set_markup ($text); 2440 markup => $widget->{tooltip},
2283 $self->add ($self->{label}); 2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8,
2443 fg => [0, 0, 0, 1],
2444 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP),
2446 );
2284} 2447}
2285 2448
2286sub size_request { 2449sub size_request {
2287 my ($self) = @_; 2450 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290 2451
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2452 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292 2453
2293 ($w + 4, $h + 4) 2454 ($w + 4, $h + 4)
2294} 2455}
… …
2300} 2461}
2301 2462
2302sub _draw { 2463sub _draw {
2303 my ($self) = @_; 2464 my ($self) = @_;
2304 2465
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375; 2466 glTranslate 0.375, 0.375;
2307 2467
2308 my ($w, $h) = @$self{qw(w h)}; 2468 my ($w, $h) = @$self{qw(w h)};
2309 2469
2310 glColor 1, 0.8, 0.4; 2470 glColor 1, 0.8, 0.4;
… …
2321 glVertex 0 , $h; 2481 glVertex 0 , $h;
2322 glVertex $w, $h; 2482 glVertex $w, $h;
2323 glVertex $w, 0; 2483 glVertex $w, 0;
2324 glEnd; 2484 glEnd;
2325 2485
2326 glPopMatrix; 2486 glTranslate 2 - 0.375, 2 - 0.375;
2327
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw; 2487 $self->SUPER::_draw;
2330} 2488}
2331 2489
2332############################################################################# 2490#############################################################################
2333 2491
… …
2348 2506
2349sub size_request { 2507sub size_request {
2350 (32, 8) 2508 (32, 8)
2351} 2509}
2352 2510
2353sub draw { 2511sub _draw {
2354 my ($self) = @_; 2512 my ($self) = @_;
2355 2513
2514 return unless $::CONN;#d# manage and cache textures differently
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357 2516
2517 # TODO animation
2358 if ($tex) { 2518 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2519 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1; 2521 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D; 2523 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND; 2524 }
2525}
2526
2527#############################################################################
2528
2529package CFClient::UI::InventoryItem;
2530
2531our @ISA = CFClient::UI::HBox::;
2532
2533sub _item_to_desc {
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558
2559sub new {
2560 my $class = shift;
2561
2562 my %args = @_;
2563
2564 my $item = delete $args{item};
2565
2566 my $desc = _item_to_desc ($item);
2567
2568 my $self = $class->SUPER::new (
2569 can_hover => 1,
2570 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_;
2575
2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2584 $::CONN->send ("move $targ $item->{tag} 0");
2585 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) {
2588 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ],
2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 }
2601
2602 1
2603 },
2604 %args
2605 );
2606
2607
2608 $self->add (new CFClient::UI::Face
2609 can_events => 0,
2610 face => $item->{face},
2611 anim => $item->{anim},
2612 animspeed => $item->{animspeed},
2613 );
2614
2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617 $self->{item} = $item;
2618
2619 $self->update_item;
2620
2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Inventory;
2635
2636our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638sub new {
2639 my $class = shift;
2640
2641 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox),
2643 @_,
2644 );
2645
2646 $self
2647}
2648
2649sub set_items {
2650 my ($self, $items) = @_;
2651
2652 $self->{scrolled}->clear;
2653 return unless $items;
2654
2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2659
2660 $self->{real_items} = \@items;
2661
2662 for my $item (@items) {
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2665 }
2666
2667 $self->{scrolled}->add (@items);
2668
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670}
2671
2672sub size_request {
2673 my ($self) = @_;
2674 ($self->{req_w}, $self->{req_h});
2675}
2676
2677#############################################################################
2678
2679package CFClient::UI::Menu;
2680
2681our @ISA = CFClient::UI::FancyFrame::;
2682
2683use CFClient::OpenGL;
2684
2685sub new {
2686 my $class = shift;
2687
2688 my $self = $class->SUPER::new (
2689 items => [],
2690 z => 100,
2691 @_,
2692 );
2693
2694 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2695
2696 for my $item (@{ $self->{items} }) {
2697 my ($widget, $cb) = @$item;
2698
2699 # handle various types of items, only text for now
2700 if (!ref $widget) {
2701 $widget = new CFClient::UI::Label
2702 can_hover => 1,
2703 can_events => 1,
2704 text => $widget;
2705 }
2706
2707 $self->{item}{$widget} = $item;
2708
2709 $self->{vbox}->add ($widget);
2710 }
2711
2712 $self
2713}
2714
2715# popup given the event (must be a mouse button down event currently)
2716sub popup {
2717 my ($self, $ev) = @_;
2718
2719 $self->emit ("popdown");
2720
2721 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self;
2723 $self->{button} = $ev->{button};
2724
2725 $self->show;
2726 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2727}
2728
2729sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_;
2731
2732 # TODO: should use vbox->find_widget or so
2733 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2734 $self->{hover} = $self->{item}{$HOVER};
2735}
2736
2737sub button_up {
2738 my ($self, $ev, $x, $y) = @_;
2739
2740 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB;
2742 $self->hide;
2743
2744 $self->emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover};
2746 }
2747}
2748
2749#############################################################################
2750
2751package CFClient::UI::Statusbox;
2752
2753our @ISA = CFClient::UI::VBox::;
2754
2755sub new {
2756 my $class = shift;
2757
2758 $class->SUPER::new (
2759 fontsize => 0.8,
2760 @_,
2367 } 2761 )
2762}
2763
2764sub reorder {
2765 my ($self) = @_;
2766 my $NOW = time;
2767
2768 while (my ($k, $v) = each %{ $self->{item} }) {
2769 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2770 }
2771
2772 my @widgets;
2773
2774 my @items = sort {
2775 $a->{pri} <=> $b->{pri}
2776 or $b->{id} <=> $a->{id}
2777 } values %{ $self->{item} };
2778
2779 my $count = 10 + 1;
2780 for my $item (@items) {
2781 last unless --$count;
2782
2783 push @widgets, $item->{label} ||= do {
2784 # TODO: doesn't handle markup well (read as: at all)
2785 my $short = $item->{count} > 1
2786 ? "<b>$item->{count} ×</b> $item->{text}"
2787 : $item->{text};
2788
2789 for ($short) {
2790 s/^\s+//;
2791 s/\s+/ /g;
2792 }
2793
2794 new CFClient::UI::Label
2795 markup => $short,
2796 tooltip => $item->{tooltip},
2797 tooltip_font => $::FONT_PROP,
2798 tooltip_width => 0.67,
2799 fontsize => $item->{fontsize} || $self->{fontsize},
2800 max_w => $::WIDTH * 0.44,
2801 fg => $item->{fg},
2802 can_events => 1,
2803 can_hover => 1
2804 };
2805 }
2806
2807 $self->clear;
2808 $self->SUPER::add (reverse @widgets);
2809}
2810
2811sub add {
2812 my ($self, $text, %arg) = @_;
2813
2814 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//;
2816
2817 my $timeout = time + ((delete $arg{timeout}) || 60);
2818
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820
2821 if (my $item = $self->{item}{$group}) {
2822 if ($item->{text} eq $text) {
2823 $item->{count}++;
2824 } else {
2825 $item->{count} = 1;
2826 $item->{text} = $item->{tooltip} = $text;
2827 }
2828 $item->{id} = ++$self->{id};
2829 $item->{timeout} = $timeout;
2830 delete $item->{label};
2831 } else {
2832 $self->{item}{$group} = {
2833 id => ++$self->{id},
2834 text => $text,
2835 timeout => $timeout,
2836 tooltip => $text,
2837 fg => [0.8, 0.8, 0.8, 0.8],
2838 pri => 0,
2839 count => 1,
2840 %arg,
2841 };
2842 }
2843
2844 $self->reorder;
2845}
2846
2847sub reconfigure {
2848 my ($self) = @_;
2849
2850 delete $_->{label}
2851 for values %{ $self->{item} || {} };
2852
2853 $self->reorder;
2854 $self->SUPER::reconfigure;
2368} 2855}
2369 2856
2370############################################################################# 2857#############################################################################
2371 2858
2372package CFClient::UI::Root; 2859package CFClient::UI::Root;
2373 2860
2374our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::Container::;
2375 2862
2376use CFClient::OpenGL; 2863use CFClient::OpenGL;
2377 2864
2378sub check_size { 2865sub new {
2379 my ($self) = @_; 2866 my $class = shift;
2380 2867
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2868 $class->SUPER::new (
2382} 2869 @_,
2383 2870 )
2384sub size_request {
2385 ($::WIDTH, $::HEIGHT)
2386} 2871}
2387 2872
2388sub configure { 2873sub configure {
2389 my ($self, $x, $y, $w, $h) = @_; 2874 my ($self, $x, $y, $w, $h) = @_;
2390 2875
2391 $self->SUPER::configure ($x, $y, $w, $h); 2876 $self->{w} = $w;
2877 $self->{h} = $h;
2878}
2392 2879
2880sub check_size {
2881 my ($self) = @_;
2882
2883 $self->size_allocate ($self->{w}, $self->{h})
2884 if $self->{w};
2885}
2886
2887sub size_request {
2888 my ($self) = @_;
2889
2890 ($self->{w}, $self->{h})
2891}
2892
2893sub size_allocate {
2894 my ($self, $w, $h) = @_;
2895
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2393 for my $child (@{$self->{children}}) { 2902 for my $child ($self->children) {
2394 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395 2904
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2906 if exists $child->{req_x};
2907
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2909 if exists $child->{req_y};
2910
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2911 $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; 2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913
2398 $child->configure ($X, $Y, $W,$H); 2914 $child->configure ($X, $Y, $W, $H);
2399 } 2915 }
2400} 2916}
2401 2917
2402sub _topleft { 2918sub coord2local {
2403 my ($self, $x, $y) = @_; 2919 my ($self, $x, $y) = @_;
2404 2920
2405 ($x, $y) 2921 ($x, $y)
2406} 2922}
2407 2923
2924sub coord2global {
2925 my ($self, $x, $y) = @_;
2926
2927 ($x, $y)
2928}
2929
2408sub update { 2930sub update {
2409 my ($self) = @_; 2931 my ($self) = @_;
2410 2932
2411 $self->check_size; 2933 $self->check_size;
2412 ::refresh (); 2934 $::WANT_REFRESH++;
2413} 2935}
2414 2936
2415sub add { 2937sub add {
2416 my ($self, $child) = @_; 2938 my ($self, @children) = @_;
2417 2939
2940 for my $child (@children) {
2941 $child->{toplevel} = 1;
2942
2418 # integerize window positions 2943 # integerise window positions
2419 $child->{x} = int $child->{x}; 2944 $child->{x} = int $child->{x};
2420 $child->{y} = int $child->{y}; 2945 $child->{y} = int $child->{y};
2946 }
2421 2947
2422 $self->SUPER::add ($child); 2948 $self->SUPER::add (@children);
2423} 2949}
2424 2950
2425sub on_refresh { 2951sub on_refresh {
2426 my ($self, $id, $cb) = @_; 2952 my ($self, $id, $cb) = @_;
2427 2953
2428 $self->{refresh_hook}{$id} = $cb; 2954 $self->{refresh_hook}{$id} = $cb;
2429} 2955}
2430 2956
2957sub on_post_alloc {
2958 my ($self, $id, $cb) = @_;
2959
2960 $self->{post_alloc_hook}{$id} = $cb;
2961}
2962
2431sub draw { 2963sub draw {
2432 my ($self) = @_; 2964 my ($self) = @_;
2433 2965
2434 while (my $rcb = delete $self->{refresh_hook}) { 2966 while ($self->{refresh_hook}) {
2435 $_->() for values %$rcb; 2967 $_->()
2968 for values %{delete $self->{refresh_hook}};
2969 }
2970
2971 if ($self->{check_size}) {
2972 my @queue = ([], []);
2973
2974 for (;;) {
2975 if ($self->{check_size}) {
2976 # heuristic: check containers last
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2978 for values %{delete $self->{check_size}}
2979 }
2980
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2982
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2984 ? @$widget{qw(user_w user_h)}
2985 : $widget->size_request;
2986
2987 if (delete $widget->{force_alloc}
2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2990
2991 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h;
2993
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2995
2996 $widget->{parent}->check_size
2997 if $widget->{parent};
2998 }
2999 }
3000 }
3001
3002 while ($self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) {
3004 my ($widget, $w, $h) = @$_;
3005
3006 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0;
3008
3009 $widget->{w} = $w;
3010 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h);
3012 $widget->emit (size_allocate => $w, $h);
3013 }
3014 }
3015
3016 while ($self->{post_alloc_hook}) {
3017 $_->()
3018 for values %{delete $self->{post_alloc_hook}};
2436 } 3019 }
2437 3020
2438 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440 glClear GL_COLOR_BUFFER_BIT; 3023 glClear GL_COLOR_BUFFER_BIT;
… …
2451############################################################################# 3034#############################################################################
2452 3035
2453package CFClient::UI; 3036package CFClient::UI;
2454 3037
2455$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2457 3040
24581 30411
2459 3042

Diff Legend

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