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.103 by elmex, Fri Apr 14 13:51:36 2006 UTC vs.
Revision 1.125 by root, Mon Apr 17 20:52:15 2006 UTC

… …
7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $BUTTON_STATE; 13our $BUTTON_STATE;
14 14
15# class methods for events 15# class methods for events
16sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
… …
24sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
25 my ($ev) = @_; 25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27 27
28 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
30 30
31 $GRAB = $widget; 31 $GRAB = $widget;
32 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
33 } 33 }
34 34
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36 36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 38}
39 39
40sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
41 my ($ev) = @_; 41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43 43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47 47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
56 56
57sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
58 my ($ev) = @_; 58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60 60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for (@$vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
71} 84}
72 85
73############################################################################# 86#############################################################################
74 87
75package CFClient::UI::Base; 88package CFClient::UI::Base;
… …
99 $self 112 $self
100} 113}
101 114
102sub move { 115sub move {
103 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
104 $self->{x} = $x; 117 $self->{x} = int $x;
105 $self->{y} = $y; 118 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 119 $self->{z} = $z if defined $z;
107} 120}
108 121
109sub needs_redraw { 122sub needs_redraw {
110 0 123 0
… …
133 my ($self, $x, $y, $w, $h) = @_; 146 my ($self, $x, $y, $w, $h) = @_;
134 147
135 $self->_size_allocate ($x, $y, $w, $h); 148 $self->_size_allocate ($x, $y, $w, $h);
136} 149}
137 150
151# return top left coordinates
152sub _topleft {
153 my ($self, $x, $y) = @_;
154
155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
138# translate global coordinates to local coordinate system 158# translate global coordinates to local coordinate system
139sub translate { 159sub coord2local {
140 my ($self, $x, $y) = @_; 160 my ($self, $x, $y) = @_;
141 161
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
143} 172}
144 173
145sub focus_in { 174sub focus_in {
146 my ($self) = @_; 175 my ($self) = @_;
147 176
148 return if $FOCUS == $self; 177 return if $FOCUS == $self;
149 return unless $self->{can_focus}; 178 return unless $self->{can_focus};
150 179
151 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
181
182 $self->emit (focus_in => $focus);
183
152 $focus->update if $focus; 184 $focus->update if $focus;
153 $FOCUS->update; 185 $FOCUS->update;
154} 186}
155 187
156sub focus_out { 188sub focus_out {
157 my ($self) = @_; 189 my ($self) = @_;
158 190
159 return unless $FOCUS == $self; 191 return unless $FOCUS == $self;
160 192
161 my $focus = $FOCUS; undef $FOCUS; 193 my $focus = $FOCUS; undef $FOCUS;
194
195 $self->emit (focus_out => $focus);
196
162 $focus->update if $focus; #? 197 $focus->update if $focus; #?
163} 198}
164 199
165sub mouse_motion { } 200sub mouse_motion { }
166sub button_up { } 201sub button_up { }
… …
190 glPopMatrix; 225 glPopMatrix;
191 226
192 if ($self == $HOVER && $self->{can_hover}) { 227 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)}; 228 my ($x, $y) = @$self{qw(x y)};
194 229
195 glColor 0, 0, 1, 0.2; 230 glColor 1, 0.8, 0.5, 0.2;
196 glEnable GL_BLEND; 231 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198 glBegin GL_QUADS; 233 glBegin GL_QUADS;
199 glVertex $x , $y; 234 glVertex $x , $y;
200 glVertex $x + $self->{w}, $y; 235 glVertex $x + $self->{w}, $y;
… …
220 255
221 () 256 ()
222} 257}
223 258
224sub set_parent { 259sub set_parent {
225 my ($self, $par) = @_; 260 my ($self, $parent) = @_;
226 261
227 $self->{parent} = $par;
228 Scalar::Util::weaken $self->{parent}; 262 Scalar::Util::weaken ($self->{parent} = $parent);
229} 263}
230 264
231sub get_parent { 265sub check_size {
232 $_[0]->{parent} 266 my ($self) = @_;
267
268 my ($w, $h) = $self->size_request;
269
270 if ($w != $self->{req_w} || $h != $self->{req_h}) {
271 $self->{req_w} = $w;
272 $self->{req_h} = $h;
273
274 $self->{parent}->check_size
275 if $self->{parent};
276 }
233} 277}
234 278
235sub update { 279sub update {
236 my ($self) = @_; 280 my ($self) = @_;
237 281
… …
326 370
327 $self 371 $self
328} 372}
329 373
330sub add { 374sub add {
331 my ($self, $chld) = @_; 375 my ($self, $child) = @_;
332 376
333 $chld->set_parent ($self); 377 $child->set_parent ($self);
378
379 use sort 'stable';
334 380
335 $self->{children} = [ 381 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 382 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 383 @{$self->{children}}, $child
338 ]; 384 ];
339 385
340 $self->{w} = $self->{h} = -1; 386 $self->{w} = $self->{h} = -1;
341 $self->update; 387 $self->update;
342} 388}
… …
344sub remove { 390sub remove {
345 my ($self, $widget) = @_; 391 my ($self, $widget) = @_;
346 392
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 393 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348 394
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 395 $self->check_size;
350} 396}
351 397
352sub find_widget { 398sub find_widget {
353 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
354 400
… …
439} 485}
440 486
441sub render_chld { 487sub render_chld {
442 my ($self) = @_; 488 my ($self) = @_;
443 489
444 $self->{texture} = 490 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 491 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 492 glClear GL_COLOR_BUFFER_BIT;
447 ); 493 $self->child->draw;
494 };
448} 495}
449 496
450sub size_allocate { 497sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
452 499
… …
473 $tex->draw_quad (0, 0, $w, $h); 520 $tex->draw_quad (0, 0, $w, $h);
474 521
475 glDisable GL_BLEND; 522 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D; 523 glDisable GL_TEXTURE_2D;
477} 524}
525
526#############################################################################
527
528package CFClient::UI::ViewPort;
529
530our @ISA = CFClient::UI::Window::;
531
532sub new { die }
533
534sub size_request {
535 my ($self) = @_;
536
537 @$self{qw(child_w child_h)} = $self->child->size_request;
538 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
539
540 @$self{qw(child_w child_h)}
541}
542
543sub size_allocate {
544 my ($self, $x, $y, $w, $h) = @_;
545
546 $self->_size_allocate ($x, $y, $w, $h) or return;
547}
548
549sub _draw {
550 my ($self) = @_;
551
552 $self->{children}[1]->draw;
553}
554
478 555
479############################################################################# 556#############################################################################
480 557
481package CFClient::UI::Frame; 558package CFClient::UI::Frame;
482 559
… …
538 # TODO: user_x, user_y, overwrite moveto? 615 # TODO: user_x, user_y, overwrite moveto?
539 616
540 $class->SUPER::new ( 617 $class->SUPER::new (
541 bg => [1, 1, 1, 1], 618 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1], 619 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8, 620 border => int $::FONTSIZE * 0.8,
544 @_ 621 @_
545 ) 622 )
546} 623}
547 624
548sub size_request { 625sub size_request {
… …
671 @_ 748 @_
672 ) 749 )
673} 750}
674 751
675sub add { 752sub add {
676 my ($self, $x, $y, $chld) = @_; 753 my ($self, $x, $y, $child) = @_;
677 754
755 $child->set_parent ($self);
678 $self->{children}[$y][$x] = $chld; 756 $self->{children}[$y][$x] = $child;
679 $chld->set_parent ($self);
680 757
681 $self->{w} = $self->{h} = -1; 758 $self->{w} = $self->{h} = -1;
759 $self->update;
760}
761
762# TODO: move to container class maybe? send childs a signal on removal?
763sub clear {
764 my ($self) = @_;
765
766 delete $self->{children};
682 $self->update; 767 $self->update;
683} 768}
684 769
685sub get_wh { 770sub get_wh {
686 my ($self) = @_; 771 my ($self) = @_;
… …
731 my $col_expand = (sum @col_expand) || 1; 816 my $col_expand = (sum @col_expand) || 1;
732 817
733 # linearly scale sizes 818 # linearly scale sizes
734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 819 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 820 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
821
822 CFClient::UI::harmonize $ws;
823 CFClient::UI::harmonize $hs;
736 824
737 my $y; 825 my $y;
738 826
739 for my $r (0 .. $#{$self->{children}}) { 827 for my $r (0 .. $#{$self->{children}}) {
740 my $row = $self->{children}[$r] 828 my $row = $self->{children}[$r]
… …
802} 890}
803 891
804sub size_allocate { 892sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_; 893 my ($self, $x, $y, $w, $h) = @_;
806 894
807 $self->_size_allocate ($x, $y, $w, $h); 895 $self->_size_allocate ($x, $y, $w, $h) or return;
808 896
809 ($h, $w) = ($w, $h); 897 ($h, $w) = ($w, $h);
810 898
811 my $children = $self->{children}; 899 my $children = $self->{children};
812 900
… …
828 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 916 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829 $h[$_] = $alloc_h; 917 $h[$_] = $alloc_h;
830 } 918 }
831 } 919 }
832 920
921 CFClient::UI::harmonize \@h;
922
833 my $y = 0; 923 my $y = 0;
834 for (0 .. $#$children) { 924 for (0 .. $#$children) {
835 my $child = $children->[$_]; 925 my $child = $children->[$_];
836 my $h = $h[$_]; 926 my $h = $h[$_];
837 $child->size_allocate ($y, 0, $h, $w); 927 $child->size_allocate ($y, 0, $h, $w);
838 928
839 $y += $h; 929 $y += $h;
840 } 930 }
931
932 1
841} 933}
842 934
843############################################################################# 935#############################################################################
844 936
845package CFClient::UI::VBox; 937package CFClient::UI::VBox;
… …
860} 952}
861 953
862sub size_allocate { 954sub size_allocate {
863 my ($self, $x, $y, $w, $h) = @_; 955 my ($self, $x, $y, $w, $h) = @_;
864 956
865 $self->_size_allocate ($x, $y, $w, $h); 957 $self->_size_allocate ($x, $y, $w, $h) or return;
866 958
867 my $children = $self->{children}; 959 my $children = $self->{children};
868 960
869 my @h = map +($_->size_request)[1], @$children; 961 my @h = map +($_->size_request)[1], @$children;
870 962
… …
882 974
883 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 975 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
884 } 976 }
885 } 977 }
886 978
979 CFClient::UI::harmonize \@h;
980
887 my $y = 0; 981 my $y = 0;
888 for (0 .. $#$children) { 982 for (0 .. $#$children) {
889 my $child = $children->[$_]; 983 my $child = $children->[$_];
890 my $h = $h[$_]; 984 my $h = $h[$_];
891 $child->size_allocate (0, $y, $w, $h); 985 $child->size_allocate (0, $y, $w, $h);
892 986
893 $y += $h; 987 $y += $h;
894 } 988 }
989
990 1
895} 991}
896 992
897############################################################################# 993#############################################################################
898 994
899package CFClient::UI::Label; 995package CFClient::UI::Label;
… …
904 1000
905sub new { 1001sub new {
906 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
907 1003
908 my $self = $class->SUPER::new ( 1004 my $self = $class->SUPER::new (
909 fg => [1, 1, 1], 1005 fg => [1, 1, 1],
910 height => $::FONTSIZE, 1006 fontsize => $::FONTSIZE,
911 text => "", 1007 text => "",
912 align => -1, 1008 align => -1,
1009 valign => -1,
913 padding => 2, 1010 padding => 2,
914 layout => new CFClient::Layout, 1011 layout => new CFClient::Layout,
915 %arg 1012 %arg
916 ); 1013 );
917 1014
918 $self->set_text ($self->{text}); 1015 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1016
1017 $self->set_text (delete $self->{text}) if exists $self->{text};
1018 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
919 1019
920 $self 1020 $self
921} 1021}
922 1022
923sub escape_text { 1023sub escape_text {
… …
931} 1031}
932 1032
933sub set_text { 1033sub set_text {
934 my ($self, $text) = @_; 1034 my ($self, $text) = @_;
935 1035
936 $self->{text} = $text;
937 $self->{layout}->set_markup ($text); 1036 $self->{layout}->set_text ($text);
938 1037
939 delete $self->{texture}; 1038 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
941 $self->update; 1039 $self->update;
942} 1040}
943 1041
944sub get_text { 1042sub set_markup {
945 my ($self, $text) = @_; 1043 my ($self, $markup) = @_;
946 1044
947 $self->{text} 1045 $self->{layout}->set_markup ($markup);
1046
1047 delete $self->{texture};
1048 $self->update;
948} 1049}
949 1050
950sub size_request { 1051sub size_request {
951 my ($self) = @_; 1052 my ($self) = @_;
952 1053
953 $self->{layout}->set_width; 1054 $self->{layout}->set_width;
954 $self->{layout}->set_height ($self->{height}); 1055 $self->{layout}->set_height ($self->{fontsize});
1056
955 my ($w, $h) = $self->{layout}->size; 1057 my ($w, $h) = $self->{layout}->size;
956 1058
957 ( 1059 (
958 $w + $self->{padding} * 2, 1060 $w + $self->{padding} * 2,
959 $h + $self->{padding} * 2, 1061 $h + $self->{padding} * 2,
… …
978sub _draw { 1080sub _draw {
979 my ($self) = @_; 1081 my ($self) = @_;
980 1082
981 my $tex = $self->{texture} ||= do { 1083 my $tex = $self->{texture} ||= do {
982 $self->{layout}->set_width ($self->{w}); 1084 $self->{layout}->set_width ($self->{w});
983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1085 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
984 new_from_layout CFClient::Texture $self->{layout} 1086 new_from_layout CFClient::Texture $self->{layout}
985 }; 1087 };
986 1088
987 glEnable GL_BLEND; 1089 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1090 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989 glEnable GL_TEXTURE_2D; 1091 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991 1093
992 glColor @{$self->{fg}}; 1094 glColor @{$self->{fg}};
993 1095
994 my $x = 1096 $self->{ox} = int (
995 $self->{align} < 0 ? $self->{padding} 1097 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1098 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5; 1099 : ($self->{w} - $tex->{w}) * 0.5
1100 );
998 1101
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1102 $self->{oy} = int (
1000 $tex->draw_quad (0, 0); 1103 $self->{valign} < 0 ? $self->{padding}
1104 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1105 : ($self->{h} - $tex->{h}) * 0.5
1106 );
1107
1108 $tex->draw_quad ($self->{ox}, $self->{oy});
1001 1109
1002 glDisable GL_TEXTURE_2D; 1110 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND; 1111 glDisable GL_BLEND;
1004} 1112}
1005 1113
1006############################################################################# 1114#############################################################################
1007 1115
1008package CFClient::UI::Entry; 1116package CFClient::UI::EntryBase;
1009 1117
1010our @ISA = CFClient::UI::Label::; 1118our @ISA = CFClient::UI::Label::;
1011 1119
1012use SDL; 1120use SDL;
1013use SDL::OpenGL; 1121use SDL::OpenGL;
… …
1020 bg => [0, 0, 0, 0.2], 1128 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5], 1129 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0], 1130 active_fg => [0, 0, 0],
1023 can_hover => 1, 1131 can_hover => 1,
1024 can_focus => 1, 1132 can_focus => 1,
1133 valign => 0,
1025 @_ 1134 @_
1026 ) 1135 )
1027} 1136}
1028 1137
1029sub _set_text { 1138sub _set_text {
1030 my ($self, $text) = @_; 1139 my ($self, $text) = @_;
1031 1140
1032 my $old_text = $self->{text}; 1141 delete $self->{cur_h};
1142
1143 return if $self->{text} eq $text;
1033 1144
1034 $self->{last_activity} = $::NOW; 1145 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text; 1146 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1039 1147
1040 $text =~ s/./*/g if $self->{hidden}; 1148 $text =~ s/./*/g if $self->{hidden};
1149 $self->{layout}->set_text ("$text ");
1041 1150
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1151 $self->emit (changed => $self->{text});
1152}
1043 1153
1044 $text = substr $text, 0, $self->{cursor}; 1154sub get_text {
1045 utf8::encode $text; 1155 $_[0]{text}
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1051} 1156}
1052 1157
1053sub size_request { 1158sub size_request {
1054 my ($self) = @_; 1159 my ($self) = @_;
1055 1160
… …
1059} 1164}
1060 1165
1061sub size_allocate { 1166sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_; 1167 my ($self, $x, $y, $w, $h) = @_;
1063 1168
1064 $self->SUPER::size_allocate ($x, $y, $w, $h); 1169 $self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1065 1170
1066 $self->_set_text ($self->{text}); 1171 $self->_set_text ($self->{text});
1067} 1172}
1068 1173
1069sub set_text { 1174sub set_text {
… …
1159 1264
1160 $self->SUPER::_draw; 1265 $self->SUPER::_draw;
1161 1266
1162 #TODO: force update every cursor change :( 1267 #TODO: force update every cursor change :(
1163 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1268 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1269
1270 unless (exists $self->{cur_h}) {
1271 my $text = substr $self->{text}, 0, $self->{cursor};
1272 utf8::encode $text;
1273
1274 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1275 }
1276
1164 glColor @{$self->{fg}}; 1277 glColor @{$self->{fg}};
1165 glBegin GL_LINES; 1278 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1279 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1280 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1168 glEnd; 1281 glEnd;
1169 } 1282 }
1170} 1283}
1171 1284
1172package CFClient::UI::LineEntry; 1285package CFClient::UI::Entry;
1173 1286
1174our @ISA = CFClient::UI::Entry::; 1287our @ISA = CFClient::UI::EntryBase::;
1175 1288
1176use SDL; 1289use SDL;
1177use SDL::OpenGL; 1290use SDL::OpenGL;
1178 1291
1179sub key_down { 1292sub key_down {
… …
1209 1322
1210 $class->SUPER::new ( 1323 $class->SUPER::new (
1211 padding => 4, 1324 padding => 4,
1212 fg => [1, 1, 1], 1325 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2], 1326 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0], 1327 active_fg => [0, 0, 1],
1215 can_hover => 1, 1328 can_hover => 1,
1216 @_ 1329 @_
1217 ) 1330 )
1218} 1331}
1219 1332
… …
1228 1341
1229sub _draw { 1342sub _draw {
1230 my ($self) = @_; 1343 my ($self) = @_;
1231 1344
1232 local $self->{fg} = $self->{fg}; 1345 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
1234
1235 glEnable GL_BLEND;
1236 glEnable GL_TEXTURE_2D;
1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238 1346
1239 if ($GRAB == $self) { 1347 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg}; 1348 $self->{fg} = $self->{active_fg};
1241 } 1349 }
1242 1350
1243 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1351 glEnable GL_BLEND;
1352 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1353 glEnable GL_TEXTURE_2D;
1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1354 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1355 glColor 0, 0, 0, 1;
1245 1356
1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1357 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247 1358
1248 glDisable GL_TEXTURE_2D; 1359 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND; 1360 glDisable GL_BLEND;
1250 1361
1251 $self->SUPER::_draw; 1362 $self->SUPER::_draw;
… …
1284} 1395}
1285 1396
1286sub size_allocate { 1397sub size_allocate {
1287 my ($self, $x, $y, $w, $h) = @_; 1398 my ($self, $x, $y, $w, $h) = @_;
1288 1399
1289 $self->_size_allocate ($x, $y, $w, $h); 1400 $self->_size_allocate ($x, $y, $w, $h) or return;
1290} 1401}
1291 1402
1292sub button_down { 1403sub button_down {
1293 my ($self, $ev, $x, $y) = @_; 1404 my ($self, $ev, $x, $y) = @_;
1294 1405
… …
1318 1429
1319 $tex->draw_quad (0, 0, $s, $s); 1430 $tex->draw_quad (0, 0, $s, $s);
1320 1431
1321 glDisable GL_TEXTURE_2D; 1432 glDisable GL_TEXTURE_2D;
1322 glDisable GL_BLEND; 1433 glDisable GL_BLEND;
1434}
1435
1436#############################################################################
1437
1438package CFClient::UI::VGauge;
1439
1440our @ISA = CFClient::UI::Base::;
1441
1442use SDL::OpenGL;
1443
1444my %tex = (
1445 food => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1447 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1448 ],
1449 grace => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1452 ],
1453 hp => [
1454 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1455 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1456 ],
1457 mana => [
1458 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1459 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1460 ],
1461);
1462
1463# eg. VGauge->new (gauge => 'food'), default gauge: food
1464sub new {
1465 my $class = shift;
1466
1467 my $self = $class->SUPER::new (gauge => 'food', @_);
1468
1469 $self
1470}
1471
1472sub size_request {
1473 my ($self) = @_;
1474
1475 ($self->{w}, $self->{h})
1476}
1477
1478sub set_max {
1479 my ($self, $max) = @_;
1480 $self->{max_val} = $max;
1481}
1482
1483sub set_value {
1484 my ($self, $val, $max) = @_;
1485
1486 $self->set_max ($max)
1487 if defined $max;
1488
1489 $max = $self->{max_val};
1490 $self->{val} = $val;
1491
1492 $self->update;
1493}
1494
1495sub _draw {
1496 my ($self) = @_;
1497
1498 my $tex = $tex{$self->{gauge}};
1499
1500 my ($w, $h) = ($self->{w}, $self->{h});
1501
1502 my $ycut = $self->{val} / ($self->{max_val} || 1);
1503 $ycut = 1 if $self->{val} > $self->{max_val};
1504
1505 my $t1 = $tex->[0];
1506 my $t2 = $tex->[1];
1507
1508 glEnable GL_BLEND;
1509 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1510 glEnable GL_TEXTURE_2D;
1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512
1513 my $h1 = $self->{h} - $ycut * $self->{h};
1514 my $h2 = $ycut * $self->{h};
1515
1516 my $yp = 0;
1517
1518 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1519 glBegin (GL_QUADS);
1520 glTexCoord (0, 0); glVertex (0 , $yp);
1521 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1522 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1523 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1524 glEnd ();
1525
1526 $yp += $h1;
1527
1528 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1529 glBegin (GL_QUADS);
1530 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1531 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1532 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1533 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1534 glEnd ();
1535
1536 glDisable GL_BLEND;
1537 glDisable GL_TEXTURE_2D;
1323} 1538}
1324 1539
1325############################################################################# 1540#############################################################################
1326 1541
1327package CFClient::UI::Slider; 1542package CFClient::UI::Slider;
… …
1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1639 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1640 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426 1641
1427 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1642 my ($value, $lo, $hi, $page) = @{$self->{range}};
1428 1643
1644 $hi = $value + 1 if $lo == $hi;
1645
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 1646 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1647 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431 1648
1432 $page = int $page * $inner_w / ($hi - $lo); 1649 $page = int $page * $inner_w / ($hi - $lo);
1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1650 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
… …
1465 1682
1466sub new { 1683sub new {
1467 my $class = shift; 1684 my $class = shift;
1468 1685
1469 my $self = $class->SUPER::new ( 1686 my $self = $class->SUPER::new (
1687 req_w => $::WIDTH / 6,
1688 req_h => $::HEIGHT / 6,
1689 fontsize => $::FONTSIZE,
1690 @_,
1691
1692 layout => (new CFClient::Layout),
1470 par => [], 1693 par => [],
1471 @_, 1694 height => 0,
1472 children => [ 1695 children => [
1473 (new CFClient::UI::Empty expand => 1), 1696 (new CFClient::UI::Empty expand => 1),
1474 (new CFClient::UI::Slider vertical => 1), 1697 (new CFClient::UI::Slider vertical => 1),
1475 ], 1698 ],
1476 ); 1699 );
1477 1700
1701 $self->{children}[1]->connect (changed => sub {
1702 $self->update;
1703 });
1704
1478 $self 1705 $self
1706}
1707
1708sub set_fontsize {
1709 my ($self, $fontsize) = @_;
1710
1711 $self->{fontsize} = $fontsize;
1712 $self->reflow;
1713}
1714
1715sub text_height {
1716 my ($self, $text) = @_;
1717
1718 my $layout = $self->{layout};
1719
1720 $layout->set_height ($self->{fontsize});
1721 $layout->set_width ($self->{w});
1722 $layout->set_text ($text);
1723
1724 ($layout->size)[1]
1725}
1726
1727sub reflow {
1728 my ($self) = @_;
1729
1730 $self->{need_reflow}++;
1731 $self->update;
1732}
1733
1734sub size_request {
1735 my ($self) = @_;
1736
1737 ($self->{req_w}, $self->{req_h})
1738}
1739
1740sub size_allocate {
1741 my ($self, $x, $y, $w, $h) = @_;
1742
1743 $self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1744
1745 $self->{layout}->set_height ($self->{fontsize});
1746 $self->{layout}->set_width ($self->{w});
1747
1748 $self->reflow;
1749 $self->update;
1479} 1750}
1480 1751
1481sub add_paragraph { 1752sub add_paragraph {
1482 my ($self, $color, $text) = @_; 1753 my ($self, $color, $text) = @_;
1483 1754
1755 #TODO: intelligently "reformat" paragraph
1756
1757 my $height = $self->text_height ($text);
1758
1759 $self->{height} += $height;
1760
1484 push @{$self->{par}}, [$color, $text]; 1761 push @{$self->{par}}, [$height, $color, $text];
1485 my $count = scalar @{$self->{par}}; 1762
1486 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 1763 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1487 $self->{children}[1]->update; 1764 $self->{children}[1]->update;
1488} 1765}
1489 1766
1767sub update {
1768 my ($self) = @_;
1769
1770 $self->SUPER::update;
1771
1772 return unless $self->{h} > 0;
1773
1774 delete $self->{texture};
1775
1776 $ROOT->on_refresh ($self, sub {
1777 if (delete $self->{need_reflow}) {
1778 my $height = 0;
1779
1780 $height += $_->[0] = $self->text_height ($_->[2])
1781 for @{$self->{par}};
1782
1783 $self->{height} = $height;
1784
1785 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1786
1787 delete $self->{texture};
1788 }
1789
1790 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1791 glClearColor 0, 0, 0, 1;
1792 glClear GL_COLOR_BUFFER_BIT;
1793
1794 glEnable GL_BLEND;
1795 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1796 glEnable GL_TEXTURE_2D;
1797 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1798
1799 my $top = int $self->{children}[1]{range}[0];
1800
1801 my $y0 = $top;
1802 my $y1 = $top + $self->{h};
1803
1804 my $y = 0;
1805
1806 my $layout = $self->{layout};
1807
1808 for my $par (@{$self->{par}}) {
1809 my $h = $par->[0];
1810
1811 if ($y0 < $y + $h && $y < $y1) {
1812 $layout->set_text ($par->[2]);
1813
1814 glColor @{ $par->[1] };
1815 my ($W, $H) = $layout->size;
1816 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1817 }
1818
1819 $y += $h;
1820 }
1821
1822 glDisable GL_TEXTURE_2D;
1823 glDisable GL_BLEND;
1824 };
1825 });
1826}
1827
1490sub _draw { 1828sub _draw {
1491 my ($self) = @_; 1829 my ($self) = @_;
1492 1830
1493 my $par = $self->{par}; 1831 if ($self->{texture}) {
1494
1495 my $bottom = (scalar @$par) - 1;
1496
1497 my $w = $self->{children}[0]{w};
1498 my $y = $self->{h};
1499
1500 glEnable GL_BLEND;
1501 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1502 glEnable GL_TEXTURE_2D; 1832 glEnable GL_TEXTURE_2D;
1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1504 1834 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1505 # TODO: everything!
1506 while ($y > 0 && $bottom >= 0) {
1507 my $par = $par->[$bottom--];
1508
1509 my $layout = new CFClient::Layout;
1510
1511 $layout->set_height ($::FONTSIZE);
1512 $layout->set_width ($w);
1513 $layout->set_text ($par->[1]);
1514 my $tex = new_from_layout CFClient::Texture $layout;
1515 $y -= $tex->{h};
1516
1517 glColor @{ $par->[0] };
1518 $tex->draw_quad (0, $y);
1519 }
1520
1521 glDisable GL_TEXTURE_2D; 1835 glDisable GL_TEXTURE_2D;
1522 glDisable GL_BLEND; 1836 }
1837
1838 $self->{children}[1]->draw;
1839
1523} 1840}
1524 1841
1525############################################################################# 1842#############################################################################
1526 1843
1527package CFClient::UI::MapWidget; 1844package CFClient::UI::MapWidget;
… …
1551} 1868}
1552 1869
1553sub key_up { 1870sub key_up {
1554} 1871}
1555 1872
1873sub button_down {
1874 my ($self, $ev, $x, $y) = @_;
1875
1876 $self->focus_in;
1877
1878 if ($ev->button == 2) {
1879 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1880 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1881
1882 $self->{motion} = sub {
1883 my ($ev, $x, $y) = @_;
1884
1885 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1886
1887 $::CFG->{map_shift_x} = $bw + $x - $ox;
1888 $::CFG->{map_shift_y} = $bh + $y - $oy;
1889
1890 $self->update;
1891 };
1892 }
1893}
1894
1895sub button_up {
1896 my ($self, $ev, $x, $y) = @_;
1897
1898 delete $self->{motion};
1899}
1900
1901sub mouse_motion {
1902 my ($self, $ev, $x, $y) = @_;
1903
1904 $self->{motion}->($ev, $x, $y) if $self->{motion};
1905}
1906
1556sub size_request { 1907sub size_request {
1557 ( 1908 (
1558 1 + 32 * int $::WIDTH / 32, 1909 1 + 32 * int $::WIDTH / 32,
1559 1 + 32 * int $::HEIGHT / 32, 1910 1 + 32 * int $::HEIGHT / 32,
1560 ) 1911 )
… …
1568} 1919}
1569 1920
1570sub draw { 1921sub draw {
1571 my ($self) = @_; 1922 my ($self) = @_;
1572 1923
1573 $self->{need_update}++;#d#
1574 if (delete $self->{need_update}) { 1924 if (delete $self->{need_update}) {
1575 glNewList $self->{list}, GL_COMPILE; 1925 glNewList $self->{list}, GL_COMPILE;
1576 1926
1577 my $sw = int $::WIDTH / 32;
1578 my $sh = int $::HEIGHT / 32;
1579
1580 if ($::MAP) { 1927 if ($::MAP) {
1928 my $sw = int $::WIDTH / 32;
1929 my $sh = int $::HEIGHT / 32;
1930
1931 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1932 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1933
1934 glTranslate $sx0 - 32, $sy0 - 32, 0;
1935
1581 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); 1936 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1582 1937
1583 if ($::CFG->{fow_enable}) { 1938 if ($::CFG->{fow_enable}) {
1584 if ($::CFG->{fow_smooth}) { # smooth fog of war 1939 if ($::CFG->{fow_smooth}) { # smooth fog of war
1585 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1940 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1586 glConvolutionFilter2D 1941 glConvolutionFilter2D
… …
1594 0.1, 0.1, 0.1, 1949 0.1, 0.1, 0.1,
1595 ; 1950 ;
1596 glEnable GL_CONVOLUTION_2D; 1951 glEnable GL_CONVOLUTION_2D;
1597 } 1952 }
1598 1953
1599 my $tex = new CFClient::Texture 1954 $self->{fow_texture} = new CFClient::Texture
1600 w => $w, 1955 w => $w,
1601 h => $h, 1956 h => $h,
1602 data => $data, 1957 data => $data,
1603 internalformat => GL_ALPHA, 1958 internalformat => GL_ALPHA,
1604 format => GL_ALPHA; 1959 format => GL_ALPHA;
1605 1960
1606 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 1961 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1607 1962
1608 glEnable GL_BLEND; 1963 glEnable GL_BLEND;
1964 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1609 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1611 1967
1612 glColor +($::CFG->{fow_intensity}) x 3, 1; 1968 glColor +($::CFG->{fow_intensity}) x 3, 1;
1613 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1969 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1614 1970
1615 glDisable GL_TEXTURE_2D; 1971 glDisable GL_TEXTURE_2D;
1616 glDisable GL_BLEND; 1972 glDisable GL_BLEND;
1617 } 1973 }
1974
1975 # HACK BEGIN
1976 {
1977 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1978 my ($w, $h) = (250, 250);
1979
1980 glEnable GL_BLEND;
1981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1982 glEnable GL_TEXTURE_2D;
1983 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1984
1985 $self->{mapmap_texture} =
1986 new CFClient::Texture
1987 w => $w,
1988 h => $h,
1989 data => $::MAP->mapmap ($w, $h),
1990 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1991
1992 $self->{mapmap_texture}->draw_quad (100, 100);
1993
1994 glDisable GL_TEXTURE_2D;
1995 glDisable GL_BLEND;
1996 }
1997 # HACK END
1618 } 1998 }
1619 1999
1620 glEndList; 2000 glEndList;
1621 } 2001 }
1622 2002
2003 glPushMatrix;
1623 glCallList $self->{list}; 2004 glCallList $self->{list};
2005 glPopMatrix;
1624 2006
1625 if ($FOCUS != $self) { 2007 if ($FOCUS != $self) {
1626 glColor 64/255, 64/255, 64/255; 2008 glColor 64/255, 64/255, 64/255;
1627 glLogicOp GL_AND; 2009 glLogicOp GL_AND;
1628 glEnable GL_COLOR_LOGIC_OP; 2010 glEnable GL_COLOR_LOGIC_OP;
… …
1657 2039
1658 my $mod = $ev->key_mod; 2040 my $mod = $ev->key_mod;
1659 my $sym = $ev->key_sym; 2041 my $sym = $ev->key_sym;
1660 2042
1661 if ($sym == SDLK_KP5) { 2043 if ($sym == SDLK_KP5) {
1662 $::CONN->user_send ("command stay fire"); 2044 $::CONN->user_send ("stay fire");
1663 } elsif ($sym == SDLK_a) { 2045 } elsif ($sym == SDLK_a) {
1664 $::CONN->user_send ("command apply"); 2046 $::CONN->user_send ("apply");
1665 } elsif ($sym == SDLK_QUOTE) { 2047 } elsif ($sym == SDLK_QUOTE) {
1666 $self->emit ('activate_console'); 2048 $self->emit ('activate_console');
2049 } elsif ($sym == SDLK_SLASH) {
2050 $self->emit ('activate_console' => '/');
1667 } elsif (exists $DIR{$sym}) { 2051 } elsif (exists $DIR{$sym}) {
1668 if ($mod & KMOD_SHIFT) { 2052 if ($mod & KMOD_SHIFT) {
1669 $self->{shft}++; 2053 $self->{shft}++;
1670 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 2054 $::CONN->user_send ("fire $DIR{$sym}[0]");
1671 } elsif ($mod & KMOD_CTRL) { 2055 } elsif ($mod & KMOD_CTRL) {
1672 $self->{ctrl}++; 2056 $self->{ctrl}++;
1673 $::CONN->user_send ("command run $DIR{$sym}[0]"); 2057 $::CONN->user_send ("run $DIR{$sym}[0]");
1674 } else { 2058 } else {
1675 $::CONN->user_send ("command $DIR{$sym}[1]"); 2059 $::CONN->user_send ("$DIR{$sym}[1]");
1676 } 2060 }
1677 } 2061 }
1678} 2062}
1679 2063
1680sub key_up { 2064sub key_up {
… …
1682 2066
1683 my $mod = $ev->key_mod; 2067 my $mod = $ev->key_mod;
1684 my $sym = $ev->key_sym; 2068 my $sym = $ev->key_sym;
1685 2069
1686 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2070 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1687 $::CONN->user_send ("command fire_stop"); 2071 $::CONN->user_send ("fire_stop");
1688 } 2072 }
1689 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2073 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1690 $::CONN->user_send ("command run_stop"); 2074 $::CONN->user_send ("run_stop");
1691 } 2075 }
1692} 2076}
1693 2077
1694############################################################################# 2078#############################################################################
1695 2079
… …
1759sub toggle_flopper { 2143sub toggle_flopper {
1760 my ($self) = @_; 2144 my ($self) = @_;
1761 2145
1762 # TODO: use animation 2146 # TODO: use animation
1763 if ($self->{state} = !$self->{state}) { 2147 if ($self->{state} = !$self->{state}) {
1764 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2148 $CFClient::UI::ROOT->add ($self->{other});
1765 $self->{other}->move ( 2149 $self->{other}->move ($self->coord2global (0, $self->{h}));
1766 ($::WIDTH - $self->{other}{w}) * 0.5, 2150 $self->emit ("open");
1767 ($::HEIGHT - $self->{other}{h}) * 0.5,
1768 );
1769 } else { 2151 } else {
1770 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2152 $CFClient::UI::ROOT->remove ($self->{other});
2153 $self->emit ("close");
1771 } 2154 }
1772}
1773 2155
1774############################################################################# 2156 $self->emit (changed => $self->{state});
2157}
1775 2158
2159#############################################################################
2160
1776package CFClient::UI::Toplevel; 2161package CFClient::UI::Root;
1777 2162
1778our @ISA = CFClient::UI::Container::; 2163our @ISA = CFClient::UI::Container::;
2164
2165use SDL::OpenGL;
2166
2167sub check_size {
2168 my ($self) = @_;
2169
2170 $self->size_allocate (0, 0, $::WITH, $::HEIGHT);
2171}
1779 2172
1780sub size_request { 2173sub size_request {
1781 ($::WIDTH, $::HEIGHT) 2174 ($::WIDTH, $::HEIGHT)
1782} 2175}
1783 2176
… …
1788 2181
1789 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2182 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1790 for @{$self->{children}}; 2183 for @{$self->{children}};
1791} 2184}
1792 2185
1793sub translate { 2186sub _topleft {
1794 my ($self, $x, $y) = @_; 2187 my ($self, $x, $y) = @_;
1795 2188
1796 ($x, $y) 2189 ($x, $y)
1797} 2190}
1798 2191
1799sub update { 2192sub update {
1800 my ($self) = @_; 2193 my ($self) = @_;
1801 2194
1802 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2195 $self->check_size;
1803 ::refresh (); 2196 ::refresh ();
1804} 2197}
1805 2198
1806sub add { 2199sub add {
1807 my ($self, $widget) = @_; 2200 my ($self, $widget) = @_;
1808 2201
1809 $self->SUPER::add ($widget); 2202 $self->SUPER::add ($widget);
1810 2203
1811 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2204 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2205}
2206
2207sub on_refresh {
2208 my ($self, $id, $cb) = @_;
2209
2210 $self->{refresh_hook}{$id} = $cb;
1812} 2211}
1813 2212
1814sub draw { 2213sub draw {
1815 my ($self) = @_; 2214 my ($self) = @_;
1816 2215
2216 while (my $rcb = delete $self->{refresh_hook}) {
2217 $_->() for values %$rcb;
2218 }
2219
2220 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2221 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2222 glClear GL_COLOR_BUFFER_BIT;
2223
2224 glMatrixMode GL_PROJECTION;
2225 glLoadIdentity;
2226 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2227 glMatrixMode GL_MODELVIEW;
2228 glLoadIdentity;
2229
1817 $self->_draw; 2230 $self->_draw;
1818} 2231}
1819 2232
1820############################################################################# 2233#############################################################################
1821 2234
1822package CFClient::UI; 2235package CFClient::UI;
1823 2236
1824$TOPLEVEL = new CFClient::UI::Toplevel; 2237$ROOT = new CFClient::UI::Root;
1825 2238
18261 22391
1827 2240

Diff Legend

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