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.182 by root, Sun Apr 30 11:17:08 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
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
651 786
652############################################################################# 787#############################################################################
653 788
654package CFClient::UI::Frame; 789package CFClient::UI::Frame;
655 790
… …
710 my $class = shift; 845 my $class = shift;
711 846
712 # TODO: user_x, user_y, overwrite moveto? 847 # TODO: user_x, user_y, overwrite moveto?
713 848
714 my $self = $class->SUPER::new ( 849 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 850 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 851 border_bg => [1, 1, 1, 1],
717 border => 0.8, 852 border => 0.6,
718 can_events => 1, 853 can_events => 1,
719 @_ 854 @_
720 ); 855 );
721 856
722 $self->{title} &&= new CFClient::UI::Label 857 $self->{title} &&= new CFClient::UI::Label
723 align => 0, 858 align => 0,
724 valign => 1, 859 valign => 1,
725 text => $self->{title}, 860 text => $self->{title},
726 fontsize => 1; 861 fontsize => $self->{border};
727 862
728 $self 863 $self
729} 864}
730 865
731sub border { 866sub border {
… …
756} 891}
757 892
758sub button_down { 893sub button_down {
759 my ($self, $ev, $x, $y) = @_; 894 my ($self, $ev, $x, $y) = @_;
760 895
896 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 897 my $border = $self->border;
762 898
763 if ($x < $self->{w} && $x >= $self->{w} - $border 899 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 900 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 901
902 if ($lr & $td) {
903 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 904 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 905 my ($bw, $bh) = ($self->{w}, $self->{h});
768 906
907 my $mx = $x < $border;
908 my $my = $y < $border;
909
769 $self->{motion} = sub { 910 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 911 my ($ev, $x, $y) = @_;
771 912
772 ($x, $y) = ($ev->{x}, $ev->{y}); 913 my $dx = $ev->{x} - $ox;
914 my $dy = $ev->{y} - $oy;
773 915
774 $self->{user_w} = $bw + $x - $ox; 916 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 917 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
918 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
776 $self->check_size; 919 $self->check_size;
777 }; 920 };
778 921
779 } elsif ($x >= 0 && $x < $self->{w} 922 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 924 my ($bx, $by) = ($self->{x}, $self->{y});
784 925
785 $self->{motion} = sub { 926 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 927 my ($ev, $x, $y) = @_;
… …
822 $tex[1]->draw_quad (0, 0, $w, $border); 963 $tex[1]->draw_quad (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 964 $tex[3]->draw_quad (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 966 $tex[4]->draw_quad (0, $h - $border, $w, $border);
826 967
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827 my $bg = $tex[0]; 969 my $bg = $tex[0];
828 970
829 # TODO: repeat texture not scale 971 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 972 my $rep_x = $cw / $bg->{w};
831 my $rep_y = $ch / $bg->{h}; 973 my $rep_y = $ch / $bg->{h};
832 974
833 glColor @{ $self->{bg} }; 975 glColor @{ $self->{bg} };
834 976
835 $bg->{s} = $rep_x; 977 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y; 978 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1; 979 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 980 $bg->draw_quad ($border, $border, $cw, $ch);
839 981
840 glDisable GL_TEXTURE_2D; 982 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND; 983 glDisable GL_BLEND;
984 }
842 985
843 $self->{title}->draw if $self->{title}; 986 $self->{title}->draw if $self->{title};
987
844 $self->child->draw; 988 $self->child->draw;
845} 989}
846 990
847############################################################################# 991#############################################################################
848 992
… …
870 $self->{children}[$y][$x] = $child; 1014 $self->{children}[$y][$x] = $child;
871 1015
872 $child->check_size; 1016 $child->check_size;
873} 1017}
874 1018
1019sub children {
1020 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1021}
1022
875# 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?
876sub clear { 1024sub clear {
877 my ($self) = @_; 1025 my ($self) = @_;
878 1026
1027 my @children = $self->children;
879 delete $self->{children}; 1028 delete $self->{children};
1029
1030 for (@children) {
1031 delete $_->{parent};
1032 $_->hide;
1033 }
1034
880 $self->update; 1035 $self->update;
881} 1036}
882 1037
883sub get_wh { 1038sub get_wh {
884 my ($self) = @_; 1039 my ($self) = @_;
… …
1107 1262
1108sub new { 1263sub new {
1109 my ($class, %arg) = @_; 1264 my ($class, %arg) = @_;
1110 1265
1111 my $self = $class->SUPER::new ( 1266 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1267 fg => [1, 1, 1],
1113 #font => default_font 1268 #font => default_font
1114 fontsize => 1, 1269 fontsize => 1,
1115 text => "", 1270 text => "",
1116 align => -1, 1271 align => -1,
1117 valign => -1, 1272 valign => -1,
1118 padding => 2, 1273 padding => 2,
1119 layout => new CFClient::Layout, 1274 layout => new CFClient::Layout,
1120 can_events => 0, 1275 can_events => 0,
1121 %arg 1276 %arg
1122 ); 1277 );
1123 1278
1124 if (exists $self->{template}) { 1279 if (exists $self->{template}) {
… …
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1132 1287
1133 $self 1288 $self
1134} 1289}
1135 1290
1136sub escape_text { 1291sub escape {
1137 local $_ = $_[1]; 1292 local $_ = $_[1];
1138 1293
1139 s/&/&amp;/g; 1294 s/&/&amp;/g;
1140 s/>/&gt;/g; 1295 s/>/&gt;/g;
1141 s/</&lt;/g; 1296 s/</&lt;/g;
1142 1297
1143 $_[1] 1298 $_[1]
1144} 1299}
1145 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
1146sub set_text { 1314sub set_text {
1147 my ($self, $text) = @_; 1315 my ($self, $text) = @_;
1148 1316
1317 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text";
1319
1149 $self->{layout}->set_text ($text); 1320 $self->{layout}->set_text ($text);
1150 1321
1151 delete $self->{texture}; 1322 delete $self->{texture};
1323 $self->update;
1152 $self->check_size; 1324 $self->check_size;
1153 $self->update;
1154} 1325}
1155 1326
1156sub set_markup { 1327sub set_markup {
1157 my ($self, $markup) = @_; 1328 my ($self, $markup) = @_;
1158 1329
1330 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup";
1332
1159 $self->{layout}->set_markup ($markup); 1333 $self->{layout}->set_markup ($markup);
1160 1334
1161 delete $self->{texture}; 1335 delete $self->{texture};
1336 $self->update;
1162 $self->check_size; 1337 $self->check_size;
1163 $self->update;
1164} 1338}
1165 1339
1166sub size_request { 1340sub size_request {
1167 my ($self) = @_; 1341 my ($self) = @_;
1168 1342
… …
1248 1422
1249sub new { 1423sub new {
1250 my $class = shift; 1424 my $class = shift;
1251 1425
1252 $class->SUPER::new ( 1426 $class->SUPER::new (
1253 fg => [1, 1, 1], 1427 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1428 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1429 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1430 active_fg => [0, 0, 0],
1257 can_hover => 1, 1431 can_hover => 1,
1258 can_focus => 1, 1432 can_focus => 1,
1259 valign => 0, 1433 valign => 0,
1260 can_events => 1, 1434 can_events => 1,
1261 @_ 1435 @_
1262 ) 1436 )
1263} 1437}
1264 1438
… …
1418 my ($self, $ev) = @_; 1592 my ($self, $ev) = @_;
1419 1593
1420 my $sym = $ev->{sym}; 1594 my $sym = $ev->{sym};
1421 1595
1422 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} = '';
1423 $self->emit (activate => $self->get_text); 1601 $self->emit (activate => $txt);
1424 $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 }
1425 1625
1426 } else { 1626 } else {
1427 $self->SUPER::key_down ($ev); 1627 $self->SUPER::key_down ($ev);
1428 } 1628 }
1429 1629
… …
1443 1643
1444sub new { 1644sub new {
1445 my $class = shift; 1645 my $class = shift;
1446 1646
1447 $class->SUPER::new ( 1647 $class->SUPER::new (
1448 padding => 4, 1648 padding => 4,
1449 fg => [1, 1, 1], 1649 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1650 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1651 active_fg => [0, 0, 1],
1452 can_hover => 1, 1652 can_hover => 1,
1453 align => 0, 1653 align => 0,
1454 valign => 0, 1654 valign => 0,
1455 can_events => 1, 1655 can_events => 1,
1456 @_ 1656 @_
1457 ) 1657 )
1458} 1658}
1459 1659
… …
1666} 1866}
1667 1867
1668sub set_max { 1868sub set_max {
1669 my ($self, $max) = @_; 1869 my ($self, $max) = @_;
1670 1870
1871 return if $self->{max_val} == $max;
1872
1671 $self->{max_val} = $max; 1873 $self->{max_val} = $max;
1874 $self->update;
1672} 1875}
1673 1876
1674sub set_value { 1877sub set_value {
1675 my ($self, $val, $max) = @_; 1878 my ($self, $val, $max) = @_;
1676 1879
1677 $self->set_max ($max) 1880 $self->set_max ($max)
1678 if defined $max; 1881 if defined $max;
1679 1882
1680 $max = $self->{max_val}; 1883 return if $self->{val} == $val;
1884
1681 $self->{val} = $val; 1885 $self->{val} = $val;
1682
1683 $self->update; 1886 $self->update;
1684} 1887}
1685 1888
1686sub _draw { 1889sub _draw {
1687 my ($self) = @_; 1890 my ($self) = @_;
… …
1750 1953
1751sub new { 1954sub new {
1752 my ($class, %arg) = @_; 1955 my ($class, %arg) = @_;
1753 1956
1754 my $self = $class->SUPER::new ( 1957 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1958 tooltip => $arg{type},
1959 can_hover => 1,
1756 can_events => 1, 1960 can_events => 1,
1757 can_hover => 1,
1758 %arg, 1961 %arg,
1759 ); 1962 );
1760 1963
1761 $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");
1762 $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);
… …
1770 1973
1771 $self->{value}->set_fontsize ($fsize); 1974 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 1975 $self->{max} ->set_fontsize ($fsize);
1773} 1976}
1774 1977
1978sub set_max {
1979 my ($self, $max) = @_;
1980
1981 $self->{gauge}->set_max ($max);
1982 $self->{max}->set_text ($max);
1983}
1984
1775sub set_value { 1985sub set_value {
1776 my ($self, $val, $max) = @_; 1986 my ($self, $val, $max) = @_;
1777 1987
1778 $self->set_max ($max) 1988 $self->set_max ($max)
1779 if defined $max; 1989 if defined $max;
1780 1990
1781 $self->{gauge}->set_value ($val, $max); 1991 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 1992 $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} 1993}
1791 1994
1792############################################################################# 1995#############################################################################
1793 1996
1794package CFClient::UI::Slider; 1997package CFClient::UI::Slider;
… …
1813 # TODO: calculations are off 2016 # TODO: calculations are off
1814 my $self = $class->SUPER::new ( 2017 my $self = $class->SUPER::new (
1815 fg => [1, 1, 1], 2018 fg => [1, 1, 1],
1816 active_fg => [0, 0, 0], 2019 active_fg => [0, 0, 0],
1817 range => [0, 0, 100, 10], 2020 range => [0, 0, 100, 10],
1818 req_w => 20, 2021 req_w => $::WIDTH / 80,
1819 req_h => 20, 2022 req_h => $::WIDTH / 80,
1820 vertical => 0, 2023 vertical => 0,
1821 can_hover => 1, 2024 can_hover => 1,
1822 inner_pad => 5, 2025 inner_pad => 5,
1823 @_ 2026 @_
1824 ); 2027 );
… …
1934 2137
1935sub new { 2138sub new {
1936 my $class = shift; 2139 my $class = shift;
1937 2140
1938 my $self = $class->SUPER::new ( 2141 my $self = $class->SUPER::new (
1939 fontsize => 1, 2142 fontsize => 1,
2143 can_events => 0,
1940 #font => default_font 2144 #font => default_font
1941 @_, 2145 @_,
1942 2146
1943 layout => (new CFClient::Layout), 2147 layout => (new CFClient::Layout),
1944 par => [], 2148 par => [],
1945 height => 0, 2149 height => 0,
1946 children => [ 2150 children => [
1947 (new CFClient::UI::Empty expand => 1), 2151 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2152 (new CFClient::UI::Slider vertical => 1),
1949 ], 2153 ],
1950 ); 2154 );
1951 2155
1952 $self->{children}[1]->connect (changed => sub { 2156 $self->{children}[1]->connect (changed => sub { $self->update });
1953 $self->update;
1954 });
1955 2157
1956 $self 2158 $self
1957} 2159}
1958 2160
1959sub set_fontsize { 2161sub set_fontsize {
… …
1967 my ($self, $text) = @_; 2169 my ($self, $text) = @_;
1968 2170
1969 my $layout = $self->{layout}; 2171 my $layout = $self->{layout};
1970 2172
1971 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1972 $layout->set_width ($self->{w}); 2174 $layout->set_width ($self->{children}[0]{w});
1973 $layout->set_text ($text); 2175 $layout->set_text ($text);
1974 2176
1975 ($layout->size)[1] 2177 ($layout->size)[1]
1976} 2178}
1977 2179
… …
2030 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2031 2233
2032 delete $self->{texture}; 2234 delete $self->{texture};
2033 } 2235 }
2034 2236
2035 $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 {
2036 glClearColor 0, 0, 0, 1; 2238 glClearColor 0, 0, 0, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2239 glClear GL_COLOR_BUFFER_BIT;
2038 2240
2039 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2041 glEnable GL_TEXTURE_2D; 2243 glEnable GL_TEXTURE_2D;
… …
2073} 2275}
2074 2276
2075sub _draw { 2277sub _draw {
2076 my ($self) = @_; 2278 my ($self) = @_;
2077 2279
2078 if ($self->{texture}) { 2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2079 glEnable GL_TEXTURE_2D; 2282 glEnable GL_TEXTURE_2D;
2080 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;
2081 $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});
2082 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
2083 } 2287 glDisable GL_BLEND;
2084 2288
2085 $self->{children}[1]->draw; 2289 $self->{children}[1]->draw;
2086 2290
2087} 2291}
2088 2292
… …
2136 2340
2137sub new { 2341sub new {
2138 my $class = shift; 2342 my $class = shift;
2139 2343
2140 my $self = $class->SUPER::new ( 2344 my $self = $class->SUPER::new (
2141 state => 0, 2345 state => 0,
2142 connect_activate => \&toggle_flopper, 2346 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2347 @_
2145 ); 2348 );
2146 2349
2147 if ($self->{state}) { 2350 if ($self->{state}) {
2148 $self->{state} = 0; 2351 $self->{state} = 0;
… …
2183 @_, 2386 @_,
2184 can_events => 0, 2387 can_events => 0,
2185 ) 2388 )
2186} 2389}
2187 2390
2188sub set_text { 2391sub set_markup {
2189 my ($self, $text) = @_; 2392 my ($self, $text) = @_;
2190 2393
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2192 $self->{label}->set_text ($text); 2395 $self->{label}->set_markup ($text);
2193 $self->add ($self->{label}); 2396 $self->add ($self->{label});
2194} 2397}
2195 2398
2196sub size_request { 2399sub size_request {
2197 my ($self) = @_; 2400 my ($self) = @_;
… …
2199 $self->child->set_max_size ($::WIDTH * 0.3); 2402 $self->child->set_max_size ($::WIDTH * 0.3);
2200 2403
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2405
2203 ($w + 4, $h + 4) 2406 ($w + 4, $h + 4)
2407}
2408
2409sub size_allocate {
2410 my ($self, $w, $h) = @_;
2411
2412 $self->SUPER::size_allocate ($w - 4, $h - 4);
2204} 2413}
2205 2414
2206sub _draw { 2415sub _draw {
2207 my ($self) = @_; 2416 my ($self) = @_;
2208 2417
… …
2233 $self->SUPER::_draw; 2442 $self->SUPER::_draw;
2234} 2443}
2235 2444
2236############################################################################# 2445#############################################################################
2237 2446
2447package CFClient::UI::Face;
2448
2449our @ISA = CFClient::UI::Base::;
2450
2451use CFClient::OpenGL;
2452
2453sub new {
2454 my $class = shift;
2455
2456 $class->SUPER::new (
2457 aspect => 1,
2458 @_,
2459 )
2460}
2461
2462sub size_request {
2463 (32, 8)
2464}
2465
2466sub _draw {
2467 my ($self) = @_;
2468
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2470
2471 # TODO animation
2472 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 }
2482}
2483
2484#############################################################################
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
2238package CFClient::UI::Root; 2558package CFClient::UI::Root;
2239 2559
2240our @ISA = CFClient::UI::Container::; 2560our @ISA = CFClient::UI::Container::;
2241 2561
2242use CFClient::OpenGL; 2562use CFClient::OpenGL;
… …
2314 $self->_draw; 2634 $self->_draw;
2315} 2635}
2316 2636
2317############################################################################# 2637#############################################################################
2318 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
2319package CFClient::UI; 2692package CFClient::UI;
2320 2693
2321$ROOT = new CFClient::UI::Root; 2694$ROOT = new CFClient::UI::Root;
2322$TOOLTIP = new CFClient::UI::Tooltip; 2695$TOOLTIP = new CFClient::UI::Tooltip;
2323 2696

Diff Legend

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