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.182 by root, Sun Apr 30 11:17:08 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 $_->check_size;
226} 261}
227 262
228sub set_max_size { 263sub set_max_size {
229 my ($self, $w, $h) = @_; 264 my ($self, $w, $h) = @_;
230 265
… …
233} 268}
234 269
235# return top left coordinates 270# return top left coordinates
236sub _topleft { 271sub _topleft {
237 my ($self, $x, $y) = @_; 272 my ($self, $x, $y) = @_;
273
274 $self->{parent}
275 or Carp::confess "no parent widget in _topleft\n";#d#
238 276
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 278}
241 279
242# translate global coordinates to local coordinate system 280# translate global coordinates to local coordinate system
… …
402} 440}
403 441
404sub emit { 442sub emit {
405 my ($self, $signal, @args) = @_; 443 my ($self, $signal, @args) = @_;
406 444
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408 $cb->($self, @args);
409 }
410} 446}
411 447
412sub DESTROY { 448sub DESTROY {
413 my ($self) = @_; 449 my ($self) = @_;
414 450
… …
481sub new { 517sub new {
482 my ($class, %arg) = @_; 518 my ($class, %arg) = @_;
483 519
484 my $children = delete $arg{children} || []; 520 my $children = delete $arg{children} || [];
485 521
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 522 my $self = $class->SUPER::new (
523 children => [],
524 can_events => 0,
525 %arg,
526 );
487 $self->add ($_) for @$children; 527 $self->add ($_) for @$children;
488 528
489 $self 529 $self
490} 530}
491 531
… …
500 sort { $a->{z} <=> $b->{z} } 540 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 541 @{$self->{children}}, $child
502 ]; 542 ];
503 543
504 $child->check_size; 544 $child->check_size;
545 $self->update;
546}
547
548sub children {
549 @{ $_[0]{children} }
505} 550}
506 551
507sub remove { 552sub remove {
508 my ($self, $child) = @_; 553 my ($self, $child) = @_;
509 554
510 delete $child->{parent}; 555 delete $child->{parent};
556 $child->hide;
511 557
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 559
514 $self->check_size; 560 $self->check_size;
515 $self->update; 561 $self->update;
516} 562}
517 563
518sub clear { 564sub clear {
519 my ($self) = @_; 565 my ($self) = @_;
520 566
521 delete $_->{parent} 567 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 568 $self->{children} = [];
569
570 for (@$children) {
571 delete $_->{parent};
572 $_->hide;
573 }
574
575 $self->check_size;
576 $self->update;
525} 577}
526 578
527sub find_widget { 579sub find_widget {
528 my ($self, $x, $y) = @_; 580 my ($self, $x, $y) = @_;
529 581
… …
604} 656}
605 657
606sub update { 658sub update {
607 my ($self) = @_; 659 my ($self) = @_;
608 660
609 # we want to do this delayed... 661 $ROOT->on_refresh ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 662 $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} 663}
623 664
624sub size_allocate { 665sub size_allocate {
625 my ($self, $w, $h) = @_; 666 my ($self, $w, $h) = @_;
626 667
627 $self->child->configure (0, 0, $w, $h); 668 $self->SUPER::size_allocate ($w, $h);
669 $self->update;
670}
628 671
672sub _render {
673 $_[0]{children}[0]->draw;
674}
675
676sub render_child {
677 my ($self) = @_;
678
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT;
682
629 $self->render_chld; 683 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 };
630} 692}
631 693
632sub _draw { 694sub _draw {
633 my ($self) = @_; 695 my ($self) = @_;
634 696
… …
636 698
637 my $tex = $self->{texture} 699 my $tex = $self->{texture}
638 or return; 700 or return;
639 701
640 glEnable GL_BLEND; 702 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1;
644 707
645 $tex->draw_quad (0, 0, $w, $h); 708 $tex->draw_quad (0, 0, $w, $h);
646 709
647 glDisable GL_BLEND; 710 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 711 glDisable GL_TEXTURE_2D;
… …
652 715
653package CFClient::UI::ViewPort; 716package CFClient::UI::ViewPort;
654 717
655our @ISA = CFClient::UI::Window::; 718our @ISA = CFClient::UI::Window::;
656 719
657sub new { die }
658
659sub size_request { 720sub size_request {
660 my ($self) = @_; 721 my ($self) = @_;
661 722
662 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 723 @$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)}); 724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
664 725
665 @$self{qw(child_w child_h)} 726 @$self{qw(child_w child_h)}
666} 727}
667 728
668sub _draw { 729sub size_allocate {
669 my ($self) = @_; 730 my ($self, $w, $h) = @_;
670 731
671 $self->{children}[1]->draw; 732 $self->update;
672} 733}
673 734
735sub set_offset {
736 my ($self, $x, $y) = @_;
737
738 $self->{view_x} = int $x;
739 $self->{view_y} = int $y;
740
741 $self->update;
742}
743
744sub _render {
745 my ($self) = @_;
746
747 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748
749 $self->SUPER::_render;
750}
751
752#############################################################################
753
754package CFClient::UI::ScrolledWindow;
755
756our @ISA = CFClient::UI::HBox::;
757
758sub new {
759 my $class = shift;
760
761 my $self;
762
763 my $slider = new CFClient::UI::Slider
764 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
768 },
769 ;
770
771 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort),
773 slider => $slider,
774 @_,
775 );
776
777 $self->{vp}->add ($self->{scrolled});
778 $self->add ($self->{vp});
779 $self->add ($self->{slider});
780
781 $self
782}
783
784#TODO# update range on size_allocate depeneing on child
785# update viewport offset on scroll
674 786
675############################################################################# 787#############################################################################
676 788
677package CFClient::UI::Frame; 789package CFClient::UI::Frame;
678 790
… …
733 my $class = shift; 845 my $class = shift;
734 846
735 # TODO: user_x, user_y, overwrite moveto? 847 # TODO: user_x, user_y, overwrite moveto?
736 848
737 my $self = $class->SUPER::new ( 849 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 850 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 851 border_bg => [1, 1, 1, 1],
740 border => 0.8, 852 border => 0.6,
741 can_events => 1, 853 can_events => 1,
742 @_ 854 @_
743 ); 855 );
744 856
745 $self->{title} &&= new CFClient::UI::Label 857 $self->{title} &&= new CFClient::UI::Label
746 align => 0, 858 align => 0,
747 valign => 1, 859 valign => 1,
748 text => $self->{title}, 860 text => $self->{title},
749 fontsize => 1; 861 fontsize => $self->{border};
750 862
751 $self 863 $self
752} 864}
753 865
754sub border { 866sub border {
… …
779} 891}
780 892
781sub button_down { 893sub button_down {
782 my ($self, $ev, $x, $y) = @_; 894 my ($self, $ev, $x, $y) = @_;
783 895
896 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 897 my $border = $self->border;
785 898
786 if ($x < $self->{w} && $x >= $self->{w} - $border 899 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 900 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 901
902 if ($lr & $td) {
903 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 904 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 905 my ($bw, $bh) = ($self->{w}, $self->{h});
791 906
907 my $mx = $x < $border;
908 my $my = $y < $border;
909
792 $self->{motion} = sub { 910 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 911 my ($ev, $x, $y) = @_;
794 912
795 ($x, $y) = ($ev->{x}, $ev->{y}); 913 my $dx = $ev->{x} - $ox;
914 my $dy = $ev->{y} - $oy;
796 915
797 $self->{user_w} = $bw + $x - $ox; 916 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 917 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
918 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
799 $self->check_size; 919 $self->check_size;
800 }; 920 };
801 921
802 } elsif ($x >= 0 && $x < $self->{w} 922 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 924 my ($bx, $by) = ($self->{x}, $self->{y});
807 925
808 $self->{motion} = sub { 926 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 927 my ($ev, $x, $y) = @_;
… …
845 $tex[1]->draw_quad (0, 0, $w, $border); 963 $tex[1]->draw_quad (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 964 $tex[3]->draw_quad (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 966 $tex[4]->draw_quad (0, $h - $border, $w, $border);
849 967
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
850 my $bg = $tex[0]; 969 my $bg = $tex[0];
851 970
852 # TODO: repeat texture not scale 971 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 972 my $rep_x = $cw / $bg->{w};
854 my $rep_y = $ch / $bg->{h}; 973 my $rep_y = $ch / $bg->{h};
855 974
856 glColor @{ $self->{bg} }; 975 glColor @{ $self->{bg} };
857 976
858 $bg->{s} = $rep_x; 977 $bg->{s} = $rep_x;
859 $bg->{t} = $rep_y; 978 $bg->{t} = $rep_y;
860 $bg->{wrap_mode} = 1; 979 $bg->{wrap_mode} = 1;
861 $bg->draw_quad ($border, $border, $cw, $ch); 980 $bg->draw_quad ($border, $border, $cw, $ch);
862 981
863 glDisable GL_TEXTURE_2D; 982 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND; 983 glDisable GL_BLEND;
984 }
865 985
866 $self->{title}->draw if $self->{title}; 986 $self->{title}->draw if $self->{title};
987
867 $self->child->draw; 988 $self->child->draw;
868} 989}
869 990
870############################################################################# 991#############################################################################
871 992
… …
893 $self->{children}[$y][$x] = $child; 1014 $self->{children}[$y][$x] = $child;
894 1015
895 $child->check_size; 1016 $child->check_size;
896} 1017}
897 1018
1019sub children {
1020 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1021}
1022
898# TODO: move to container class maybe? send childs a signal on removal? 1023# TODO: move to container class maybe? send childs a signal on removal?
899sub clear { 1024sub clear {
900 my ($self) = @_; 1025 my ($self) = @_;
901 1026
1027 my @children = $self->children;
902 delete $self->{children}; 1028 delete $self->{children};
1029
1030 for (@children) {
1031 delete $_->{parent};
1032 $_->hide;
1033 }
1034
903 $self->update; 1035 $self->update;
904} 1036}
905 1037
906sub get_wh { 1038sub get_wh {
907 my ($self) = @_; 1039 my ($self) = @_;
… …
1130 1262
1131sub new { 1263sub new {
1132 my ($class, %arg) = @_; 1264 my ($class, %arg) = @_;
1133 1265
1134 my $self = $class->SUPER::new ( 1266 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1267 fg => [1, 1, 1],
1136 #font => default_font 1268 #font => default_font
1137 fontsize => 1, 1269 fontsize => 1,
1138 text => "", 1270 text => "",
1139 align => -1, 1271 align => -1,
1140 valign => -1, 1272 valign => -1,
1141 padding => 2, 1273 padding => 2,
1142 layout => new CFClient::Layout, 1274 layout => new CFClient::Layout,
1143 can_events => 0, 1275 can_events => 0,
1144 %arg 1276 %arg
1145 ); 1277 );
1146 1278
1147 if (exists $self->{template}) { 1279 if (exists $self->{template}) {
… …
1164 s/</&lt;/g; 1296 s/</&lt;/g;
1165 1297
1166 $_[1] 1298 $_[1]
1167} 1299}
1168 1300
1301sub update {
1302 my ($self) = @_;
1303
1304 delete $self->{texture};
1305 $self->SUPER::update;
1306}
1307
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1169sub set_text { 1314sub set_text {
1170 my ($self, $text) = @_; 1315 my ($self, $text) = @_;
1171 1316
1317 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text";
1319
1172 $self->{layout}->set_text ($text); 1320 $self->{layout}->set_text ($text);
1173 1321
1174 delete $self->{texture}; 1322 delete $self->{texture};
1323 $self->update;
1175 $self->check_size; 1324 $self->check_size;
1176 $self->update;
1177} 1325}
1178 1326
1179sub set_markup { 1327sub set_markup {
1180 my ($self, $markup) = @_; 1328 my ($self, $markup) = @_;
1181 1329
1330 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup";
1332
1182 $self->{layout}->set_markup ($markup); 1333 $self->{layout}->set_markup ($markup);
1183 1334
1184 delete $self->{texture}; 1335 delete $self->{texture};
1336 $self->update;
1185 $self->check_size; 1337 $self->check_size;
1186 $self->update;
1187} 1338}
1188 1339
1189sub size_request { 1340sub size_request {
1190 my ($self) = @_; 1341 my ($self) = @_;
1191 1342
… …
1271 1422
1272sub new { 1423sub new {
1273 my $class = shift; 1424 my $class = shift;
1274 1425
1275 $class->SUPER::new ( 1426 $class->SUPER::new (
1276 fg => [1, 1, 1], 1427 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1428 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1429 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1430 active_fg => [0, 0, 0],
1280 can_hover => 1, 1431 can_hover => 1,
1281 can_focus => 1, 1432 can_focus => 1,
1282 valign => 0, 1433 valign => 0,
1283 can_events => 1, 1434 can_events => 1,
1284 @_ 1435 @_
1285 ) 1436 )
1286} 1437}
1287 1438
… …
1441 my ($self, $ev) = @_; 1592 my ($self, $ev) = @_;
1442 1593
1443 my $sym = $ev->{sym}; 1594 my $sym = $ev->{sym};
1444 1595
1445 if ($sym == 13) { 1596 if ($sym == 13) {
1597 unshift @{$self->{history}},
1598 my $txt = $self->get_text;
1599 $self->{history_pointer} = -1;
1600 $self->{history_saveback} = '';
1446 $self->emit (activate => $self->get_text); 1601 $self->emit (activate => $txt);
1447 $self->update; 1602 $self->update;
1603
1604 } elsif ($sym == CFClient::SDLK_UP) {
1605 if ($self->{history_pointer} < 0) {
1606 $self->{history_saveback} = $self->get_text;
1607 }
1608 if (@{$self->{history} || []} > 0) {
1609 $self->{history_pointer}++;
1610 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1611 $self->{history_pointer} = @{$self->{history} || []} - 1;
1612 }
1613 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1614 }
1615
1616 } elsif ($sym == CFClient::SDLK_DOWN) {
1617 $self->{history_pointer}--;
1618 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1619
1620 if ($self->{history_pointer} >= 0) {
1621 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1622 } else {
1623 $self->set_text ($self->{history_saveback});
1624 }
1448 1625
1449 } else { 1626 } else {
1450 $self->SUPER::key_down ($ev); 1627 $self->SUPER::key_down ($ev);
1451 } 1628 }
1452 1629
… …
1466 1643
1467sub new { 1644sub new {
1468 my $class = shift; 1645 my $class = shift;
1469 1646
1470 $class->SUPER::new ( 1647 $class->SUPER::new (
1471 padding => 4, 1648 padding => 4,
1472 fg => [1, 1, 1], 1649 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2], 1650 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1651 active_fg => [0, 0, 1],
1475 can_hover => 1, 1652 can_hover => 1,
1476 align => 0, 1653 align => 0,
1477 valign => 0, 1654 valign => 0,
1478 can_events => 1, 1655 can_events => 1,
1479 @_ 1656 @_
1480 ) 1657 )
1481} 1658}
1482 1659
… …
1689} 1866}
1690 1867
1691sub set_max { 1868sub set_max {
1692 my ($self, $max) = @_; 1869 my ($self, $max) = @_;
1693 1870
1871 return if $self->{max_val} == $max;
1872
1694 $self->{max_val} = $max; 1873 $self->{max_val} = $max;
1874 $self->update;
1695} 1875}
1696 1876
1697sub set_value { 1877sub set_value {
1698 my ($self, $val, $max) = @_; 1878 my ($self, $val, $max) = @_;
1699 1879
1700 $self->set_max ($max) 1880 $self->set_max ($max)
1701 if defined $max; 1881 if defined $max;
1702 1882
1703 $max = $self->{max_val}; 1883 return if $self->{val} == $val;
1884
1704 $self->{val} = $val; 1885 $self->{val} = $val;
1705
1706 $self->update; 1886 $self->update;
1707} 1887}
1708 1888
1709sub _draw { 1889sub _draw {
1710 my ($self) = @_; 1890 my ($self) = @_;
… …
1773 1953
1774sub new { 1954sub new {
1775 my ($class, %arg) = @_; 1955 my ($class, %arg) = @_;
1776 1956
1777 my $self = $class->SUPER::new ( 1957 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 1958 tooltip => $arg{type},
1959 can_hover => 1,
1779 can_events => 1, 1960 can_events => 1,
1780 can_hover => 1,
1781 %arg, 1961 %arg,
1782 ); 1962 );
1783 1963
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1964 $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); 1965 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1793 1973
1794 $self->{value}->set_fontsize ($fsize); 1974 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 1975 $self->{max} ->set_fontsize ($fsize);
1796} 1976}
1797 1977
1978sub set_max {
1979 my ($self, $max) = @_;
1980
1981 $self->{gauge}->set_max ($max);
1982 $self->{max}->set_text ($max);
1983}
1984
1798sub set_value { 1985sub set_value {
1799 my ($self, $val, $max) = @_; 1986 my ($self, $val, $max) = @_;
1800 1987
1801 $self->set_max ($max) 1988 $self->set_max ($max)
1802 if defined $max; 1989 if defined $max;
1803 1990
1804 $self->{gauge}->set_value ($val, $max); 1991 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 1992 $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} 1993}
1814 1994
1815############################################################################# 1995#############################################################################
1816 1996
1817package CFClient::UI::Slider; 1997package CFClient::UI::Slider;
… …
1836 # TODO: calculations are off 2016 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 2017 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 2018 fg => [1, 1, 1],
1839 active_fg => [0, 0, 0], 2019 active_fg => [0, 0, 0],
1840 range => [0, 0, 100, 10], 2020 range => [0, 0, 100, 10],
1841 req_w => 20, 2021 req_w => $::WIDTH / 80,
1842 req_h => 20, 2022 req_h => $::WIDTH / 80,
1843 vertical => 0, 2023 vertical => 0,
1844 can_hover => 1, 2024 can_hover => 1,
1845 inner_pad => 5, 2025 inner_pad => 5,
1846 @_ 2026 @_
1847 ); 2027 );
… …
1957 2137
1958sub new { 2138sub new {
1959 my $class = shift; 2139 my $class = shift;
1960 2140
1961 my $self = $class->SUPER::new ( 2141 my $self = $class->SUPER::new (
1962 fontsize => 1, 2142 fontsize => 1,
2143 can_events => 0,
1963 #font => default_font 2144 #font => default_font
1964 @_, 2145 @_,
1965 2146
1966 layout => (new CFClient::Layout), 2147 layout => (new CFClient::Layout),
1967 par => [], 2148 par => [],
1968 height => 0, 2149 height => 0,
1969 children => [ 2150 children => [
1970 (new CFClient::UI::Empty expand => 1), 2151 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2152 (new CFClient::UI::Slider vertical => 1),
1972 ], 2153 ],
1973 ); 2154 );
1974 2155
1975 $self->{children}[1]->connect (changed => sub { 2156 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2157
1979 $self 2158 $self
1980} 2159}
1981 2160
1982sub set_fontsize { 2161sub set_fontsize {
… …
1990 my ($self, $text) = @_; 2169 my ($self, $text) = @_;
1991 2170
1992 my $layout = $self->{layout}; 2171 my $layout = $self->{layout};
1993 2172
1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995 $layout->set_width ($self->{w}); 2174 $layout->set_width ($self->{children}[0]{w});
1996 $layout->set_text ($text); 2175 $layout->set_text ($text);
1997 2176
1998 ($layout->size)[1] 2177 ($layout->size)[1]
1999} 2178}
2000 2179
… …
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2054 2233
2055 delete $self->{texture}; 2234 delete $self->{texture};
2056 } 2235 }
2057 2236
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2059 glClearColor 0, 0, 0, 1; 2238 glClearColor 0, 0, 0, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2239 glClear GL_COLOR_BUFFER_BIT;
2061 2240
2062 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2064 glEnable GL_TEXTURE_2D; 2243 glEnable GL_TEXTURE_2D;
… …
2096} 2275}
2097 2276
2098sub _draw { 2277sub _draw {
2099 my ($self) = @_; 2278 my ($self) = @_;
2100 2279
2101 if ($self->{texture}) { 2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2102 glEnable GL_TEXTURE_2D; 2282 glEnable GL_TEXTURE_2D;
2103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1;
2104 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2105 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
2106 } 2287 glDisable GL_BLEND;
2107 2288
2108 $self->{children}[1]->draw; 2289 $self->{children}[1]->draw;
2109 2290
2110} 2291}
2111 2292
… …
2159 2340
2160sub new { 2341sub new {
2161 my $class = shift; 2342 my $class = shift;
2162 2343
2163 my $self = $class->SUPER::new ( 2344 my $self = $class->SUPER::new (
2164 state => 0, 2345 state => 0,
2165 connect_activate => \&toggle_flopper, 2346 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2347 @_
2168 ); 2348 );
2169 2349
2170 if ($self->{state}) { 2350 if ($self->{state}) {
2171 $self->{state} = 0; 2351 $self->{state} = 0;
… …
2281 2461
2282sub size_request { 2462sub size_request {
2283 (32, 8) 2463 (32, 8)
2284} 2464}
2285 2465
2286sub draw { 2466sub _draw {
2287 my ($self) = @_; 2467 my ($self) = @_;
2288 2468
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2290 2470
2471 # TODO animation
2291 if ($tex) { 2472 if ($tex) {
2292 glEnable GL_BLEND; 2473 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2475 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2300 } 2481 }
2301} 2482}
2302 2483
2303############################################################################# 2484#############################################################################
2304 2485
2486package CFClient::UI::Menu;
2487
2488our @ISA = CFClient::UI::FancyFrame::;
2489
2490use CFClient::OpenGL;
2491
2492sub new {
2493 my $class = shift;
2494
2495 my $self = $class->SUPER::new (
2496 items => [],
2497 z => 100,
2498 @_,
2499 );
2500
2501 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2502
2503 for my $item (@{ $self->{items} }) {
2504 my ($widget, $cb) = @$item;
2505
2506 # handle various types of items, only text for now
2507 if (!ref $widget) {
2508 $widget = new CFClient::UI::Label
2509 can_hover => 1,
2510 can_events => 1,
2511 text => $widget;
2512 }
2513
2514 $self->{item}{$widget} = $item;
2515
2516 $self->{vbox}->add ($widget);
2517 }
2518
2519 $self
2520}
2521
2522# popup given the event (must be a mouse button down event currently)
2523sub popup {
2524 my ($self, $ev) = @_;
2525
2526 $self->emit ("popdown");
2527
2528 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self;
2530 $self->{button} = $ev->{button};
2531
2532 $self->show;
2533 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2534}
2535
2536sub mouse_motion {
2537 my ($self, $ev, $x, $y) = @_;
2538
2539 # TODO: should use vbox->find_widget or so
2540 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2541 $self->{hover} = $self->{item}{$HOVER};
2542}
2543
2544sub button_up {
2545 my ($self, $ev, $x, $y) = @_;
2546
2547 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB;
2549 $self->hide;
2550
2551 $self->emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover};
2553 }
2554}
2555
2556#############################################################################
2557
2305package CFClient::UI::Root; 2558package CFClient::UI::Root;
2306 2559
2307our @ISA = CFClient::UI::Container::; 2560our @ISA = CFClient::UI::Container::;
2308 2561
2309use CFClient::OpenGL; 2562use CFClient::OpenGL;
… …
2381 $self->_draw; 2634 $self->_draw;
2382} 2635}
2383 2636
2384############################################################################# 2637#############################################################################
2385 2638
2639package CFClient::UI::Inventory;
2640
2641our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my $self = $class->SUPER::new (
2647 scrolled => (new CFClient::UI::VBox),
2648 @_,
2649 );
2650
2651 $self
2652}
2653
2654sub set_items {
2655 my ($self, $items) = @_;
2656
2657 $self->{scrolled}->clear;
2658 return unless $items;
2659
2660 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662 $self->{real_items} = \@items;
2663
2664 for my $item (@items) {
2665 my $desc = $item->{nrof} < 2
2666 ? $item->{name}
2667 : "$item->{nrof} $item->{name_pl}";
2668
2669 my $hb = new CFClient::UI::HBox;
2670
2671 $hb->add (my $f = new CFClient::UI::Face
2672 can_events => 0,
2673 face => $item->{face},
2674 anim => $item->{anim},
2675 animspeed => $item->{animspeed},
2676 expand => 1,
2677 );
2678 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679 $self->{scrolled}->add ($hb);
2680 }
2681
2682# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683}
2684
2685sub size_request {
2686 my ($self) = @_;
2687 (100, 200)
2688}
2689
2690#############################################################################
2691
2386package CFClient::UI; 2692package CFClient::UI;
2387 2693
2388$ROOT = new CFClient::UI::Root; 2694$ROOT = new CFClient::UI::Root;
2389$TOOLTIP = new CFClient::UI::Tooltip; 2695$TOOLTIP = new CFClient::UI::Tooltip;
2390 2696

Diff Legend

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