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.65 by root, Tue Apr 11 14:04:27 2006 UTC vs.
Revision 1.69 by root, Tue Apr 11 17:32:14 2006 UTC

… …
114} 114}
115 115
116sub focus_in { 116sub focus_in {
117 my ($self) = @_; 117 my ($self) = @_;
118 118
119 return if $FOCUS == $self;
120
119 my $focus = $FOCUS; $FOCUS = $self; 121 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus; 122 $focus->update if $focus;
121 $FOCUS->update; 123 $FOCUS->update;
122} 124}
123 125
… …
130 $focus->update if $focus; #? 132 $focus->update if $focus; #?
131} 133}
132 134
133sub mouse_motion { } 135sub mouse_motion { }
134sub button_up { } 136sub button_up { }
135sub button_down { }
136sub key_down { } 137sub key_down { }
137sub key_up { } 138sub key_up { }
139
140sub button_down {
141 my ($self, $ev, $x, $y) = @_;
142
143 $self->focus_in;
144}
138 145
139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 146sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 147sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 148sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 149sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 150sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144 151
145sub draw { 152sub draw {
146 my ($self) = @_; 153 my ($self) = @_;
154
155 return unless $self->{h} && $self->{w};
147 156
148 glPushMatrix; 157 glPushMatrix;
149 glTranslate $self->{x}, $self->{y}, 0; 158 glTranslate $self->{x}, $self->{y}, 0;
150 $self->_draw; 159 $self->_draw;
151 if ($self == $HOVER) { 160 if ($self == $HOVER) {
… …
215 #$self->deactivate; 224 #$self->deactivate;
216} 225}
217 226
218############################################################################# 227#############################################################################
219 228
229package CFClient::Widget::DrawBG;
230
231our @ISA = CFClient::Widget::;
232
233use strict;
234use SDL::OpenGL;
235
236sub new {
237 my $class = shift;
238
239 # range [value, low, high, page]
240
241 $class->SUPER::new (
242 bg => [0, 0, 0, 0.4],
243 active_bg => [1, 1, 1],
244 @_
245 )
246}
247
248sub _draw {
249 my ($self) = @_;
250
251 my ($w, $h) = @$self{qw(w h)};
252
253 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
254 glBegin GL_QUADS;
255 glVertex 0 , 0;
256 glVertex 0 , $h;
257 glVertex $w, $h;
258 glVertex $w, 0;
259 glEnd;
260}
261
262#############################################################################
263
264package CFClient::Widget::Empty;
265
266our @ISA = CFClient::Widget::;
267
268sub size_request {
269 (0, 0)
270}
271
272sub draw { }
273
274#############################################################################
275
220package CFClient::Widget::Container; 276package CFClient::Widget::Container;
221 277
222our @ISA = CFClient::Widget::; 278our @ISA = CFClient::Widget::;
223 279
224sub new { 280sub new {
… …
236 my ($self, $chld, $expand) = @_; 292 my ($self, $chld, $expand) = @_;
237 293
238 $chld->{expand} = $expand; 294 $chld->{expand} = $expand;
239 $chld->set_parent ($self); 295 $chld->set_parent ($self);
240 296
241 @{$self->{children}} = 297 $self->{children} = [
242 sort { $a->{z} <=> $b->{z} } 298 sort { $a->{z} <=> $b->{z} }
243 @{$self->{children}}, $chld; 299 @{$self->{children}}, $chld
300 ];
244 301
245 $self->size_allocate ($self->{w}, $self->{h}) 302 $self->size_allocate ($self->{w}, $self->{h})
246 if $self->{w}; #TODO: check for "realised state" 303 if $self->{w}; #TODO: check for "realised state"
247} 304}
248 305
… …
280 337
281package CFClient::Widget::Bin; 338package CFClient::Widget::Bin;
282 339
283our @ISA = CFClient::Widget::Container::; 340our @ISA = CFClient::Widget::Container::;
284 341
342sub new {
343 my ($class, %arg) = @_;
344
345 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
346
347 $class->SUPER::new (children => [$child], %arg)
348}
349
350sub add {
351 my ($self, $widget) = @_;
352
353 $self->{children} = [];
354
355 $self->SUPER::add ($widget);
356}
357
358sub remove {
359 my ($self, $widget) = @_;
360
361 $self->SUPER::remove ($widget);
362
363 $self->{children} = [new CFClient::Widget::Empty]
364 unless @{$self->{children}};
365}
366
285sub child { $_[0]->{children}[0] } 367sub child { $_[0]->{children}[0] }
286 368
287sub size_request { 369sub size_request {
288 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 370 $_[0]{children}[0]->size_request
289} 371}
290 372
291sub size_allocate { 373sub size_allocate {
292 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
293 375
376 return unless $self->{w} != $w || $self->{h} != $h;
377
294 $self->SUPER::size_allocate ($w, $h); 378 $self->SUPER::size_allocate ($w, $h);
295 $self->{children}[0]->size_allocate ($w, $h) 379 $self->{children}[0]->size_allocate ($w, $h);
296 if $self->{children}[0]
297} 380}
298 381
299############################################################################# 382#############################################################################
300 383
301package CFClient::Widget::Window; 384package CFClient::Widget::Window;
… …
328} 411}
329 412
330sub size_allocate { 413sub size_allocate {
331 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
332 415
416 return unless $self->{w} != $w || $self->{h} != $h;
417
333 $self->{w} = $w; 418 $self->{w} = $w;
334 $self->{h} = $h; 419 $self->{h} = $h;
335 420
336 $self->child->size_allocate ($w, $h); 421 $self->child->size_allocate ($w, $h);
337 422
… …
375} 460}
376 461
377sub size_allocate { 462sub size_allocate {
378 my ($self, $w, $h) = @_; 463 my ($self, $w, $h) = @_;
379 464
465 return unless $self->{w} != $w || $self->{h} != $h;
466
380 $self->{w} = $w; 467 $self->{w} = $w;
381 $self->{h} = $h; 468 $self->{h} = $h;
382 469
383 $self->child->size_allocate ($w - 4, $h - 4); 470 $self->child->size_allocate ($w - 4, $h - 4);
384 $self->child->move (2, 2); 471 $self->child->move (2, 2);
… …
428} 515}
429 516
430sub size_allocate { 517sub size_allocate {
431 my ($self, $w, $h) = @_; 518 my ($self, $w, $h) = @_;
432 519
520 return unless $self->{w} != $w || $self->{h} != $h;
521
433 $self->SUPER::size_allocate ($w, $h); 522 $self->SUPER::size_allocate ($w, $h);
434 523
435 $h -= $tex[1]->{height}; 524 $h -= $tex[1]->{height};
436 $h -= $tex[4]->{height}; 525 $h -= $tex[4]->{height};
437 $w -= $tex[2]->{width}; 526 $w -= $tex[2]->{width};
438 $w -= $tex[3]->{width}; 527 $w -= $tex[3]->{width};
439 528
440 $h = $h < 0 ? 0 : $h; 529 $h = $h < 0 ? 0 : $h;
441 $w = $w < 0 ? 0 : $w; 530 $w = $w < 0 ? 0 : $w;
442 531
532 my $child = $self->child;
533
443 $self->child->size_allocate ($w, $h); 534 $child->size_allocate ($w, $h);
444 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 535 $child->move ($tex[3]->{width}, $tex[1]->{height});
445} 536}
446 537
447sub _draw { 538sub _draw {
448 my ($self) = @_; 539 my ($self) = @_;
449 540
… …
592} 683}
593 684
594sub size_allocate { 685sub size_allocate {
595 my ($self, $w, $h) = @_; 686 my ($self, $w, $h) = @_;
596 687
688 return unless $self->{w} != $w || $self->{h} != $h;
689
597 $self->w ($w); 690 $self->{w} = $w;
598 $self->h ($h); 691 $self->{h} = $h;
599 692
600 my $exp; 693 return unless $self->{h};
601 my @oth; 694
602 # find expand widget 695 my $children = $self->{children};
603 for (@{$self->{children}}) { 696
604 if ($_->{expand}) { 697 my @h = map +($_->size_request)[1], @$children;
605 $exp = $_; 698
606 last; 699 my $req_h = List::Util::sum @h;
700
701 if ($req_h > $h) {
702 # ah well, not enough space
703 $_ = $h[$_] * $h / $req_h for @h;
704 } else {
705 my @exp = grep $_->{expand}, @$children;
706 @exp = @$children unless @exp;
707
708 my %exp = map +($_ => 1), @exp;
709
710 for (0 .. $#$children) {
711 my $child = $children->[$_];
712
713 my $alloc_h = $h[$_];
714 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
715 $h[$_] = $alloc_h;
607 } 716 }
608 push @oth, $_;
609 }
610
611 my ($ow, $oh);
612
613 # get sizes of other widgets
614 for (@oth) {
615 my ($w, $h) = $_->size_request;
616 $oh += $h;
617 if ($ow < $w) { $ow = $w }
618 } 717 }
619 718
620 my $y = 0; 719 my $y = 0;
621 for (@{$self->{children}}) { 720 for (0 .. $#$children) {
721 my $child = $children->[$_];
722 my $h = $h[$_];
622 $_->move (0, $y); 723 $child->move (0, $y);
623
624 if ($_ == $exp) {
625 $_->size_allocate ($w, $h - $oh);
626 $y += $h - $oh;
627 } else {
628 my ($cw, $h) = $_->size_request;
629 $_->size_allocate ($w, $h); 724 $child->size_allocate ($w, $h);
725
630 $y += $h; 726 $y += $h;
631 }
632 } 727 }
633} 728}
634 729
635############################################################################# 730#############################################################################
636 731
… …
641use SDL::OpenGL; 736use SDL::OpenGL;
642 737
643sub new { 738sub new {
644 my ($class, %arg) = @_; 739 my ($class, %arg) = @_;
645 740
646 # TODO: color, and make height, xyz etc. optional
647 my $self = $class->SUPER::new ( 741 my $self = $class->SUPER::new (
648 color => [1, 1, 1], 742 fg => [1, 1, 1],
649 height => $::FONTSIZE, 743 height => $::FONTSIZE,
650 text => "", 744 text => "",
651 layout => new CFClient::Layout, 745 layout => new CFClient::Layout,
652 %arg 746 %arg
653 ); 747 );
… …
655 $self->set_text ($self->{text}); 749 $self->set_text ($self->{text});
656 750
657 $self 751 $self
658} 752}
659 753
754sub escape_text {
755 local $_ = $_[1];
756
757 s/&/&amp;/g;
758 s/>/&gt;/g;
759 s/</&lt;/g;
760
761 $_[1]
762}
763
660sub set_text { 764sub set_text {
661 my ($self, $text) = @_; 765 my ($self, $text) = @_;
662 766
663 $self->{text} = $text; 767 $self->{text} = $text;
664 $self->{layout}->set_markup ($text); 768 $self->{layout}->set_markup ($text);
665 769
666 delete $self->{texture}; 770 delete $self->{texture};
771 $self->update;
667} 772}
668 773
669sub get_text { 774sub get_text {
670 my ($self, $text) = @_; 775 my ($self, $text) = @_;
671 776
… …
691} 796}
692 797
693sub size_allocate { 798sub size_allocate {
694 my ($self, $w, $h) = @_; 799 my ($self, $w, $h) = @_;
695 800
801 return unless $self->{w} != $w || $self->{h} != $h;
802
696 $self->SUPER::size_allocate ($w, $h); 803 $self->SUPER::size_allocate ($w, $h);
697 delete $self->{texture}; 804 delete $self->{texture};
805}
806
807sub update {
808 my ($self) = @_;
809
810 delete $self->{texture};
811 $self->SUPER::update;
698} 812}
699 813
700sub _draw { 814sub _draw {
701 my ($self) = @_; 815 my ($self) = @_;
702 816
… …
708 glEnable GL_BLEND; 822 glEnable GL_BLEND;
709 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 824 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
712 826
713 glColor @{$self->{color}}; 827 glColor @{$self->{fg}};
714 828
715 $tex->draw_quad (0, 0); 829 $tex->draw_quad (0, 0);
716 830
717 glDisable GL_BLEND; 831 glDisable GL_BLEND;
718 glDisable GL_TEXTURE_2D; 832 glDisable GL_TEXTURE_2D;
… …
725our @ISA = CFClient::Widget::Label::; 839our @ISA = CFClient::Widget::Label::;
726 840
727use SDL; 841use SDL;
728use SDL::OpenGL; 842use SDL::OpenGL;
729 843
844sub new {
845 my $class = shift;
846
847 $class->SUPER::new (
848 fg => [1, 1, 1],
849 bg => [0, 0, 0, 0.4],
850 active_bg => [1, 1, 1],
851 active_fg => [0, 0, 0],
852 @_
853 )
854}
855
856sub _set_text {
857 my ($self, $text) = @_;
858
859 $self->{last_activity} = $::NOW;
860
861 $self->{text} = $text;
862 $self->{layout}->set_width ($self->{w});
863 $self->{layout}->set_markup ($self->escape_text ($text));
864
865 $text = substr $text, 0, $self->{cursor};
866 utf8::encode $text;
867
868 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
869}
870
871sub size_request {
872 my ($self) = @_;
873
874 my ($w, $h) = $self->SUPER::size_request;
875
876 ($w + 1, $h) # add 1 for cursor
877}
878
879sub size_allocate {
880 my ($self, $w, $h) = @_;
881
882 return unless $self->{w} != $w || $self->{h} != $h;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 $self->_set_text ($self->{text});
887}
888
889sub set_text {
890 my ($self, $text) = @_;
891
892 $self->{cursor} = length $text;
893 $self->_set_text ($text);
894 $self->update;
895}
896
730sub key_down { 897sub key_down {
731 my ($self, $ev) = @_; 898 my ($self, $ev) = @_;
732 899
733 my $mod = $ev->key_mod; 900 my $mod = $ev->key_mod;
734 my $sym = $ev->key_sym; 901 my $sym = $ev->key_sym;
… …
736 my $uni = $ev->key_unicode; 903 my $uni = $ev->key_unicode;
737 904
738 my $text = $self->get_text; 905 my $text = $self->get_text;
739 906
740 if ($sym == SDLK_BACKSPACE) { 907 if ($sym == SDLK_BACKSPACE) {
741 substr $text, -1, 1, ''; 908 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
909 } elsif ($sym == SDLK_DELETE) {
910 substr $text, $self->{cursor}, 1, "";
911 } elsif ($sym == SDLK_LEFT) {
912 --$self->{cursor} if $self->{cursor};
913 } elsif ($sym == SDLK_RIGHT) {
914 ++$self->{cursor} if $self->{cursor} < length $self->{text};
742 } elsif ($uni) { 915 } elsif ($uni) {
743 $text .= chr $uni; 916 substr $text, $self->{cursor}++, 0, chr $uni;
744 } 917 }
745 918
746 $self->set_text ($text); 919 $self->_set_text ($text);
920 $self->update;
921}
922
923sub focus_in {
924 my ($self) = @_;
925
926 $self->{last_activity} = $::NOW;
927
928 $self->SUPER::focus_in;
747} 929}
748 930
749sub button_down { 931sub button_down {
750 my ($self, $ev) = @_; 932 my ($self, $ev, $x, $y) = @_;
751 933
752 $self->focus_in; 934 $self->SUPER::button_down ($ev, $x, $y);
935
936 my $idx = $self->{layout}->xy_to_index ($x, $y);
937
938 # byte-index to char-index
939 my $text = $self->{layout};
940 utf8::encode $text;
941 $self->{cursor} = length substr $text, 0, $idx;
942
943 $self->_set_text ($self->{text});
944 $self->update;
753} 945}
754 946
755sub mouse_motion { 947sub mouse_motion {
756 my ($self, $ev, $x, $y) = @_; 948 my ($self, $ev, $x, $y) = @_;
757 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 949# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
758} 950}
759 951
760sub _draw { 952sub _draw {
761 my ($self) = @_; 953 my ($self) = @_;
762 954
955 local $self->{fg} = $self->{fg};
956
763 if ($FOCUS == $self) { 957 if ($FOCUS == $self) {
764 glColor 1, 1, 1; 958 glColor @{$self->{active_bg}};
959 $self->{fg} = $self->{active_fg};
765 } else { 960 } else {
766 glColor 0.7, 0.7, 0.7; 961 glColor @{$self->{bg}};
767 } 962 }
768 963
769 glBegin GL_QUADS; 964 glBegin GL_QUADS;
770 glVertex 0 , 0; 965 glVertex 0 , 0;
771 glVertex 0 , $self->{h} - 1; 966 glVertex 0 , $self->{h};
772 glVertex $self->{w} - 1, $self->{h} - 1; 967 glVertex $self->{w}, $self->{h};
773 glVertex $self->{w} - 1, 0; 968 glVertex $self->{w}, 0;
774 glEnd; 969 glEnd;
775 970
776 $self->SUPER::_draw; 971 $self->SUPER::_draw;
972
973 #TODO: force update every cursor change :(
974 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
975 glColor @{$self->{fg}};
976 glBegin GL_LINES;
977 glVertex $self->{cur_x}, $self->{cur_y};
978 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
979 glEnd;
980 }
981}
982
983#############################################################################
984
985package CFClient::Widget::Slider;
986
987use strict;
988
989use SDL::OpenGL;
990use SDL::OpenGL::Constants;
991
992our @ISA = CFClient::Widget::DrawBG::;
993
994sub size_request {
995 my ($self) = @_;
996
997 my $w = 20;
998 my $h = 10;
999
1000 $self->{vertical} ? ($h, $w) : ($w, $h)
1001}
1002
1003sub new {
1004 my $class = shift;
1005
1006 # range [value, low, high, page]
1007
1008 $class->SUPER::new (
1009 fg => [1, 1, 1],
1010 active_fg => [0, 0, 0],
1011 range => [0, 0, 100, 10],
1012 vertical => 0,
1013 @_
1014 )
1015}
1016
1017sub button_down {
1018 my ($self, $ev, $x, $y) = @_;
1019
1020 $self->SUPER::button_down ($ev, $x, $y);
1021 $self->mouse_motion ($ev, $x, $y);
1022}
1023
1024sub mouse_motion {
1025 my ($self, $ev, $x, $y) = @_;
1026
1027 if ($GRAB == $self) {
1028 my ($value, $lo, $hi, $page) = @{$self->{range}};
1029
1030 $x = $x * ($hi - $lo) / $self->{w} + $lo;
1031 $x = $lo if $x < $lo;
1032 $x = $hi - $page if $x > $hi - $page;
1033 $self->{range}[0] = $x;
1034
1035 $self->{changed}($x) if $self->{changed};
1036 $self->update;
1037 }
1038}
1039
1040sub _draw {
1041 my ($self) = @_;
1042
1043 $self->SUPER::_draw ();
1044
1045 glPushMatrix;
1046
1047 my ($w, $h) = @$self{qw(w h)};
1048
1049 if ($self->{vertical}) {
1050 # draw a vertical slider like a rotated horizontal slider
1051
1052 glTranslate 0, $self->{w};
1053 glRotate 90, 0, 0, 1;
1054
1055 ($w, $h) = ($h, $w);
1056 }
1057
1058 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1059 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1060
1061 my ($value, $lo, $hi, $page) = @{$self->{range}};
1062
1063 $page = int $page * $w / ($hi - $lo);
1064 $value = int +($value - $lo) * $w / ($hi - $lo);
1065
1066 $w -= $page;
1067 $page &= ~1;
1068 glTranslate $page * 0.5, 0, 0;
1069
1070 glColor @$fg;
1071 glBegin GL_LINES;
1072 glVertex 0, 0; glVertex 0, $h;
1073 glVertex $w - 1, 0; glVertex $w - 1, $h;
1074 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1075 glEnd;
1076
1077 my $knob_a = $value - $page * 0.5;
1078 my $knob_b = $value + $page * 0.5;
1079
1080 glBegin GL_QUADS;
1081 glColor @$fg;
1082 glVertex $knob_a, 0;
1083 glVertex $knob_a, $h;
1084 glVertex $knob_b, $h;
1085 glVertex $knob_b, 0;
1086
1087 if ($knob_a < $knob_b - 2) {
1088 glColor @$bg;
1089 glVertex $knob_a + 1, 1;
1090 glVertex $knob_a + 1, $h - 1;
1091 glVertex $knob_b - 1, $h - 1;
1092 glVertex $knob_b - 1, 1;
1093 }
1094 glEnd;
1095
1096 glPopMatrix;
777} 1097}
778 1098
779############################################################################# 1099#############################################################################
780 1100
781package CFClient::Widget::MapWidget; 1101package CFClient::Widget::MapWidget;

Diff Legend

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