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.101 by elmex, Fri Apr 14 11:43:51 2006 UTC vs.
Revision 1.126 by root, Mon Apr 17 20:59:20 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
388 $child->check_size;
342} 389}
343 390
344sub remove { 391sub remove {
345 my ($self, $widget) = @_; 392 my ($self, $widget) = @_;
346 393
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 394 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348 395
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 396 $self->check_size;
350} 397}
351 398
352sub find_widget { 399sub find_widget {
353 my ($self, $x, $y) = @_; 400 my ($self, $x, $y) = @_;
354 401
… …
439} 486}
440 487
441sub render_chld { 488sub render_chld {
442 my ($self) = @_; 489 my ($self) = @_;
443 490
444 $self->{texture} = 491 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 492 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 493 glClear GL_COLOR_BUFFER_BIT;
447 ); 494 $self->child->draw;
495 };
448} 496}
449 497
450sub size_allocate { 498sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 499 my ($self, $x, $y, $w, $h) = @_;
452 500
… …
473 $tex->draw_quad (0, 0, $w, $h); 521 $tex->draw_quad (0, 0, $w, $h);
474 522
475 glDisable GL_BLEND; 523 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D; 524 glDisable GL_TEXTURE_2D;
477} 525}
526
527#############################################################################
528
529package CFClient::UI::ViewPort;
530
531our @ISA = CFClient::UI::Window::;
532
533sub new { die }
534
535sub size_request {
536 my ($self) = @_;
537
538 @$self{qw(child_w child_h)} = $self->child->size_request;
539 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
540
541 @$self{qw(child_w child_h)}
542}
543
544sub size_allocate {
545 my ($self, $x, $y, $w, $h) = @_;
546
547 $self->_size_allocate ($x, $y, $w, $h) or return;
548}
549
550sub _draw {
551 my ($self) = @_;
552
553 $self->{children}[1]->draw;
554}
555
478 556
479############################################################################# 557#############################################################################
480 558
481package CFClient::UI::Frame; 559package CFClient::UI::Frame;
482 560
… …
538 # TODO: user_x, user_y, overwrite moveto? 616 # TODO: user_x, user_y, overwrite moveto?
539 617
540 $class->SUPER::new ( 618 $class->SUPER::new (
541 bg => [1, 1, 1, 1], 619 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1], 620 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8, 621 border => int $::FONTSIZE * 0.8,
544 @_ 622 @_
545 ) 623 )
546} 624}
547 625
548sub size_request { 626sub size_request {
… …
671 @_ 749 @_
672 ) 750 )
673} 751}
674 752
675sub add { 753sub add {
676 my ($self, $x, $y, $chld) = @_; 754 my ($self, $x, $y, $child) = @_;
677 755
756 $child->set_parent ($self);
678 $self->{children}[$y][$x] = $chld; 757 $self->{children}[$y][$x] = $child;
679 $chld->set_parent ($self);
680 758
681 $self->{w} = $self->{h} = -1; 759 $self->{w} = $self->{h} = -1;
760
761 $child->check_size;
762}
763
764# TODO: move to container class maybe? send childs a signal on removal?
765sub clear {
766 my ($self) = @_;
767
768 delete $self->{children};
682 $self->update; 769 $self->update;
683} 770}
684 771
685sub get_wh { 772sub get_wh {
686 my ($self) = @_; 773 my ($self) = @_;
… …
731 my $col_expand = (sum @col_expand) || 1; 818 my $col_expand = (sum @col_expand) || 1;
732 819
733 # linearly scale sizes 820 # linearly scale sizes
734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 821 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 822 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
823
824 CFClient::UI::harmonize $ws;
825 CFClient::UI::harmonize $hs;
736 826
737 my $y; 827 my $y;
738 828
739 for my $r (0 .. $#{$self->{children}}) { 829 for my $r (0 .. $#{$self->{children}}) {
740 my $row = $self->{children}[$r] 830 my $row = $self->{children}[$r]
… …
802} 892}
803 893
804sub size_allocate { 894sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_; 895 my ($self, $x, $y, $w, $h) = @_;
806 896
807 $self->_size_allocate ($x, $y, $w, $h); 897 $self->_size_allocate ($x, $y, $w, $h) or return;
808 898
809 ($h, $w) = ($w, $h); 899 ($h, $w) = ($w, $h);
810 900
811 my $children = $self->{children}; 901 my $children = $self->{children};
812 902
… …
828 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 918 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829 $h[$_] = $alloc_h; 919 $h[$_] = $alloc_h;
830 } 920 }
831 } 921 }
832 922
923 CFClient::UI::harmonize \@h;
924
833 my $y = 0; 925 my $y = 0;
834 for (0 .. $#$children) { 926 for (0 .. $#$children) {
835 my $child = $children->[$_]; 927 my $child = $children->[$_];
836 my $h = $h[$_]; 928 my $h = $h[$_];
837 $child->size_allocate ($y, 0, $h, $w); 929 $child->size_allocate ($y, 0, $h, $w);
838 930
839 $y += $h; 931 $y += $h;
840 } 932 }
933
934 1
841} 935}
842 936
843############################################################################# 937#############################################################################
844 938
845package CFClient::UI::VBox; 939package CFClient::UI::VBox;
… …
860} 954}
861 955
862sub size_allocate { 956sub size_allocate {
863 my ($self, $x, $y, $w, $h) = @_; 957 my ($self, $x, $y, $w, $h) = @_;
864 958
865 $self->_size_allocate ($x, $y, $w, $h); 959 $self->_size_allocate ($x, $y, $w, $h) or return;
866 960
867 my $children = $self->{children}; 961 my $children = $self->{children};
868 962
869 my @h = map +($_->size_request)[1], @$children; 963 my @h = map +($_->size_request)[1], @$children;
870 964
… …
882 976
883 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 977 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
884 } 978 }
885 } 979 }
886 980
981 CFClient::UI::harmonize \@h;
982
887 my $y = 0; 983 my $y = 0;
888 for (0 .. $#$children) { 984 for (0 .. $#$children) {
889 my $child = $children->[$_]; 985 my $child = $children->[$_];
890 my $h = $h[$_]; 986 my $h = $h[$_];
891 $child->size_allocate (0, $y, $w, $h); 987 $child->size_allocate (0, $y, $w, $h);
892 988
893 $y += $h; 989 $y += $h;
894 } 990 }
991
992 1
895} 993}
896 994
897############################################################################# 995#############################################################################
898 996
899package CFClient::UI::Label; 997package CFClient::UI::Label;
… …
904 1002
905sub new { 1003sub new {
906 my ($class, %arg) = @_; 1004 my ($class, %arg) = @_;
907 1005
908 my $self = $class->SUPER::new ( 1006 my $self = $class->SUPER::new (
909 fg => [1, 1, 1], 1007 fg => [1, 1, 1],
910 height => $::FONTSIZE, 1008 fontsize => $::FONTSIZE,
911 text => "", 1009 text => "",
912 align => -1, 1010 align => -1,
1011 valign => -1,
913 padding => 2, 1012 padding => 2,
914 layout => new CFClient::Layout, 1013 layout => new CFClient::Layout,
915 %arg 1014 %arg
916 ); 1015 );
917 1016
918 $self->set_text ($self->{text}); 1017 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1018
1019 $self->set_text (delete $self->{text}) if exists $self->{text};
1020 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
919 1021
920 $self 1022 $self
921} 1023}
922 1024
923sub escape_text { 1025sub escape_text {
… …
931} 1033}
932 1034
933sub set_text { 1035sub set_text {
934 my ($self, $text) = @_; 1036 my ($self, $text) = @_;
935 1037
936 $self->{text} = $text;
937 $self->{layout}->set_markup ($text); 1038 $self->{layout}->set_text ($text);
938 1039
939 delete $self->{texture}; 1040 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
941 $self->update; 1041 $self->update;
942} 1042}
943 1043
944sub get_text { 1044sub set_markup {
945 my ($self, $text) = @_; 1045 my ($self, $markup) = @_;
946 1046
947 $self->{text} 1047 $self->{layout}->set_markup ($markup);
1048
1049 delete $self->{texture};
1050 $self->update;
948} 1051}
949 1052
950sub size_request { 1053sub size_request {
951 my ($self) = @_; 1054 my ($self) = @_;
952 1055
953 $self->{layout}->set_width; 1056 $self->{layout}->set_width;
954 $self->{layout}->set_height ($self->{height}); 1057 $self->{layout}->set_height ($self->{fontsize});
1058
955 my ($w, $h) = $self->{layout}->size; 1059 my ($w, $h) = $self->{layout}->size;
956 1060
957 ( 1061 (
958 $w + $self->{padding} * 2, 1062 $w + $self->{padding} * 2,
959 $h + $self->{padding} * 2, 1063 $h + $self->{padding} * 2,
… …
978sub _draw { 1082sub _draw {
979 my ($self) = @_; 1083 my ($self) = @_;
980 1084
981 my $tex = $self->{texture} ||= do { 1085 my $tex = $self->{texture} ||= do {
982 $self->{layout}->set_width ($self->{w}); 1086 $self->{layout}->set_width ($self->{w});
983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1087 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
984 new_from_layout CFClient::Texture $self->{layout} 1088 new_from_layout CFClient::Texture $self->{layout}
985 }; 1089 };
986 1090
987 glEnable GL_BLEND; 1091 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1092 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989 glEnable GL_TEXTURE_2D; 1093 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1094 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991 1095
992 glColor @{$self->{fg}}; 1096 glColor @{$self->{fg}};
993 1097
994 my $x = 1098 $self->{ox} = int (
995 $self->{align} < 0 ? $self->{padding} 1099 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1100 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5; 1101 : ($self->{w} - $tex->{w}) * 0.5
1102 );
998 1103
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1104 $self->{oy} = int (
1000 $tex->draw_quad (0, 0); 1105 $self->{valign} < 0 ? $self->{padding}
1106 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1107 : ($self->{h} - $tex->{h}) * 0.5
1108 );
1109
1110 $tex->draw_quad ($self->{ox}, $self->{oy});
1001 1111
1002 glDisable GL_TEXTURE_2D; 1112 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND; 1113 glDisable GL_BLEND;
1004} 1114}
1005 1115
1006############################################################################# 1116#############################################################################
1007 1117
1008package CFClient::UI::Entry; 1118package CFClient::UI::EntryBase;
1009 1119
1010our @ISA = CFClient::UI::Label::; 1120our @ISA = CFClient::UI::Label::;
1011 1121
1012use SDL; 1122use SDL;
1013use SDL::OpenGL; 1123use SDL::OpenGL;
… …
1020 bg => [0, 0, 0, 0.2], 1130 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5], 1131 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0], 1132 active_fg => [0, 0, 0],
1023 can_hover => 1, 1133 can_hover => 1,
1024 can_focus => 1, 1134 can_focus => 1,
1135 valign => 0,
1025 @_ 1136 @_
1026 ) 1137 )
1027} 1138}
1028 1139
1029sub _set_text { 1140sub _set_text {
1030 my ($self, $text) = @_; 1141 my ($self, $text) = @_;
1031 1142
1032 my $old_text = $self->{text}; 1143 delete $self->{cur_h};
1144
1145 return if $self->{text} eq $text;
1033 1146
1034 $self->{last_activity} = $::NOW; 1147 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text; 1148 $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 1149
1040 $text =~ s/./*/g if $self->{hidden}; 1150 $text =~ s/./*/g if $self->{hidden};
1151 $self->{layout}->set_text ("$text ");
1041 1152
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1153 $self->emit (changed => $self->{text});
1154}
1043 1155
1044 $text = substr $text, 0, $self->{cursor}; 1156sub get_text {
1045 utf8::encode $text; 1157 $_[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} 1158}
1052 1159
1053sub size_request { 1160sub size_request {
1054 my ($self) = @_; 1161 my ($self) = @_;
1055 1162
… …
1059} 1166}
1060 1167
1061sub size_allocate { 1168sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_; 1169 my ($self, $x, $y, $w, $h) = @_;
1063 1170
1064 $self->SUPER::size_allocate ($x, $y, $w, $h); 1171 $self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1065 1172
1066 $self->_set_text ($self->{text}); 1173 $self->_set_text ($self->{text});
1067} 1174}
1068 1175
1069sub set_text { 1176sub set_text {
… …
1159 1266
1160 $self->SUPER::_draw; 1267 $self->SUPER::_draw;
1161 1268
1162 #TODO: force update every cursor change :( 1269 #TODO: force update every cursor change :(
1163 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1270 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1271
1272 unless (exists $self->{cur_h}) {
1273 my $text = substr $self->{text}, 0, $self->{cursor};
1274 utf8::encode $text;
1275
1276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1277 }
1278
1164 glColor @{$self->{fg}}; 1279 glColor @{$self->{fg}};
1165 glBegin GL_LINES; 1280 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1281 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1282 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1168 glEnd; 1283 glEnd;
1169 } 1284 }
1170} 1285}
1171 1286
1172package CFClient::UI::LineEntry; 1287package CFClient::UI::Entry;
1173 1288
1174our @ISA = CFClient::UI::Entry::; 1289our @ISA = CFClient::UI::EntryBase::;
1175 1290
1176use SDL; 1291use SDL;
1177use SDL::OpenGL; 1292use SDL::OpenGL;
1178 1293
1179sub key_down { 1294sub key_down {
… …
1209 1324
1210 $class->SUPER::new ( 1325 $class->SUPER::new (
1211 padding => 4, 1326 padding => 4,
1212 fg => [1, 1, 1], 1327 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2], 1328 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0], 1329 active_fg => [0, 0, 1],
1215 can_hover => 1, 1330 can_hover => 1,
1331 align => 0,
1332 valign => 0,
1216 @_ 1333 @_
1217 ) 1334 )
1218} 1335}
1219 1336
1220sub button_up { 1337sub button_up {
… …
1228 1345
1229sub _draw { 1346sub _draw {
1230 my ($self) = @_; 1347 my ($self) = @_;
1231 1348
1232 local $self->{fg} = $self->{fg}; 1349 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 1350
1239 if ($GRAB == $self) { 1351 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg}; 1352 $self->{fg} = $self->{active_fg};
1241 } 1353 }
1242 1354
1243 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1355 glEnable GL_BLEND;
1356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1357 glEnable GL_TEXTURE_2D;
1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1359 glColor 0, 0, 0, 1;
1245 1360
1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1361 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247 1362
1248 glDisable GL_TEXTURE_2D; 1363 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND; 1364 glDisable GL_BLEND;
1250 1365
1251 $self->SUPER::_draw; 1366 $self->SUPER::_draw;
… …
1254############################################################################# 1369#############################################################################
1255 1370
1256package CFClient::UI::CheckBox; 1371package CFClient::UI::CheckBox;
1257 1372
1258our @ISA = CFClient::UI::DrawBG::; 1373our @ISA = CFClient::UI::DrawBG::;
1374
1375my @tex =
1376 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1377 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1259 1378
1260use SDL; 1379use SDL;
1261use SDL::OpenGL; 1380use SDL::OpenGL;
1262 1381
1263sub new { 1382sub new {
… …
1280} 1399}
1281 1400
1282sub size_allocate { 1401sub size_allocate {
1283 my ($self, $x, $y, $w, $h) = @_; 1402 my ($self, $x, $y, $w, $h) = @_;
1284 1403
1285 $self->_size_allocate ($x, $y, $w, $h); 1404 $self->_size_allocate ($x, $y, $w, $h) or return;
1286} 1405}
1287 1406
1288sub button_down { 1407sub button_down {
1289 my ($self, $ev, $x, $y) = @_; 1408 my ($self, $ev, $x, $y) = @_;
1290 1409
… …
1301 $self->SUPER::_draw; 1420 $self->SUPER::_draw;
1302 1421
1303 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1422 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1304 1423
1305 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1424 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1306 1425
1307 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1426 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1308 1427
1309 glBegin GL_LINE_LOOP; 1428 glEnable GL_BLEND;
1310 glVertex 0 , 0; 1429 glEnable GL_TEXTURE_2D;
1311 glVertex 0 , $s; 1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1312 glVertex $s, $s; 1431
1313 glVertex $s, 0; 1432 my $tex = $self->{state} ? $tex[1] : $tex[0];
1433
1434 $tex->draw_quad (0, 0, $s, $s);
1435
1436 glDisable GL_TEXTURE_2D;
1437 glDisable GL_BLEND;
1438}
1439
1440#############################################################################
1441
1442package CFClient::UI::VGauge;
1443
1444our @ISA = CFClient::UI::Base::;
1445
1446use SDL::OpenGL;
1447
1448my %tex = (
1449 food => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1452 ],
1453 grace => [
1454 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1455 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1456 ],
1457 hp => [
1458 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1459 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1460 ],
1461 mana => [
1462 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1463 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1464 ],
1465);
1466
1467# eg. VGauge->new (gauge => 'food'), default gauge: food
1468sub new {
1469 my $class = shift;
1470
1471 my $self = $class->SUPER::new (gauge => 'food', @_);
1472
1473 $self
1474}
1475
1476sub size_request {
1477 my ($self) = @_;
1478
1479 (30, 100)
1480}
1481
1482sub set_max {
1483 my ($self, $max) = @_;
1484 $self->{max_val} = $max;
1485}
1486
1487sub set_value {
1488 my ($self, $val, $max) = @_;
1489
1490 $self->set_max ($max)
1491 if defined $max;
1492
1493 $max = $self->{max_val};
1494 $self->{val} = $val;
1495
1496 $self->update;
1497}
1498
1499sub _draw {
1500 my ($self) = @_;
1501
1502 my $tex = $tex{$self->{gauge}};
1503
1504 my ($w, $h) = ($self->{w}, $self->{h});
1505
1506 my $ycut = $self->{val} / ($self->{max_val} || 1);
1507 $ycut = 1 if $self->{val} > $self->{max_val};
1508
1509 my $t1 = $tex->[0];
1510 my $t2 = $tex->[1];
1511
1512 glEnable GL_BLEND;
1513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1514 glEnable GL_TEXTURE_2D;
1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1516
1517 my $h1 = $self->{h} - $ycut * $self->{h};
1518 my $h2 = $ycut * $self->{h};
1519
1520 my $yp = 0;
1521
1522 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1523 glBegin (GL_QUADS);
1524 glTexCoord (0, 0); glVertex (0 , $yp);
1525 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1526 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1527 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1314 glEnd; 1528 glEnd ();
1315 1529
1316 if ($self->{state}) { 1530 $yp += $h1;
1317 glBegin GL_LINES; 1531
1318 glVertex 0 , 0; 1532 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1319 glVertex $s, $s; 1533 glBegin (GL_QUADS);
1320 glVertex $s, 0; 1534 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1321 glVertex 0 , $s; 1535 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1536 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1537 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1322 glEnd; 1538 glEnd ();
1323 } 1539
1540 glDisable GL_BLEND;
1541 glDisable GL_TEXTURE_2D;
1324} 1542}
1325 1543
1326############################################################################# 1544#############################################################################
1327 1545
1328package CFClient::UI::Slider; 1546package CFClient::UI::Slider;
… …
1351 range => [0, 0, 100, 10], 1569 range => [0, 0, 100, 10],
1352 req_w => 40, 1570 req_w => 40,
1353 req_h => 13, 1571 req_h => 13,
1354 vertical => 0, 1572 vertical => 0,
1355 can_hover => 1, 1573 can_hover => 1,
1574 inner_pad => 5,
1356 @_ 1575 @_
1357 ); 1576 );
1358 1577
1359 $self 1578 $self
1360} 1579}
… …
1381 if ($GRAB == $self) { 1600 if ($GRAB == $self) {
1382 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1601 my ($value, $lo, $hi, $page) = @{$self->{range}};
1383 1602
1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1603 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1385 1604
1605 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1606 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1607
1608 $x -= $inner_pad_px; # substract the padding
1386 $x = $x * ($hi - $lo) / $w + $lo; 1609 $x = $x * ($hi - $lo) / $inner_w + $lo;
1387 $x = $lo if $x < $lo; 1610 $x = $lo if $x < $lo;
1388 $x = $hi - $page if $x > $hi - $page; 1611 $x = $hi - $page if $x > $hi - $page;
1389 $self->{range}[0] = $x; 1612 $self->{range}[0] = $x;
1390 1613
1391 $self->emit (changed => $x); 1614 $self->emit (changed => $x);
1392 $self->update; 1615 $self->update;
1393 } 1616 }
1617}
1618
1619# the inner_* stuff is for generating a padding for the slider handle,
1620# so that the handle doesn't leave the texture. This calculation isn't 100%
1621# correct propably, but it does the job for now
1622sub _calc_inner_pad_px {
1623 my ($self, $w) = @_;
1624 ($w / 100) * $self->{inner_pad} # % to pixels
1394} 1625}
1395 1626
1396sub _draw { 1627sub _draw {
1397 my ($self) = @_; 1628 my ($self) = @_;
1398 1629
… …
1412 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1643 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1413 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1644 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1414 1645
1415 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1646 my ($value, $lo, $hi, $page) = @{$self->{range}};
1416 1647
1417 # the inner_* stuff is for generating a padding for the slider handle, 1648 $hi = $value + 1 if $lo == $hi;
1418 # so that the handle doesn't leave the texture. This calculation isn't 100% 1649
1419 # correct propably, but it does the job for now 1650 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1420 my $inner_pad = 5; # 5% of width for slider bg texture border
1421 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1422 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1651 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1423 1652
1424 $page = int $page * $inner_w / ($hi - $lo); 1653 $page = int $page * $inner_w / ($hi - $lo);
1425 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1654 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1426 1655
1427 $w -= $page; 1656 $w -= $page;
… …
1457 1686
1458sub new { 1687sub new {
1459 my $class = shift; 1688 my $class = shift;
1460 1689
1461 my $self = $class->SUPER::new ( 1690 my $self = $class->SUPER::new (
1691 req_w => $::WIDTH / 6,
1692 req_h => $::HEIGHT / 6,
1693 fontsize => $::FONTSIZE,
1694 @_,
1695
1696 layout => (new CFClient::Layout),
1462 par => [], 1697 par => [],
1463 @_, 1698 height => 0,
1464 children => [ 1699 children => [
1465 (new CFClient::UI::Empty expand => 1), 1700 (new CFClient::UI::Empty expand => 1),
1466 (new CFClient::UI::Slider vertical => 1), 1701 (new CFClient::UI::Slider vertical => 1),
1467 ], 1702 ],
1468 ); 1703 );
1469 1704
1705 $self->{children}[1]->connect (changed => sub {
1706 $self->update;
1707 });
1708
1470 $self 1709 $self
1710}
1711
1712sub set_fontsize {
1713 my ($self, $fontsize) = @_;
1714
1715 $self->{fontsize} = $fontsize;
1716 $self->reflow;
1717}
1718
1719sub text_height {
1720 my ($self, $text) = @_;
1721
1722 my $layout = $self->{layout};
1723
1724 $layout->set_height ($self->{fontsize});
1725 $layout->set_width ($self->{w});
1726 $layout->set_text ($text);
1727
1728 ($layout->size)[1]
1729}
1730
1731sub reflow {
1732 my ($self) = @_;
1733
1734 $self->{need_reflow}++;
1735 $self->update;
1736}
1737
1738sub size_request {
1739 my ($self) = @_;
1740
1741 ($self->{req_w}, $self->{req_h})
1742}
1743
1744sub size_allocate {
1745 my ($self, $x, $y, $w, $h) = @_;
1746
1747 $self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1748
1749 $self->{layout}->set_height ($self->{fontsize});
1750 $self->{layout}->set_width ($self->{w});
1751
1752 $self->reflow;
1753 $self->update;
1471} 1754}
1472 1755
1473sub add_paragraph { 1756sub add_paragraph {
1474 my ($self, $color, $text) = @_; 1757 my ($self, $color, $text) = @_;
1475 1758
1759 #TODO: intelligently "reformat" paragraph
1760
1761 my $height = $self->text_height ($text);
1762
1763 $self->{height} += $height;
1764
1476 push @{$self->{par}}, [$color, $text]; 1765 push @{$self->{par}}, [$height, $color, $text];
1477 my $count = scalar @{$self->{par}}; 1766
1478 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 1767 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1479 $self->{children}[1]->update; 1768 $self->{children}[1]->update;
1480} 1769}
1481 1770
1771sub update {
1772 my ($self) = @_;
1773
1774 $self->SUPER::update;
1775
1776 return unless $self->{h} > 0;
1777
1778 delete $self->{texture};
1779
1780 $ROOT->on_refresh ($self, sub {
1781 if (delete $self->{need_reflow}) {
1782 my $height = 0;
1783
1784 $height += $_->[0] = $self->text_height ($_->[2])
1785 for @{$self->{par}};
1786
1787 $self->{height} = $height;
1788
1789 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1790
1791 delete $self->{texture};
1792 }
1793
1794 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1795 glClearColor 0, 0, 0, 1;
1796 glClear GL_COLOR_BUFFER_BIT;
1797
1798 glEnable GL_BLEND;
1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802
1803 my $top = int $self->{children}[1]{range}[0];
1804
1805 my $y0 = $top;
1806 my $y1 = $top + $self->{h};
1807
1808 my $y = 0;
1809
1810 my $layout = $self->{layout};
1811
1812 for my $par (@{$self->{par}}) {
1813 my $h = $par->[0];
1814
1815 if ($y0 < $y + $h && $y < $y1) {
1816 $layout->set_text ($par->[2]);
1817
1818 glColor @{ $par->[1] };
1819 my ($W, $H) = $layout->size;
1820 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1821 }
1822
1823 $y += $h;
1824 }
1825
1826 glDisable GL_TEXTURE_2D;
1827 glDisable GL_BLEND;
1828 };
1829 });
1830}
1831
1482sub _draw { 1832sub _draw {
1483 my ($self) = @_; 1833 my ($self) = @_;
1484 1834
1485 my $par = $self->{par}; 1835 if ($self->{texture}) {
1486
1487 my $bottom = (scalar @$par) - 1;
1488
1489 my $w = $self->{children}[0]{w};
1490 my $y = $self->{h};
1491
1492 glEnable GL_BLEND;
1493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1494 glEnable GL_TEXTURE_2D; 1836 glEnable GL_TEXTURE_2D;
1495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1496 1838 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1497 # TODO: everything!
1498 while ($y > 0 && $bottom >= 0) {
1499 my $par = $par->[$bottom--];
1500
1501 my $layout = new CFClient::Layout;
1502
1503 $layout->set_height ($::FONTSIZE);
1504 $layout->set_width ($w);
1505 $layout->set_text ($par->[1]);
1506 my $tex = new_from_layout CFClient::Texture $layout;
1507 $y -= $tex->{h};
1508
1509 glColor @{ $par->[0] };
1510 $tex->draw_quad (0, $y);
1511 }
1512
1513 glDisable GL_TEXTURE_2D; 1839 glDisable GL_TEXTURE_2D;
1514 glDisable GL_BLEND; 1840 }
1841
1842 $self->{children}[1]->draw;
1843
1515} 1844}
1516 1845
1517############################################################################# 1846#############################################################################
1518 1847
1519package CFClient::UI::MapWidget; 1848package CFClient::UI::MapWidget;
… …
1543} 1872}
1544 1873
1545sub key_up { 1874sub key_up {
1546} 1875}
1547 1876
1877sub button_down {
1878 my ($self, $ev, $x, $y) = @_;
1879
1880 $self->focus_in;
1881
1882 if ($ev->button == 2) {
1883 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1884 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1885
1886 $self->{motion} = sub {
1887 my ($ev, $x, $y) = @_;
1888
1889 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1890
1891 $::CFG->{map_shift_x} = $bw + $x - $ox;
1892 $::CFG->{map_shift_y} = $bh + $y - $oy;
1893
1894 $self->update;
1895 };
1896 }
1897}
1898
1899sub button_up {
1900 my ($self, $ev, $x, $y) = @_;
1901
1902 delete $self->{motion};
1903}
1904
1905sub mouse_motion {
1906 my ($self, $ev, $x, $y) = @_;
1907
1908 $self->{motion}->($ev, $x, $y) if $self->{motion};
1909}
1910
1548sub size_request { 1911sub size_request {
1549 ( 1912 (
1550 1 + 32 * int $::WIDTH / 32, 1913 1 + 32 * int $::WIDTH / 32,
1551 1 + 32 * int $::HEIGHT / 32, 1914 1 + 32 * int $::HEIGHT / 32,
1552 ) 1915 )
… …
1560} 1923}
1561 1924
1562sub draw { 1925sub draw {
1563 my ($self) = @_; 1926 my ($self) = @_;
1564 1927
1565 $self->{need_update}++;#d#
1566 if (delete $self->{need_update}) { 1928 if (delete $self->{need_update}) {
1567 glNewList $self->{list}, GL_COMPILE; 1929 glNewList $self->{list}, GL_COMPILE;
1568 1930
1569 my $sw = int $::WIDTH / 32;
1570 my $sh = int $::HEIGHT / 32;
1571
1572 if ($::MAP) { 1931 if ($::MAP) {
1932 my $sw = int $::WIDTH / 32;
1933 my $sh = int $::HEIGHT / 32;
1934
1935 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1936 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1937
1938 glTranslate $sx0 - 32, $sy0 - 32, 0;
1939
1573 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); 1940 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1574 1941
1575 if ($::CFG->{fow_enable}) { 1942 if ($::CFG->{fow_enable}) {
1576 if ($::CFG->{fow_smooth}) { # smooth fog of war 1943 if ($::CFG->{fow_smooth}) { # smooth fog of war
1577 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1944 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1578 glConvolutionFilter2D 1945 glConvolutionFilter2D
… …
1586 0.1, 0.1, 0.1, 1953 0.1, 0.1, 0.1,
1587 ; 1954 ;
1588 glEnable GL_CONVOLUTION_2D; 1955 glEnable GL_CONVOLUTION_2D;
1589 } 1956 }
1590 1957
1591 my $tex = new CFClient::Texture 1958 $self->{fow_texture} = new CFClient::Texture
1592 w => $w, 1959 w => $w,
1593 h => $h, 1960 h => $h,
1594 data => $data, 1961 data => $data,
1595 internalformat => GL_ALPHA, 1962 internalformat => GL_ALPHA,
1596 format => GL_ALPHA; 1963 format => GL_ALPHA;
1597 1964
1598 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 1965 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1599 1966
1600 glEnable GL_BLEND; 1967 glEnable GL_BLEND;
1968 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 1969 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1603 1971
1604 glColor +($::CFG->{fow_intensity}) x 3, 1; 1972 glColor +($::CFG->{fow_intensity}) x 3, 1;
1605 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1973 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1606 1974
1607 glDisable GL_TEXTURE_2D; 1975 glDisable GL_TEXTURE_2D;
1608 glDisable GL_BLEND; 1976 glDisable GL_BLEND;
1609 } 1977 }
1978
1979 # HACK BEGIN
1980 {
1981 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1982 my ($w, $h) = (250, 250);
1983
1984 glEnable GL_BLEND;
1985 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1986 glEnable GL_TEXTURE_2D;
1987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1988
1989 $self->{mapmap_texture} =
1990 new CFClient::Texture
1991 w => $w,
1992 h => $h,
1993 data => $::MAP->mapmap ($w, $h),
1994 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1995
1996 $self->{mapmap_texture}->draw_quad (100, 100);
1997
1998 glDisable GL_TEXTURE_2D;
1999 glDisable GL_BLEND;
2000 }
2001 # HACK END
1610 } 2002 }
1611 2003
1612 glEndList; 2004 glEndList;
1613 } 2005 }
1614 2006
2007 glPushMatrix;
1615 glCallList $self->{list}; 2008 glCallList $self->{list};
2009 glPopMatrix;
1616 2010
1617 if ($FOCUS != $self) { 2011 if ($FOCUS != $self) {
1618 glColor 64/255, 64/255, 64/255; 2012 glColor 64/255, 64/255, 64/255;
1619 glLogicOp GL_AND; 2013 glLogicOp GL_AND;
1620 glEnable GL_COLOR_LOGIC_OP; 2014 glEnable GL_COLOR_LOGIC_OP;
… …
1649 2043
1650 my $mod = $ev->key_mod; 2044 my $mod = $ev->key_mod;
1651 my $sym = $ev->key_sym; 2045 my $sym = $ev->key_sym;
1652 2046
1653 if ($sym == SDLK_KP5) { 2047 if ($sym == SDLK_KP5) {
1654 $::CONN->user_send ("command stay fire"); 2048 $::CONN->user_send ("stay fire");
1655 } elsif ($sym == SDLK_a) { 2049 } elsif ($sym == SDLK_a) {
1656 $::CONN->user_send ("command apply"); 2050 $::CONN->user_send ("apply");
1657 } elsif ($sym == SDLK_QUOTE) { 2051 } elsif ($sym == SDLK_QUOTE) {
1658 $self->emit ('activate_console'); 2052 $self->emit ('activate_console');
2053 } elsif ($sym == SDLK_SLASH) {
2054 $self->emit ('activate_console' => '/');
1659 } elsif (exists $DIR{$sym}) { 2055 } elsif (exists $DIR{$sym}) {
1660 if ($mod & KMOD_SHIFT) { 2056 if ($mod & KMOD_SHIFT) {
1661 $self->{shft}++; 2057 $self->{shft}++;
1662 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 2058 $::CONN->user_send ("fire $DIR{$sym}[0]");
1663 } elsif ($mod & KMOD_CTRL) { 2059 } elsif ($mod & KMOD_CTRL) {
1664 $self->{ctrl}++; 2060 $self->{ctrl}++;
1665 $::CONN->user_send ("command run $DIR{$sym}[0]"); 2061 $::CONN->user_send ("run $DIR{$sym}[0]");
1666 } else { 2062 } else {
1667 $::CONN->user_send ("command $DIR{$sym}[1]"); 2063 $::CONN->user_send ("$DIR{$sym}[1]");
1668 } 2064 }
1669 } 2065 }
1670} 2066}
1671 2067
1672sub key_up { 2068sub key_up {
… …
1674 2070
1675 my $mod = $ev->key_mod; 2071 my $mod = $ev->key_mod;
1676 my $sym = $ev->key_sym; 2072 my $sym = $ev->key_sym;
1677 2073
1678 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2074 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1679 $::CONN->user_send ("command fire_stop"); 2075 $::CONN->user_send ("fire_stop");
1680 } 2076 }
1681 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2077 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1682 $::CONN->user_send ("command run_stop"); 2078 $::CONN->user_send ("run_stop");
1683 } 2079 }
1684} 2080}
1685 2081
1686############################################################################# 2082#############################################################################
1687 2083
… …
1751sub toggle_flopper { 2147sub toggle_flopper {
1752 my ($self) = @_; 2148 my ($self) = @_;
1753 2149
1754 # TODO: use animation 2150 # TODO: use animation
1755 if ($self->{state} = !$self->{state}) { 2151 if ($self->{state} = !$self->{state}) {
1756 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2152 $CFClient::UI::ROOT->add ($self->{other});
1757 $self->{other}->move ( 2153 $self->{other}->move ($self->coord2global (0, $self->{h}));
1758 ($::WIDTH - $self->{other}{w}) * 0.5, 2154 $self->emit ("open");
1759 ($::HEIGHT - $self->{other}{h}) * 0.5,
1760 );
1761 } else { 2155 } else {
1762 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2156 $CFClient::UI::ROOT->remove ($self->{other});
2157 $self->emit ("close");
1763 } 2158 }
1764}
1765 2159
1766############################################################################# 2160 $self->emit (changed => $self->{state});
2161}
1767 2162
2163#############################################################################
2164
1768package CFClient::UI::Toplevel; 2165package CFClient::UI::Root;
1769 2166
1770our @ISA = CFClient::UI::Container::; 2167our @ISA = CFClient::UI::Container::;
2168
2169use SDL::OpenGL;
2170
2171sub check_size {
2172 my ($self) = @_;
2173
2174 $self->size_allocate (0, 0, $::WITH, $::HEIGHT);
2175}
1771 2176
1772sub size_request { 2177sub size_request {
1773 ($::WIDTH, $::HEIGHT) 2178 ($::WIDTH, $::HEIGHT)
1774} 2179}
1775 2180
… …
1780 2185
1781 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2186 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1782 for @{$self->{children}}; 2187 for @{$self->{children}};
1783} 2188}
1784 2189
1785sub translate { 2190sub _topleft {
1786 my ($self, $x, $y) = @_; 2191 my ($self, $x, $y) = @_;
1787 2192
1788 ($x, $y) 2193 ($x, $y)
1789} 2194}
1790 2195
1791sub update { 2196sub update {
1792 my ($self) = @_; 2197 my ($self) = @_;
1793 2198
1794 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2199 $self->check_size;
1795 ::refresh (); 2200 ::refresh ();
1796} 2201}
1797 2202
1798sub add { 2203sub add {
1799 my ($self, $widget) = @_; 2204 my ($self, $widget) = @_;
1800 2205
1801 $self->SUPER::add ($widget); 2206 $self->SUPER::add ($widget);
1802 2207
1803 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2208 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2209}
2210
2211sub on_refresh {
2212 my ($self, $id, $cb) = @_;
2213
2214 $self->{refresh_hook}{$id} = $cb;
1804} 2215}
1805 2216
1806sub draw { 2217sub draw {
1807 my ($self) = @_; 2218 my ($self) = @_;
1808 2219
2220 while (my $rcb = delete $self->{refresh_hook}) {
2221 $_->() for values %$rcb;
2222 }
2223
2224 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2225 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2226 glClear GL_COLOR_BUFFER_BIT;
2227
2228 glMatrixMode GL_PROJECTION;
2229 glLoadIdentity;
2230 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2231 glMatrixMode GL_MODELVIEW;
2232 glLoadIdentity;
2233
1809 $self->_draw; 2234 $self->_draw;
1810} 2235}
1811 2236
1812############################################################################# 2237#############################################################################
1813 2238
1814package CFClient::UI; 2239package CFClient::UI;
1815 2240
1816$TOPLEVEL = new CFClient::UI::Toplevel; 2241$ROOT = new CFClient::UI::Root;
1817 2242
18181 22431
1819 2244

Diff Legend

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