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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.184 by root, Wed May 3 19:56:05 2006 UTC

… …
23 23
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_text ($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
… …
320 glVertex $x + $self->{w}, $y + $self->{h}; 358 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 359 glVertex $x , $y + $self->{h};
322 glEnd; 360 glEnd;
323 glDisable GL_BLEND; 361 glDisable GL_BLEND;
324 } 362 }
363
364 if ($ENV{PCLIENT_DEBUG}) {
365 glPushMatrix;
366 glColor 1, 1, 0, 1;
367 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368 glBegin GL_LINE_LOOP;
369 glVertex 0 , 0;
370 glVertex $self->{w}, 0;
371 glVertex $self->{w}, $self->{h};
372 glVertex 0 , $self->{h};
373 glEnd;
374 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 }
325} 377}
326 378
327sub _draw { 379sub _draw {
328 my ($self) = @_; 380 my ($self) = @_;
329 381
… …
388} 440}
389 441
390sub emit { 442sub emit {
391 my ($self, $signal, @args) = @_; 443 my ($self, $signal, @args) = @_;
392 444
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394 $cb->($self, @args);
395 }
396} 446}
397 447
398sub DESTROY { 448sub DESTROY {
399 my ($self) = @_; 449 my ($self) = @_;
400 450
… …
467sub new { 517sub new {
468 my ($class, %arg) = @_; 518 my ($class, %arg) = @_;
469 519
470 my $children = delete $arg{children} || []; 520 my $children = delete $arg{children} || [];
471 521
472 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 );
473 $self->add ($_) for @$children; 527 $self->add ($_) for @$children;
474 528
475 $self 529 $self
476} 530}
477 531
… …
486 sort { $a->{z} <=> $b->{z} } 540 sort { $a->{z} <=> $b->{z} }
487 @{$self->{children}}, $child 541 @{$self->{children}}, $child
488 ]; 542 ];
489 543
490 $child->check_size; 544 $child->check_size;
545 $self->update;
546}
547
548sub children {
549 @{ $_[0]{children} }
491} 550}
492 551
493sub remove { 552sub remove {
494 my ($self, $child) = @_; 553 my ($self, $child) = @_;
495 554
496 delete $child->{parent}; 555 delete $child->{parent};
556 $child->hide;
497 557
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559
560 $self->check_size;
561 $self->update;
562}
563
564sub clear {
565 my ($self) = @_;
566
567 my $children = delete $self->{children};
568 $self->{children} = [];
569
570 for (@$children) {
571 delete $_->{parent};
572 $_->hide;
573 }
499 574
500 $self->check_size; 575 $self->check_size;
501 $self->update; 576 $self->update;
502} 577}
503 578
… …
581} 656}
582 657
583sub update { 658sub update {
584 my ($self) = @_; 659 my ($self) = @_;
585 660
586 # we want to do this delayed... 661 $ROOT->on_refresh ($self => sub { $self->render_child });
587 $self->render_chld;
588 $self->SUPER::update; 662 $self->SUPER::update;
589}
590
591sub render_chld {
592 my ($self) = @_;
593
594 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595 glClearColor 0, 0, 0, 1;
596 glClear GL_COLOR_BUFFER_BIT;
597 $self->child->draw;
598 };
599} 663}
600 664
601sub size_allocate { 665sub size_allocate {
602 my ($self, $w, $h) = @_; 666 my ($self, $w, $h) = @_;
603 667
604 $self->child->configure (0, 0, $w, $h); 668 $self->SUPER::size_allocate ($w, $h);
669 $self->update;
670}
605 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
606 $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 };
607} 692}
608 693
609sub _draw { 694sub _draw {
610 my ($self) = @_; 695 my ($self) = @_;
611 696
… …
613 698
614 my $tex = $self->{texture} 699 my $tex = $self->{texture}
615 or return; 700 or return;
616 701
617 glEnable GL_BLEND; 702 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
620 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;
621 707
622 $tex->draw_quad (0, 0, $w, $h); 708 $tex->draw_quad (0, 0, $w, $h);
623 709
624 glDisable GL_BLEND; 710 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 711 glDisable GL_TEXTURE_2D;
… …
629 715
630package CFClient::UI::ViewPort; 716package CFClient::UI::ViewPort;
631 717
632our @ISA = CFClient::UI::Window::; 718our @ISA = CFClient::UI::Window::;
633 719
634sub new { die }
635
636sub size_request { 720sub size_request {
637 my ($self) = @_; 721 my ($self) = @_;
638 722
639 @$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)};
640 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
641 725
642 @$self{qw(child_w child_h)} 726 @$self{qw(child_w child_h)}
643} 727}
644 728
645sub _draw { 729sub size_allocate {
646 my ($self) = @_; 730 my ($self, $w, $h) = @_;
647 731
648 $self->{children}[1]->draw; 732 $self->update;
649} 733}
650 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
744# hmm, this does not work for topleft of $self... but we should not aks for that
745sub _topleft {
746 my ($self, $x, $y) = @_;
747
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
749}
750
751sub find_widget {
752 my ($self, $x, $y) = @_;
753
754 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
755 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
756 ) {
757 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
758 } else {
759 $self->CFClient::UI::Base::find_widget ($x, $y)
760 }
761}
762
763sub _render {
764 my ($self) = @_;
765
766 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
767
768 $self->SUPER::_render;
769}
770
771#############################################################################
772
773package CFClient::UI::ScrolledWindow;
774
775our @ISA = CFClient::UI::HBox::;
776
777sub new {
778 my $class = shift;
779
780 my $self;
781
782 my $slider = new CFClient::UI::Slider
783 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
787 },
788 ;
789
790 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort),
792 slider => $slider,
793 @_,
794 );
795
796 $self->{vp}->add ($self->{scrolled});
797 $self->add ($self->{vp});
798 $self->add ($self->{slider});
799
800 $self
801}
802
803#TODO# update range on size_allocate depeneing on child
804# update viewport offset on scroll
651 805
652############################################################################# 806#############################################################################
653 807
654package CFClient::UI::Frame; 808package CFClient::UI::Frame;
655 809
… …
710 my $class = shift; 864 my $class = shift;
711 865
712 # TODO: user_x, user_y, overwrite moveto? 866 # TODO: user_x, user_y, overwrite moveto?
713 867
714 my $self = $class->SUPER::new ( 868 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 869 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 870 border_bg => [1, 1, 1, 1],
717 border => 0.8, 871 border => 0.6,
718 can_events => 1, 872 can_events => 1,
719 @_ 873 @_
720 ); 874 );
721 875
722 $self->{title} &&= new CFClient::UI::Label 876 $self->{title} &&= new CFClient::UI::Label
723 align => 0, 877 align => 0,
724 valign => 1, 878 valign => 1,
725 text => $self->{title}, 879 text => $self->{title},
726 fontsize => 1; 880 fontsize => $self->{border};
727 881
728 $self 882 $self
729} 883}
730 884
731sub border { 885sub border {
… …
756} 910}
757 911
758sub button_down { 912sub button_down {
759 my ($self, $ev, $x, $y) = @_; 913 my ($self, $ev, $x, $y) = @_;
760 914
915 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 916 my $border = $self->border;
762 917
763 if ($x < $self->{w} && $x >= $self->{w} - $border 918 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 919 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 920
921 if ($lr & $td) {
922 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 924 my ($bw, $bh) = ($self->{w}, $self->{h});
768 925
926 my $mx = $x < $border;
927 my $my = $y < $border;
928
769 $self->{motion} = sub { 929 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 930 my ($ev, $x, $y) = @_;
771 931
772 ($x, $y) = ($ev->{x}, $ev->{y}); 932 my $dx = $ev->{x} - $ox;
933 my $dy = $ev->{y} - $oy;
773 934
774 $self->{user_w} = $bw + $x - $ox; 935 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 936 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
937 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
776 $self->check_size; 938 $self->check_size;
777 }; 939 };
778 940
779 } elsif ($x >= 0 && $x < $self->{w} 941 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 942 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 943 my ($bx, $by) = ($self->{x}, $self->{y});
784 944
785 $self->{motion} = sub { 945 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 946 my ($ev, $x, $y) = @_;
… …
822 $tex[1]->draw_quad (0, 0, $w, $border); 982 $tex[1]->draw_quad (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 983 $tex[3]->draw_quad (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 985 $tex[4]->draw_quad (0, $h - $border, $w, $border);
826 986
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827 my $bg = $tex[0]; 988 my $bg = $tex[0];
828 989
829 # TODO: repeat texture not scale 990 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 991 my $rep_x = $cw / $bg->{w};
831 my $rep_y = $ch / $bg->{h}; 992 my $rep_y = $ch / $bg->{h};
832 993
833 glColor @{ $self->{bg} }; 994 glColor @{ $self->{bg} };
834 995
835 $bg->{s} = $rep_x; 996 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y; 997 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1; 998 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 999 $bg->draw_quad ($border, $border, $cw, $ch);
839 1000
840 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
1003 }
842 1004
843 $self->{title}->draw if $self->{title}; 1005 $self->{title}->draw if $self->{title};
1006
844 $self->child->draw; 1007 $self->child->draw;
845} 1008}
846 1009
847############################################################################# 1010#############################################################################
848 1011
… …
870 $self->{children}[$y][$x] = $child; 1033 $self->{children}[$y][$x] = $child;
871 1034
872 $child->check_size; 1035 $child->check_size;
873} 1036}
874 1037
1038sub children {
1039 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040}
1041
875# TODO: move to container class maybe? send childs a signal on removal? 1042# TODO: move to container class maybe? send childs a signal on removal?
876sub clear { 1043sub clear {
877 my ($self) = @_; 1044 my ($self) = @_;
878 1045
1046 my @children = $self->children;
879 delete $self->{children}; 1047 delete $self->{children};
1048
1049 for (@children) {
1050 delete $_->{parent};
1051 $_->hide;
1052 }
1053
880 $self->update; 1054 $self->update;
881} 1055}
882 1056
883sub get_wh { 1057sub get_wh {
884 my ($self) = @_; 1058 my ($self) = @_;
… …
1107 1281
1108sub new { 1282sub new {
1109 my ($class, %arg) = @_; 1283 my ($class, %arg) = @_;
1110 1284
1111 my $self = $class->SUPER::new ( 1285 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1286 fg => [1, 1, 1],
1113 #font => default_font 1287 #font => default_font
1114 fontsize => 1, 1288 fontsize => 1,
1115 text => "", 1289 text => "",
1116 align => -1, 1290 align => -1,
1117 valign => -1, 1291 valign => -1,
1118 padding => 2, 1292 padding => 2,
1119 layout => new CFClient::Layout, 1293 layout => new CFClient::Layout,
1120 can_events => 0, 1294 can_events => 0,
1121 %arg 1295 %arg
1122 ); 1296 );
1123 1297
1124 if (exists $self->{template}) { 1298 if (exists $self->{template}) {
… …
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1305 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1132 1306
1133 $self 1307 $self
1134} 1308}
1135 1309
1136sub escape_text { 1310sub escape {
1137 local $_ = $_[1]; 1311 local $_ = $_[1];
1138 1312
1139 s/&/&amp;/g; 1313 s/&/&amp;/g;
1140 s/>/&gt;/g; 1314 s/>/&gt;/g;
1141 s/</&lt;/g; 1315 s/</&lt;/g;
1142 1316
1143 $_[1] 1317 $_[1]
1144} 1318}
1145 1319
1320sub update {
1321 my ($self) = @_;
1322
1323 delete $self->{texture};
1324 $self->SUPER::update;
1325}
1326
1327sub reconfigure {
1328 my ($self) = @_;
1329
1330 delete $self->{texture};
1331}
1332
1146sub set_text { 1333sub set_text {
1147 my ($self, $text) = @_; 1334 my ($self, $text) = @_;
1148 1335
1336 return if $self->{text} eq "T$text";
1337 $self->{text} = "T$text";
1338
1149 $self->{layout}->set_text ($text); 1339 $self->{layout}->set_text ($text);
1150 1340
1151 delete $self->{texture}; 1341 delete $self->{texture};
1342 $self->update;
1152 $self->check_size; 1343 $self->check_size;
1153 $self->update;
1154} 1344}
1155 1345
1156sub set_markup { 1346sub set_markup {
1157 my ($self, $markup) = @_; 1347 my ($self, $markup) = @_;
1158 1348
1349 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup";
1351
1159 $self->{layout}->set_markup ($markup); 1352 $self->{layout}->set_markup ($markup);
1160 1353
1161 delete $self->{texture}; 1354 delete $self->{texture};
1355 $self->update;
1162 $self->check_size; 1356 $self->check_size;
1163 $self->update;
1164} 1357}
1165 1358
1166sub size_request { 1359sub size_request {
1167 my ($self) = @_; 1360 my ($self) = @_;
1168 1361
… …
1248 1441
1249sub new { 1442sub new {
1250 my $class = shift; 1443 my $class = shift;
1251 1444
1252 $class->SUPER::new ( 1445 $class->SUPER::new (
1253 fg => [1, 1, 1], 1446 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1447 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1448 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1449 active_fg => [0, 0, 0],
1257 can_hover => 1, 1450 can_hover => 1,
1258 can_focus => 1, 1451 can_focus => 1,
1259 valign => 0, 1452 valign => 0,
1260 can_events => 1, 1453 can_events => 1,
1261 @_ 1454 @_
1262 ) 1455 )
1263} 1456}
1264 1457
… …
1418 my ($self, $ev) = @_; 1611 my ($self, $ev) = @_;
1419 1612
1420 my $sym = $ev->{sym}; 1613 my $sym = $ev->{sym};
1421 1614
1422 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} = '';
1423 $self->emit (activate => $self->get_text); 1620 $self->emit (activate => $txt);
1424 $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 }
1425 1644
1426 } else { 1645 } else {
1427 $self->SUPER::key_down ($ev); 1646 $self->SUPER::key_down ($ev);
1428 } 1647 }
1429 1648
… …
1443 1662
1444sub new { 1663sub new {
1445 my $class = shift; 1664 my $class = shift;
1446 1665
1447 $class->SUPER::new ( 1666 $class->SUPER::new (
1448 padding => 4, 1667 padding => 4,
1449 fg => [1, 1, 1], 1668 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1669 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1670 active_fg => [0, 0, 1],
1452 can_hover => 1, 1671 can_hover => 1,
1453 align => 0, 1672 align => 0,
1454 valign => 0, 1673 valign => 0,
1455 can_events => 1, 1674 can_events => 1,
1456 @_ 1675 @_
1457 ) 1676 )
1458} 1677}
1459 1678
… …
1666} 1885}
1667 1886
1668sub set_max { 1887sub set_max {
1669 my ($self, $max) = @_; 1888 my ($self, $max) = @_;
1670 1889
1890 return if $self->{max_val} == $max;
1891
1671 $self->{max_val} = $max; 1892 $self->{max_val} = $max;
1893 $self->update;
1672} 1894}
1673 1895
1674sub set_value { 1896sub set_value {
1675 my ($self, $val, $max) = @_; 1897 my ($self, $val, $max) = @_;
1676 1898
1677 $self->set_max ($max) 1899 $self->set_max ($max)
1678 if defined $max; 1900 if defined $max;
1679 1901
1680 $max = $self->{max_val}; 1902 return if $self->{val} == $val;
1903
1681 $self->{val} = $val; 1904 $self->{val} = $val;
1682
1683 $self->update; 1905 $self->update;
1684} 1906}
1685 1907
1686sub _draw { 1908sub _draw {
1687 my ($self) = @_; 1909 my ($self) = @_;
… …
1750 1972
1751sub new { 1973sub new {
1752 my ($class, %arg) = @_; 1974 my ($class, %arg) = @_;
1753 1975
1754 my $self = $class->SUPER::new ( 1976 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1977 tooltip => $arg{type},
1978 can_hover => 1,
1756 can_events => 1, 1979 can_events => 1,
1757 can_hover => 1,
1758 %arg, 1980 %arg,
1759 ); 1981 );
1760 1982
1761 $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");
1762 $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);
… …
1770 1992
1771 $self->{value}->set_fontsize ($fsize); 1993 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 1994 $self->{max} ->set_fontsize ($fsize);
1773} 1995}
1774 1996
1997sub set_max {
1998 my ($self, $max) = @_;
1999
2000 $self->{gauge}->set_max ($max);
2001 $self->{max}->set_text ($max);
2002}
2003
1775sub set_value { 2004sub set_value {
1776 my ($self, $val, $max) = @_; 2005 my ($self, $val, $max) = @_;
1777 2006
1778 $self->set_max ($max) 2007 $self->set_max ($max)
1779 if defined $max; 2008 if defined $max;
1780 2009
1781 $self->{gauge}->set_value ($val, $max); 2010 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 2011 $self->{value}->set_text ($val);
1783}
1784
1785sub set_max {
1786 my ($self, $max) = @_;
1787
1788 $self->{gauge}->set_max ($max);
1789 $self->{max}->set_text ($max);
1790} 2012}
1791 2013
1792############################################################################# 2014#############################################################################
1793 2015
1794package CFClient::UI::Slider; 2016package CFClient::UI::Slider;
… …
1813 # TODO: calculations are off 2035 # TODO: calculations are off
1814 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1815 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1816 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1817 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1818 req_w => 20, 2040 req_w => $::WIDTH / 80,
1819 req_h => 20, 2041 req_h => $::WIDTH / 80,
1820 vertical => 0, 2042 vertical => 0,
1821 can_hover => 1, 2043 can_hover => 1,
1822 inner_pad => 5, 2044 inner_pad => 5,
1823 @_ 2045 @_
1824 ); 2046 );
… …
1934 2156
1935sub new { 2157sub new {
1936 my $class = shift; 2158 my $class = shift;
1937 2159
1938 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1939 fontsize => 1, 2161 fontsize => 1,
2162 can_events => 0,
1940 #font => default_font 2163 #font => default_font
1941 @_, 2164 @_,
1942 2165
1943 layout => (new CFClient::Layout), 2166 layout => (new CFClient::Layout),
1944 par => [], 2167 par => [],
1945 height => 0, 2168 height => 0,
1946 children => [ 2169 children => [
1947 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
1949 ], 2172 ],
1950 ); 2173 );
1951 2174
1952 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
1953 $self->update;
1954 });
1955 2176
1956 $self 2177 $self
1957} 2178}
1958 2179
1959sub set_fontsize { 2180sub set_fontsize {
… …
1967 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
1968 2189
1969 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
1970 2191
1971 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1972 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
1973 $layout->set_text ($text); 2194 $layout->set_text ($text);
1974 2195
1975 ($layout->size)[1] 2196 ($layout->size)[1]
1976} 2197}
1977 2198
… …
2030 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2031 2252
2032 delete $self->{texture}; 2253 delete $self->{texture};
2033 } 2254 }
2034 2255
2035 $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 {
2036 glClearColor 0, 0, 0, 1; 2257 glClearColor 0, 0, 0, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
2038 2259
2039 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2041 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2073} 2294}
2074 2295
2075sub _draw { 2296sub _draw {
2076 my ($self) = @_; 2297 my ($self) = @_;
2077 2298
2078 if ($self->{texture}) { 2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2079 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
2080 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;
2081 $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});
2082 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
2083 } 2306 glDisable GL_BLEND;
2084 2307
2085 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
2086 2309
2087} 2310}
2088 2311
… …
2136 2359
2137sub new { 2360sub new {
2138 my $class = shift; 2361 my $class = shift;
2139 2362
2140 my $self = $class->SUPER::new ( 2363 my $self = $class->SUPER::new (
2141 state => 0, 2364 state => 0,
2142 connect_activate => \&toggle_flopper, 2365 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2366 @_
2145 ); 2367 );
2146 2368
2147 if ($self->{state}) { 2369 if ($self->{state}) {
2148 $self->{state} = 0; 2370 $self->{state} = 0;
… …
2183 @_, 2405 @_,
2184 can_events => 0, 2406 can_events => 0,
2185 ) 2407 )
2186} 2408}
2187 2409
2188sub set_text { 2410sub set_markup {
2189 my ($self, $text) = @_; 2411 my ($self, $text) = @_;
2190 2412
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2192 $self->{label}->set_text ($text); 2414 $self->{label}->set_markup ($text);
2193 $self->add ($self->{label}); 2415 $self->add ($self->{label});
2194} 2416}
2195 2417
2196sub size_request { 2418sub size_request {
2197 my ($self) = @_; 2419 my ($self) = @_;
… …
2199 $self->child->set_max_size ($::WIDTH * 0.3); 2421 $self->child->set_max_size ($::WIDTH * 0.3);
2200 2422
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2424
2203 ($w + 4, $h + 4) 2425 ($w + 4, $h + 4)
2426}
2427
2428sub size_allocate {
2429 my ($self, $w, $h) = @_;
2430
2431 $self->SUPER::size_allocate ($w - 4, $h - 4);
2204} 2432}
2205 2433
2206sub _draw { 2434sub _draw {
2207 my ($self) = @_; 2435 my ($self) = @_;
2208 2436
… …
2233 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
2234} 2462}
2235 2463
2236############################################################################# 2464#############################################################################
2237 2465
2466package CFClient::UI::Face;
2467
2468our @ISA = CFClient::UI::Base::;
2469
2470use CFClient::OpenGL;
2471
2472sub new {
2473 my $class = shift;
2474
2475 $class->SUPER::new (
2476 aspect => 1,
2477 @_,
2478 )
2479}
2480
2481sub size_request {
2482 (32, 8)
2483}
2484
2485sub _draw {
2486 my ($self) = @_;
2487
2488 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2489
2490 # TODO animation
2491 if ($tex) {
2492 glEnable GL_BLEND;
2493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2494 glEnable GL_TEXTURE_2D;
2495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2496 glColor 1, 1, 1, 1;
2497 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2498 glDisable GL_TEXTURE_2D;
2499 glDisable GL_BLEND;
2500 }
2501}
2502
2503#############################################################################
2504
2505package CFClient::UI::Menu;
2506
2507our @ISA = CFClient::UI::FancyFrame::;
2508
2509use CFClient::OpenGL;
2510
2511sub new {
2512 my $class = shift;
2513
2514 my $self = $class->SUPER::new (
2515 items => [],
2516 z => 100,
2517 @_,
2518 );
2519
2520 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2521
2522 for my $item (@{ $self->{items} }) {
2523 my ($widget, $cb) = @$item;
2524
2525 # handle various types of items, only text for now
2526 if (!ref $widget) {
2527 $widget = new CFClient::UI::Label
2528 can_hover => 1,
2529 can_events => 1,
2530 text => $widget;
2531 }
2532
2533 $self->{item}{$widget} = $item;
2534
2535 $self->{vbox}->add ($widget);
2536 }
2537
2538 $self
2539}
2540
2541# popup given the event (must be a mouse button down event currently)
2542sub popup {
2543 my ($self, $ev) = @_;
2544
2545 $self->emit ("popdown");
2546
2547 # maybe save $GRAB? must be careful about events...
2548 $GRAB = $self;
2549 $self->{button} = $ev->{button};
2550
2551 $self->show;
2552 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2553}
2554
2555sub mouse_motion {
2556 my ($self, $ev, $x, $y) = @_;
2557
2558 # TODO: should use vbox->find_widget or so
2559 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2560 $self->{hover} = $self->{item}{$HOVER};
2561}
2562
2563sub button_up {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 if ($ev->{button} == $self->{button}) {
2567 undef $GRAB;
2568 $self->hide;
2569
2570 $self->emit ("popdown");
2571 $self->{hover}[1]->() if $self->{hover};
2572 }
2573}
2574
2575#############################################################################
2576
2238package CFClient::UI::Root; 2577package CFClient::UI::Root;
2239 2578
2240our @ISA = CFClient::UI::Container::; 2579our @ISA = CFClient::UI::Container::;
2241 2580
2242use CFClient::OpenGL; 2581use CFClient::OpenGL;
… …
2314 $self->_draw; 2653 $self->_draw;
2315} 2654}
2316 2655
2317############################################################################# 2656#############################################################################
2318 2657
2658package CFClient::UI::InventoryItem;
2659
2660our @ISA = CFClient::UI::HBox::;
2661
2662sub new {
2663 my $class = shift;
2664
2665 my %args = @_;
2666
2667 my $item = $args{item};
2668
2669 my $desc = $item->{nrof} < 2
2670 ? $item->{name}
2671 : "$item->{nrof} $item->{name_pl}";
2672
2673
2674 my $self = $class->SUPER::new (
2675 can_hover => 1,
2676 can_events => 1,
2677 tooltip => (CFClient::UI::Label->escape ($desc)
2678 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2679 connect_button_down => sub {
2680 my ($self, $ev, $x, $y) = @_;
2681
2682 # todo: maybe put examine on 1? but should just be a tooltip :(
2683 if ($ev->{button} == 1) {
2684 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2685 } elsif ($ev->{button} == 2) {
2686 $::CONN->send ("apply $item->{tag}");
2687 } elsif ($ev->{button} == 3) {
2688 CFClient::UI::Menu->new (
2689 items => [
2690 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2691 [
2692 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2693 sub { $::CONN->send ("lock $item->{tag}") },
2694 ],
2695 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2696 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2697 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2698 ],
2699 )->popup ($ev);
2700 }
2701
2702 1
2703 },
2704 %args
2705 );
2706 $self->add(new CFClient::UI::Face
2707 can_events => 0,
2708 face => $item->{face},
2709 anim => $item->{anim},
2710 animspeed => $item->{animspeed});
2711 $self->add(new CFClient::UI::Label
2712 can_events => 0,
2713 text => $desc);
2714
2715 $self
2716}
2717
2718#############################################################################
2719
2720package CFClient::UI::Inventory;
2721
2722our @ISA = CFClient::UI::ScrolledWindow::;
2723
2724sub new {
2725 my $class = shift;
2726
2727 my $self = $class->SUPER::new (
2728 scrolled => (new CFClient::UI::VBox),
2729 @_,
2730 );
2731
2732 $self
2733}
2734
2735sub set_items {
2736 my ($self, $items) = @_;
2737
2738 $self->{scrolled}->clear;
2739 return unless $items;
2740
2741 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2742
2743 $self->{real_items} = \@items;
2744
2745 for my $item (@items) {
2746 my $desc = $item->{nrof} < 2
2747 ? $item->{name}
2748 : "$item->{nrof} $item->{name_pl}";
2749
2750 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760
2761#############################################################################
2762
2319package CFClient::UI; 2763package CFClient::UI;
2320 2764
2321$ROOT = new CFClient::UI::Root; 2765$ROOT = new CFClient::UI::Root;
2322$TOOLTIP = new CFClient::UI::Tooltip; 2766$TOOLTIP = new CFClient::UI::Tooltip;
2323 2767

Diff Legend

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