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.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.188 by root, Mon May 8 21:16:09 2006 UTC

… …
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_markup ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
… …
39 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
40} 48}
41 49
42# class methods for events 50# class methods for events
43sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
45} 54}
46 55
47sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
49} 59}
50 60
51sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
52 my ($ev) = @_; 62 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 71 check_tooltip;
62 } 72 }
63 73
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 75
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
67} 80}
68 81
69sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
70 my ($ev) = @_; 83 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
72 85
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 87
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 89
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
78 94
79 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 97 $grab->update if $grab;
82 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 115
100 check_tooltip; 116 check_tooltip;
101 } 117 }
102 118
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
104} 123}
105 124
106# convert position array to integers 125# convert position array to integers
107sub harmonize { 126sub harmonize {
108 my ($vals) = @_; 127 my ($vals) = @_;
… …
126 145
127sub new { 146sub new {
128 my $class = shift; 147 my $class = shift;
129 148
130 my $self = bless { 149 my $self = bless {
131 x => 0, 150 x => 0,
132 y => 0, 151 y => 0,
133 z => 0, 152 z => 0,
134 can_events => 1, 153 can_events => 1,
135 @_ 154 @_
136 }, $class; 155 }, $class;
137 156
138 for (keys %$self) { 157 for (keys %$self) {
… …
160} 179}
161 180
162sub hide { 181sub hide {
163 my ($self) = @_; 182 my ($self) = @_;
164 183
165 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
166 186
167 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
168} 189}
169 190
170sub move { 191sub move {
171 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
172 193
… …
216 $self->{w} = $w; 237 $self->{w} = $w;
217 $self->{h} = $h; 238 $self->{h} = $h;
218 239
219 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
220 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
221 } 243 }
222} 244}
223 245
224sub size_allocate { 246sub size_allocate {
225 # nothing to be done 247 # nothing to be done
248}
249
250sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
226} 263}
227 264
228sub set_max_size { 265sub set_max_size {
229 my ($self, $w, $h) = @_; 266 my ($self, $w, $h) = @_;
230 267
… …
233} 270}
234 271
235# return top left coordinates 272# return top left coordinates
236sub _topleft { 273sub _topleft {
237 my ($self, $x, $y) = @_; 274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
238 278
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 280}
241 281
242# translate global coordinates to local coordinate system 282# translate global coordinates to local coordinate system
… …
402} 442}
403 443
404sub emit { 444sub emit {
405 my ($self, $signal, @args) = @_; 445 my ($self, $signal, @args) = @_;
406 446
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408 $cb->($self, @args);
409 }
410} 448}
411 449
412sub DESTROY { 450sub DESTROY {
413 my ($self) = @_; 451 my ($self) = @_;
414 452
… …
481sub new { 519sub new {
482 my ($class, %arg) = @_; 520 my ($class, %arg) = @_;
483 521
484 my $children = delete $arg{children} || []; 522 my $children = delete $arg{children} || [];
485 523
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 524 my $self = $class->SUPER::new (
525 children => [],
526 can_events => 0,
527 %arg,
528 );
487 $self->add ($_) for @$children; 529 $self->add ($_) for @$children;
488 530
489 $self 531 $self
490} 532}
491 533
492sub add { 534sub add {
493 my ($self, $child) = @_; 535 my ($self, @widgets) = @_;
494 536
495 $child->set_parent ($self); 537 $_->set_parent ($self)
538 for @widgets;
496 539
497 use sort 'stable'; 540 use sort 'stable';
498 541
499 $self->{children} = [ 542 $self->{children} = [
500 sort { $a->{z} <=> $b->{z} } 543 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 544 @{$self->{children}}, @widgets
502 ]; 545 ];
503 546
504 $child->check_size; 547 $_->check_size
548 for @widgets;
549
550 $self->update;
551}
552
553sub children {
554 @{ $_[0]{children} }
505} 555}
506 556
507sub remove { 557sub remove {
508 my ($self, $child) = @_; 558 my ($self, $child) = @_;
509 559
510 delete $child->{parent}; 560 delete $child->{parent};
561 $child->hide;
511 562
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 563 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 564
514 $self->check_size; 565 $self->check_size;
515 $self->update; 566 $self->update;
516} 567}
517 568
518sub clear { 569sub clear {
519 my ($self) = @_; 570 my ($self) = @_;
520 571
521 delete $_->{parent} 572 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 573 $self->{children} = [];
574
575 for (@$children) {
576 delete $_->{parent};
577 $_->hide;
578 }
579
580 $self->check_size;
581 $self->update;
525} 582}
526 583
527sub find_widget { 584sub find_widget {
528 my ($self, $x, $y) = @_; 585 my ($self, $x, $y) = @_;
529 586
… …
604} 661}
605 662
606sub update { 663sub update {
607 my ($self) = @_; 664 my ($self) = @_;
608 665
609 # we want to do this delayed... 666 $ROOT->on_refresh ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 667 $self->SUPER::update;
612}
613
614sub render_chld {
615 my ($self) = @_;
616
617 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
618 glClearColor 0, 0, 0, 1;
619 glClear GL_COLOR_BUFFER_BIT;
620 $self->child->draw;
621 };
622} 668}
623 669
624sub size_allocate { 670sub size_allocate {
625 my ($self, $w, $h) = @_; 671 my ($self, $w, $h) = @_;
626 672
627 $self->child->configure (0, 0, $w, $h); 673 $self->SUPER::size_allocate ($w, $h);
674 $self->update;
675}
628 676
677sub _render {
678 $_[0]{children}[0]->draw;
679}
680
681sub render_child {
682 my ($self) = @_;
683
684 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
685 glClearColor 0, 0, 0, 0;
686 glClear GL_COLOR_BUFFER_BIT;
687
629 $self->render_chld; 688 $self->_render;
689# glColorMask 1, 1, 1, 0;
690# glEnable GL_BLEND;
691# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692# glRasterPos 0, 0;
693# glCopyPixels 0, 0, $self->{w}, $self->{h};
694# glDisable GL_BLEND;
695# glColorMask 1, 1, 1, 1;
696 };
630} 697}
631 698
632sub _draw { 699sub _draw {
633 my ($self) = @_; 700 my ($self) = @_;
634 701
… …
636 703
637 my $tex = $self->{texture} 704 my $tex = $self->{texture}
638 or return; 705 or return;
639 706
640 glEnable GL_BLEND; 707 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 709 glEnable GL_TEXTURE_2D;
643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 710 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711 glColor 0, 0, 0, 1;
644 712
645 $tex->draw_quad (0, 0, $w, $h); 713 $tex->draw_quad (0, 0, $w, $h);
646 714
647 glDisable GL_BLEND; 715 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 716 glDisable GL_TEXTURE_2D;
… …
652 720
653package CFClient::UI::ViewPort; 721package CFClient::UI::ViewPort;
654 722
655our @ISA = CFClient::UI::Window::; 723our @ISA = CFClient::UI::Window::;
656 724
657sub new { die }
658
659sub size_request { 725sub size_request {
660 my ($self) = @_; 726 my ($self) = @_;
661 727
662 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 728 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
663 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 729 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
664 730
665 @$self{qw(child_w child_h)} 731 @$self{qw(child_w child_h)}
666} 732}
667 733
668sub _draw { 734sub size_allocate {
669 my ($self) = @_; 735 my ($self, $w, $h) = @_;
670 736
671 $self->{children}[1]->draw; 737 $self->update;
672} 738}
673 739
740sub set_offset {
741 my ($self, $x, $y) = @_;
742
743 $self->{view_x} = int $x;
744 $self->{view_y} = int $y;
745
746 $self->update;
747}
748
749# hmm, this does not work for topleft of $self... but we should not aks for that
750sub _topleft {
751 my ($self, $x, $y) = @_;
752
753 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
754}
755
756sub find_widget {
757 my ($self, $x, $y) = @_;
758
759 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
760 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
761 ) {
762 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
763 } else {
764 $self->CFClient::UI::Base::find_widget ($x, $y)
765 }
766}
767
768sub _render {
769 my ($self) = @_;
770
771 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
772
773 $self->SUPER::_render;
774}
775
776#############################################################################
777
778package CFClient::UI::ScrolledWindow;
779
780our @ISA = CFClient::UI::HBox::;
781
782sub new {
783 my $class = shift;
784
785 my $self;
786
787 my $slider = new CFClient::UI::Slider
788 vertical => 1,
789 range => [0, 0, 1, 0.01], # HACK fix
790 connect_changed => sub {
791 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
792 },
793 ;
794
795 $self = $class->SUPER::new (
796 vp => (new CFClient::UI::ViewPort),
797 slider => $slider,
798 @_,
799 );
800
801 $self->{vp}->add ($self->{scrolled});
802 $self->add ($self->{vp});
803 $self->add ($self->{slider});
804
805 $self
806}
807
808#TODO# update range on size_allocate depeneing on child
809# update viewport offset on scroll
674 810
675############################################################################# 811#############################################################################
676 812
677package CFClient::UI::Frame; 813package CFClient::UI::Frame;
678 814
… …
733 my $class = shift; 869 my $class = shift;
734 870
735 # TODO: user_x, user_y, overwrite moveto? 871 # TODO: user_x, user_y, overwrite moveto?
736 872
737 my $self = $class->SUPER::new ( 873 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 874 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 875 border_bg => [1, 1, 1, 1],
740 border => 0.8, 876 border => 0.6,
741 can_events => 1, 877 can_events => 1,
742 @_ 878 @_
743 ); 879 );
744 880
745 $self->{title} &&= new CFClient::UI::Label 881 $self->{title} &&= new CFClient::UI::Label
746 align => 0, 882 align => 0,
747 valign => 1, 883 valign => 1,
748 text => $self->{title}, 884 text => $self->{title},
749 fontsize => 1; 885 fontsize => $self->{border};
750 886
751 $self 887 $self
752} 888}
753 889
754sub border { 890sub border {
… …
779} 915}
780 916
781sub button_down { 917sub button_down {
782 my ($self, $ev, $x, $y) = @_; 918 my ($self, $ev, $x, $y) = @_;
783 919
920 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 921 my $border = $self->border;
785 922
786 if ($x < $self->{w} && $x >= $self->{w} - $border 923 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 924 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 925
926 if ($lr & $td) {
927 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 928 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 929 my ($bw, $bh) = ($self->{w}, $self->{h});
791 930
931 my $mx = $x < $border;
932 my $my = $y < $border;
933
792 $self->{motion} = sub { 934 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 935 my ($ev, $x, $y) = @_;
794 936
795 ($x, $y) = ($ev->{x}, $ev->{y}); 937 my $dx = $ev->{x} - $ox;
938 my $dy = $ev->{y} - $oy;
796 939
797 $self->{user_w} = $bw + $x - $ox; 940 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 941 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
942 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
799 $self->check_size; 943 $self->check_size;
800 }; 944 };
801 945
802 } elsif ($x >= 0 && $x < $self->{w} 946 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 947 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 948 my ($bx, $by) = ($self->{x}, $self->{y});
807 949
808 $self->{motion} = sub { 950 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 951 my ($ev, $x, $y) = @_;
… …
845 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad (0, $h - $border, $w, $border);
849 991
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
850 my $bg = $tex[0]; 993 my $bg = $tex[0];
851 994
852 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 996 my $rep_x = $cw / $bg->{w};
854 my $rep_y = $ch / $bg->{h}; 997 my $rep_y = $ch / $bg->{h};
855 998
856 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
857 1000
858 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
859 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
860 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
861 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad ($border, $border, $cw, $ch);
862 1005
863 glDisable GL_TEXTURE_2D; 1006 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND; 1007 glDisable GL_BLEND;
1008 }
865 1009
866 $self->{title}->draw if $self->{title}; 1010 $self->{title}->draw if $self->{title};
1011
867 $self->child->draw; 1012 $self->child->draw;
868} 1013}
869 1014
870############################################################################# 1015#############################################################################
871 1016
… …
893 $self->{children}[$y][$x] = $child; 1038 $self->{children}[$y][$x] = $child;
894 1039
895 $child->check_size; 1040 $child->check_size;
896} 1041}
897 1042
1043sub children {
1044 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1045}
1046
898# TODO: move to container class maybe? send childs a signal on removal? 1047# TODO: move to container class maybe? send childs a signal on removal?
899sub clear { 1048sub clear {
900 my ($self) = @_; 1049 my ($self) = @_;
901 1050
1051 my @children = $self->children;
902 delete $self->{children}; 1052 delete $self->{children};
1053
1054 for (@children) {
1055 delete $_->{parent};
1056 $_->hide;
1057 }
1058
903 $self->update; 1059 $self->update;
904} 1060}
905 1061
906sub get_wh { 1062sub get_wh {
907 my ($self) = @_; 1063 my ($self) = @_;
… …
1130 1286
1131sub new { 1287sub new {
1132 my ($class, %arg) = @_; 1288 my ($class, %arg) = @_;
1133 1289
1134 my $self = $class->SUPER::new ( 1290 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1291 fg => [1, 1, 1],
1136 #font => default_font 1292 #font => default_font
1137 fontsize => 1, 1293 fontsize => 1,
1138 text => "", 1294 text => "",
1139 align => -1, 1295 align => -1,
1140 valign => -1, 1296 valign => -1,
1141 padding => 2, 1297 padding => 2,
1142 layout => new CFClient::Layout, 1298 layout => new CFClient::Layout,
1143 can_events => 0, 1299 can_events => 0,
1144 %arg 1300 %arg
1145 ); 1301 );
1146 1302
1147 if (exists $self->{template}) { 1303 if (exists $self->{template}) {
… …
1164 s/</&lt;/g; 1320 s/</&lt;/g;
1165 1321
1166 $_[1] 1322 $_[1]
1167} 1323}
1168 1324
1325sub update {
1326 my ($self) = @_;
1327
1328 delete $self->{texture};
1329 $self->SUPER::update;
1330}
1331
1169sub set_text { 1332sub set_text {
1170 my ($self, $text) = @_; 1333 my ($self, $text) = @_;
1171 1334
1335 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text";
1337
1172 $self->{layout}->set_text ($text); 1338 $self->{layout}->set_text ($text);
1173 1339
1174 delete $self->{texture}; 1340 delete $self->{texture};
1341 $self->update;
1175 $self->check_size; 1342 $self->check_size;
1176 $self->update;
1177} 1343}
1178 1344
1179sub set_markup { 1345sub set_markup {
1180 my ($self, $markup) = @_; 1346 my ($self, $markup) = @_;
1181 1347
1348 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup";
1350
1182 $self->{layout}->set_markup ($markup); 1351 $self->{layout}->set_markup ($markup);
1183 1352
1184 delete $self->{texture}; 1353 delete $self->{texture};
1354 $self->update;
1185 $self->check_size; 1355 $self->check_size;
1186 $self->update;
1187} 1356}
1188 1357
1189sub size_request { 1358sub size_request {
1190 my ($self) = @_; 1359 my ($self) = @_;
1191 1360
… …
1220sub set_fontsize { 1389sub set_fontsize {
1221 my ($self, $fontsize) = @_; 1390 my ($self, $fontsize) = @_;
1222 1391
1223 $self->{fontsize} = $fontsize; 1392 $self->{fontsize} = $fontsize;
1224 delete $self->{texture}; 1393 delete $self->{texture};
1394
1395 $self->update;
1225 $self->check_size; 1396 $self->check_size;
1226 $self->update;
1227} 1397}
1228 1398
1229sub _draw { 1399sub _draw {
1230 my ($self) = @_; 1400 my ($self) = @_;
1231 1401
… …
1271 1441
1272sub new { 1442sub new {
1273 my $class = shift; 1443 my $class = shift;
1274 1444
1275 $class->SUPER::new ( 1445 $class->SUPER::new (
1276 fg => [1, 1, 1], 1446 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1447 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1448 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1449 active_fg => [0, 0, 0],
1280 can_hover => 1, 1450 can_hover => 1,
1281 can_focus => 1, 1451 can_focus => 1,
1282 valign => 0, 1452 valign => 0,
1283 can_events => 1, 1453 can_events => 1,
1284 @_ 1454 @_
1285 ) 1455 )
1286} 1456}
1287 1457
… …
1441 my ($self, $ev) = @_; 1611 my ($self, $ev) = @_;
1442 1612
1443 my $sym = $ev->{sym}; 1613 my $sym = $ev->{sym};
1444 1614
1445 if ($sym == 13) { 1615 if ($sym == 13) {
1616 unshift @{$self->{history}},
1617 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = '';
1446 $self->emit (activate => $self->get_text); 1620 $self->emit (activate => $txt);
1447 $self->update; 1621 $self->update;
1622
1623 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text;
1626 }
1627 if (@{$self->{history} || []} > 0) {
1628 $self->{history_pointer}++;
1629 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1630 $self->{history_pointer} = @{$self->{history} || []} - 1;
1631 }
1632 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1633 }
1634
1635 } elsif ($sym == CFClient::SDLK_DOWN) {
1636 $self->{history_pointer}--;
1637 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1638
1639 if ($self->{history_pointer} >= 0) {
1640 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1641 } else {
1642 $self->set_text ($self->{history_saveback});
1643 }
1448 1644
1449 } else { 1645 } else {
1450 $self->SUPER::key_down ($ev); 1646 $self->SUPER::key_down ($ev);
1451 } 1647 }
1452 1648
… …
1466 1662
1467sub new { 1663sub new {
1468 my $class = shift; 1664 my $class = shift;
1469 1665
1470 $class->SUPER::new ( 1666 $class->SUPER::new (
1471 padding => 4, 1667 padding => 4,
1472 fg => [1, 1, 1], 1668 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2], 1669 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1670 active_fg => [0, 0, 1],
1475 can_hover => 1, 1671 can_hover => 1,
1476 align => 0, 1672 align => 0,
1477 valign => 0, 1673 valign => 0,
1478 can_events => 1, 1674 can_events => 1,
1479 @_ 1675 @_
1480 ) 1676 )
1481} 1677}
1482 1678
… …
1689} 1885}
1690 1886
1691sub set_max { 1887sub set_max {
1692 my ($self, $max) = @_; 1888 my ($self, $max) = @_;
1693 1889
1890 return if $self->{max_val} == $max;
1891
1694 $self->{max_val} = $max; 1892 $self->{max_val} = $max;
1893 $self->update;
1695} 1894}
1696 1895
1697sub set_value { 1896sub set_value {
1698 my ($self, $val, $max) = @_; 1897 my ($self, $val, $max) = @_;
1699 1898
1700 $self->set_max ($max) 1899 $self->set_max ($max)
1701 if defined $max; 1900 if defined $max;
1702 1901
1703 $max = $self->{max_val}; 1902 return if $self->{val} == $val;
1903
1704 $self->{val} = $val; 1904 $self->{val} = $val;
1705
1706 $self->update; 1905 $self->update;
1707} 1906}
1708 1907
1709sub _draw { 1908sub _draw {
1710 my ($self) = @_; 1909 my ($self) = @_;
… …
1773 1972
1774sub new { 1973sub new {
1775 my ($class, %arg) = @_; 1974 my ($class, %arg) = @_;
1776 1975
1777 my $self = $class->SUPER::new ( 1976 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 1977 tooltip => $arg{type},
1978 can_hover => 1,
1779 can_events => 1, 1979 can_events => 1,
1780 can_hover => 1,
1781 %arg, 1980 %arg,
1782 ); 1981 );
1783 1982
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1983 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1785 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1984 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1793 1992
1794 $self->{value}->set_fontsize ($fsize); 1993 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 1994 $self->{max} ->set_fontsize ($fsize);
1796} 1995}
1797 1996
1997sub set_max {
1998 my ($self, $max) = @_;
1999
2000 $self->{gauge}->set_max ($max);
2001 $self->{max}->set_text ($max);
2002}
2003
1798sub set_value { 2004sub set_value {
1799 my ($self, $val, $max) = @_; 2005 my ($self, $val, $max) = @_;
1800 2006
1801 $self->set_max ($max) 2007 $self->set_max ($max)
1802 if defined $max; 2008 if defined $max;
1803 2009
1804 $self->{gauge}->set_value ($val, $max); 2010 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 2011 $self->{value}->set_text ($val);
1806}
1807
1808sub set_max {
1809 my ($self, $max) = @_;
1810
1811 $self->{gauge}->set_max ($max);
1812 $self->{max}->set_text ($max);
1813} 2012}
1814 2013
1815############################################################################# 2014#############################################################################
1816 2015
1817package CFClient::UI::Slider; 2016package CFClient::UI::Slider;
… …
1836 # TODO: calculations are off 2035 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1839 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1840 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1841 req_w => 20, 2040 req_w => $::WIDTH / 80,
1842 req_h => 20, 2041 req_h => $::WIDTH / 80,
1843 vertical => 0, 2042 vertical => 0,
1844 can_hover => 1, 2043 can_hover => 1,
1845 inner_pad => 5, 2044 inner_pad => 5,
1846 @_ 2045 @_
1847 ); 2046 );
… …
1957 2156
1958sub new { 2157sub new {
1959 my $class = shift; 2158 my $class = shift;
1960 2159
1961 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1962 fontsize => 1, 2161 fontsize => 1,
2162 can_events => 0,
1963 #font => default_font 2163 #font => default_font
1964 @_, 2164 @_,
1965 2165
1966 layout => (new CFClient::Layout), 2166 layout => (new CFClient::Layout),
1967 par => [], 2167 par => [],
1968 height => 0, 2168 height => 0,
1969 children => [ 2169 children => [
1970 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
1972 ], 2172 ],
1973 ); 2173 );
1974 2174
1975 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2176
1979 $self 2177 $self
1980} 2178}
1981 2179
1982sub set_fontsize { 2180sub set_fontsize {
… …
1990 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
1991 2189
1992 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
1993 2191
1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
1996 $layout->set_text ($text); 2194 $layout->set_text ($text);
1997 2195
1998 ($layout->size)[1] 2196 ($layout->size)[1]
1999} 2197}
2000 2198
… …
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2054 2252
2055 delete $self->{texture}; 2253 delete $self->{texture};
2056 } 2254 }
2057 2255
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2059 glClearColor 0, 0, 0, 1; 2257 glClearColor 0, 0, 0, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
2061 2259
2062 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2064 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2096} 2294}
2097 2295
2098sub _draw { 2296sub _draw {
2099 my ($self) = @_; 2297 my ($self) = @_;
2100 2298
2101 if ($self->{texture}) { 2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2102 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
2103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1;
2104 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2105 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
2106 } 2306 glDisable GL_BLEND;
2107 2307
2108 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
2109 2309
2110} 2310}
2111 2311
… …
2159 2359
2160sub new { 2360sub new {
2161 my $class = shift; 2361 my $class = shift;
2162 2362
2163 my $self = $class->SUPER::new ( 2363 my $self = $class->SUPER::new (
2164 state => 0, 2364 state => 0,
2165 connect_activate => \&toggle_flopper, 2365 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2366 @_
2168 ); 2367 );
2169 2368
2170 if ($self->{state}) { 2369 if ($self->{state}) {
2171 $self->{state} = 0; 2370 $self->{state} = 0;
… …
2281 2480
2282sub size_request { 2481sub size_request {
2283 (32, 8) 2482 (32, 8)
2284} 2483}
2285 2484
2286sub draw { 2485sub _draw {
2287 my ($self) = @_; 2486 my ($self) = @_;
2288 2487
2488 return unless $::CONN;#d# manage and cache textures differently
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2290 2490
2491 # TODO animation
2291 if ($tex) { 2492 if ($tex) {
2292 glEnable GL_BLEND; 2493 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2495 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2300 } 2501 }
2301} 2502}
2302 2503
2303############################################################################# 2504#############################################################################
2304 2505
2506package CFClient::UI::InventoryItem;
2507
2508our @ISA = CFClient::UI::HBox::;
2509
2510sub new {
2511 my $class = shift;
2512
2513 my %args = @_;
2514
2515 my $item = $args{item};
2516
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521
2522 my $self = $class->SUPER::new (
2523 can_hover => 1,
2524 can_events => 1,
2525 tooltip => (CFClient::UI::Label->escape ($desc)
2526 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2527 connect_button_down => sub {
2528 my ($self, $ev, $x, $y) = @_;
2529
2530 # todo: maybe put examine on 1? but should just be a tooltip :(
2531 if ($ev->{button} == 1) {
2532 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2533 } elsif ($ev->{button} == 2) {
2534 $::CONN->send ("apply $item->{tag}");
2535 } elsif ($ev->{button} == 3) {
2536 CFClient::UI::Menu->new (
2537 items => [
2538 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539 [
2540 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541 sub { $::CONN->send ("lock $item->{tag}") },
2542 ],
2543 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2544 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2545 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2546 ],
2547 )->popup ($ev);
2548 }
2549
2550 1
2551 },
2552 %args
2553 );
2554 $self->add(new CFClient::UI::Face
2555 can_events => 0,
2556 face => $item->{face},
2557 anim => $item->{anim},
2558 animspeed => $item->{animspeed});
2559 $self->add(new CFClient::UI::Label
2560 can_events => 0,
2561 text => $desc);
2562
2563 $self
2564}
2565
2566#############################################################################
2567
2568package CFClient::UI::Inventory;
2569
2570our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub new {
2573 my $class = shift;
2574
2575 my $self = $class->SUPER::new (
2576 scrolled => (new CFClient::UI::VBox),
2577 @_,
2578 );
2579
2580 $self
2581}
2582
2583sub set_items {
2584 my ($self, $items) = @_;
2585
2586 $self->{scrolled}->clear;
2587 return unless $items;
2588
2589 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2590
2591 $self->{real_items} = \@items;
2592
2593 for my $item (@items) {
2594 my $desc = $item->{nrof} < 2
2595 ? $item->{name}
2596 : "$item->{nrof} $item->{name_pl}";
2597
2598 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2599 }
2600
2601# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2602}
2603
2604sub size_request {
2605 my ($self) = @_;
2606 ($self->{req_w}, $self->{req_h});
2607}
2608
2609#############################################################################
2610
2611package CFClient::UI::Menu;
2612
2613our @ISA = CFClient::UI::FancyFrame::;
2614
2615use CFClient::OpenGL;
2616
2617sub new {
2618 my $class = shift;
2619
2620 my $self = $class->SUPER::new (
2621 items => [],
2622 z => 100,
2623 @_,
2624 );
2625
2626 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2627
2628 for my $item (@{ $self->{items} }) {
2629 my ($widget, $cb) = @$item;
2630
2631 # handle various types of items, only text for now
2632 if (!ref $widget) {
2633 $widget = new CFClient::UI::Label
2634 can_hover => 1,
2635 can_events => 1,
2636 text => $widget;
2637 }
2638
2639 $self->{item}{$widget} = $item;
2640
2641 $self->{vbox}->add ($widget);
2642 }
2643
2644 $self
2645}
2646
2647# popup given the event (must be a mouse button down event currently)
2648sub popup {
2649 my ($self, $ev) = @_;
2650
2651 $self->emit ("popdown");
2652
2653 # maybe save $GRAB? must be careful about events...
2654 $GRAB = $self;
2655 $self->{button} = $ev->{button};
2656
2657 $self->show;
2658 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2659}
2660
2661sub mouse_motion {
2662 my ($self, $ev, $x, $y) = @_;
2663
2664 # TODO: should use vbox->find_widget or so
2665 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2666 $self->{hover} = $self->{item}{$HOVER};
2667}
2668
2669sub button_up {
2670 my ($self, $ev, $x, $y) = @_;
2671
2672 if ($ev->{button} == $self->{button}) {
2673 undef $GRAB;
2674 $self->hide;
2675
2676 $self->emit ("popdown");
2677 $self->{hover}[1]->() if $self->{hover};
2678 }
2679}
2680
2681#############################################################################
2682
2305package CFClient::UI::Root; 2683package CFClient::UI::Root;
2306 2684
2307our @ISA = CFClient::UI::Container::; 2685our @ISA = CFClient::UI::Container::;
2308 2686
2309use CFClient::OpenGL; 2687use CFClient::OpenGL;
2310 2688
2311sub check_size { 2689sub check_size {
2312 my ($self) = @_; 2690 my ($self) = @_;
2313 2691
2314 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2692 $self->configure (0, 0, $self->{w}, $self->{h});
2315} 2693}
2316 2694
2317sub size_request { 2695sub size_request {
2318 ($::WIDTH, $::HEIGHT) 2696 my ($self) = @_;
2697
2698 ($self->{w}, $self->{h})
2699}
2700
2701sub size_allocate {
2702 my ($self, $w, $h) = @_;
2703
2704 my $old_w = $self->{old_w};
2705 my $old_h = $self->{old_h};
2706
2707 if ($old_w && $old_h) {
2708 for my $child ($self->children) {
2709 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717 }
2718 }
2719
2720 $self->{old_w} = $w;
2721 $self->{old_h} = $h;
2319} 2722}
2320 2723
2321sub configure { 2724sub configure {
2322 my ($self, $x, $y, $w, $h) = @_; 2725 my ($self, $x, $y, $w, $h) = @_;
2323 2726
2324 $self->SUPER::configure ($x, $y, $w, $h); 2727 $self->SUPER::configure ($x, $y, $w, $h);
2325 2728
2326 for my $child (@{$self->{children}}) { 2729 for my $child ($self->children) {
2327 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2730 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2328 2731
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2732 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2330 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2733 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2331 $child->configure ($X, $Y, $W,$H); 2734 $child->configure ($X, $Y, $W, $H);
2332 } 2735 }
2333} 2736}
2334 2737
2335sub _topleft { 2738sub _topleft {
2336 my ($self, $x, $y) = @_; 2739 my ($self, $x, $y) = @_;

Diff Legend

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