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.107 by root, Fri Apr 14 20:27:35 2006 UTC vs.
Revision 1.130 by root, Tue Apr 18 01:51:06 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 && $hover->{can_hover}; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_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) = @_;
117
104 $self->{x} = $x; 118 $self->{x} = int $x;
105 $self->{y} = $y; 119 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 120 $self->{z} = $z if defined $z;
121
122 $self->update;
107} 123}
108 124
109sub needs_redraw { 125sub needs_redraw {
110 0 126 0
111} 127}
… …
113sub size_request { 129sub size_request {
114 require Carp; 130 require Carp;
115 Carp::confess "size_request is abtract"; 131 Carp::confess "size_request is abtract";
116} 132}
117 133
118sub _size_allocate { 134sub configure {
119 my ($self, $x, $y, $w, $h) = @_; 135 my ($self, $x, $y, $w, $h) = @_;
120 136
121 $self->{x} = $x; 137 $self->{x} = $x;
122 $self->{y} = $y; 138 $self->{y} = $y;
123 139
124 return unless $self->{w} != $w || $self->{h} != $h; 140 return unless $self->{w} != $w || $self->{h} != $h;
125 141
126 $self->{w} = $w; 142 $self->{w} = $w;
127 $self->{h} = $h; 143 $self->{h} = $h;
128 144
129 1 145 $self->size_allocate ($w, $h);
130} 146}
131 147
132sub size_allocate { 148sub size_allocate {
149 # nothing to be done
150}
151
152# return top left coordinates
153sub _topleft {
133 my ($self, $x, $y, $w, $h) = @_; 154 my ($self, $x, $y) = @_;
134 155
135 $self->_size_allocate ($x, $y, $w, $h); 156 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
136} 157}
137 158
138# translate global coordinates to local coordinate system 159# translate global coordinates to local coordinate system
139sub translate { 160sub coord2local {
140 my ($self, $x, $y) = @_; 161 my ($self, $x, $y) = @_;
141 162
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 163 my ($X, $Y) = $self->_topleft;
164 ($x - $X, $y - $Y)
165}
166
167# translate local coordinates to global coordinate system
168sub coord2global {
169 my ($self, $x, $y) = @_;
170
171 my ($X, $Y) = $self->_topleft;
172 ($x + $X, $y + $Y)
143} 173}
144 174
145sub focus_in { 175sub focus_in {
146 my ($self) = @_; 176 my ($self) = @_;
147 177
148 return if $FOCUS == $self; 178 return if $FOCUS == $self;
149 return unless $self->{can_focus}; 179 return unless $self->{can_focus};
150 180
151 my $focus = $FOCUS; $FOCUS = $self; 181 my $focus = $FOCUS; $FOCUS = $self;
182
183 $self->emit (focus_in => $focus);
184
152 $focus->update if $focus; 185 $focus->update if $focus;
153 $FOCUS->update; 186 $FOCUS->update;
154} 187}
155 188
156sub focus_out { 189sub focus_out {
157 my ($self) = @_; 190 my ($self) = @_;
158 191
159 return unless $FOCUS == $self; 192 return unless $FOCUS == $self;
160 193
161 my $focus = $FOCUS; undef $FOCUS; 194 my $focus = $FOCUS; undef $FOCUS;
195
196 $self->emit (focus_out => $focus);
197
162 $focus->update if $focus; #? 198 $focus->update if $focus; #?
163} 199}
164 200
165sub mouse_motion { } 201sub mouse_motion { }
166sub button_up { } 202sub button_up { }
… …
190 glPopMatrix; 226 glPopMatrix;
191 227
192 if ($self == $HOVER && $self->{can_hover}) { 228 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)}; 229 my ($x, $y) = @$self{qw(x y)};
194 230
195 glColor 0, 0, 1, 0.2; 231 glColor 1, 0.8, 0.5, 0.2;
196 glEnable GL_BLEND; 232 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 233 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198 glBegin GL_QUADS; 234 glBegin GL_QUADS;
199 glVertex $x , $y; 235 glVertex $x , $y;
200 glVertex $x + $self->{w}, $y; 236 glVertex $x + $self->{w}, $y;
… …
220 256
221 () 257 ()
222} 258}
223 259
224sub set_parent { 260sub set_parent {
225 my ($self, $par) = @_; 261 my ($self, $parent) = @_;
226 262
227 $self->{parent} = $par;
228 Scalar::Util::weaken $self->{parent}; 263 Scalar::Util::weaken ($self->{parent} = $parent);
229} 264}
230 265
231sub get_parent { 266sub check_size {
232 $_[0]->{parent} 267 my ($self) = @_;
268
269 my ($w, $h) = $self->size_request;
270
271 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w;
273 $self->{req_h} = $h;
274
275 $self->{parent}->check_size
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 }
233} 281}
234 282
235sub update { 283sub update {
236 my ($self) = @_; 284 my ($self) = @_;
237 285
… …
326 374
327 $self 375 $self
328} 376}
329 377
330sub add { 378sub add {
331 my ($self, $chld) = @_; 379 my ($self, $child) = @_;
332 380
333 $chld->set_parent ($self); 381 $child->set_parent ($self);
382
383 use sort 'stable';
334 384
335 $self->{children} = [ 385 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 386 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 387 @{$self->{children}}, $child
338 ]; 388 ];
339 389
340 $self->{w} = $self->{h} = -1; 390 $self->{w} = $self->{h} = -1;
341 $self->update; 391
392 $child->check_size;
342} 393}
343 394
344sub remove { 395sub remove {
345 my ($self, $widget) = @_; 396 my ($self, $widget) = @_;
346 397
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 398 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348 399
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 400 $self->check_size;
350} 401}
351 402
352sub find_widget { 403sub find_widget {
353 my ($self, $x, $y) = @_; 404 my ($self, $x, $y) = @_;
354 405
… …
407sub size_request { 458sub size_request {
408 $_[0]{children}[0]->size_request 459 $_[0]{children}[0]->size_request
409} 460}
410 461
411sub size_allocate { 462sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_; 463 my ($self, $w, $h) = @_;
413 464
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h); 465 $self->{children}[0]->configure (0, 0, $w, $h);
417} 466}
418 467
419############################################################################# 468#############################################################################
420 469
421package CFClient::UI::Window; 470package CFClient::UI::Window;
… …
447 $self->child->draw; 496 $self->child->draw;
448 }; 497 };
449} 498}
450 499
451sub size_allocate { 500sub size_allocate {
452 my ($self, $x, $y, $w, $h) = @_; 501 my ($self, $w, $h) = @_;
453 502
454 $self->_size_allocate ($x, $y, $w, $h) or return;
455
456 $self->child->size_allocate (0, 0, $w, $h); 503 $self->child->configure (0, 0, $w, $h);
457 504
458 $self->render_chld; 505 $self->render_chld;
459} 506}
460 507
461sub _draw { 508sub _draw {
… …
477 glDisable GL_TEXTURE_2D; 524 glDisable GL_TEXTURE_2D;
478} 525}
479 526
480############################################################################# 527#############################################################################
481 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 _draw {
545 my ($self) = @_;
546
547 $self->{children}[1]->draw;
548}
549
550
551#############################################################################
552
482package CFClient::UI::Frame; 553package CFClient::UI::Frame;
483 554
484our @ISA = CFClient::UI::Bin::; 555our @ISA = CFClient::UI::Bin::;
485 556
486use SDL::OpenGL; 557use SDL::OpenGL;
… …
496} 567}
497 568
498sub size_allocate { 569sub size_allocate {
499 my ($self, $x, $y, $w, $h) = @_; 570 my ($self, $x, $y, $w, $h) = @_;
500 571
501 $self->_size_allocate ($x, $y, $w, $h) or return;
502
503 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 572 $self->child->configure (2, 2, $w - 4, $h - 4);
504} 573}
505 574
506sub _draw { 575sub _draw {
507 my ($self) = @_; 576 my ($self) = @_;
508 577
… …
539 # TODO: user_x, user_y, overwrite moveto? 608 # TODO: user_x, user_y, overwrite moveto?
540 609
541 $class->SUPER::new ( 610 $class->SUPER::new (
542 bg => [1, 1, 1, 1], 611 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1], 612 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8, 613 border => int $::FONTSIZE * 0.8,
545 @_ 614 @_
546 ) 615 )
547} 616}
548 617
549sub size_request { 618sub size_request {
… …
558 $h + $self->{border} * 2, 627 $h + $self->{border} * 2,
559 ) 628 )
560} 629}
561 630
562sub size_allocate { 631sub size_allocate {
563 my ($self, $x, $y, $w, $h) = @_; 632 my ($self, $w, $h) = @_;
564
565 $self->_size_allocate ($x, $y, $w, $h) or return;
566 633
567 $h -= List::Util::max 0, $self->{border} * 2; 634 $h -= List::Util::max 0, $self->{border} * 2;
568 $w -= List::Util::max 0, $self->{border} * 2; 635 $w -= List::Util::max 0, $self->{border} * 2;
569 636
570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 637 $self->child->configure ($self->{border}, $self->{border}, $w, $h);
571} 638}
572 639
573sub button_down { 640sub button_down {
574 my ($self, $ev, $x, $y) = @_; 641 my ($self, $ev, $x, $y) = @_;
575 642
… …
584 651
585 ($x, $y) = ($ev->motion_x, $ev->motion_y); 652 ($x, $y) = ($ev->motion_x, $ev->motion_y);
586 653
587 $self->{user_w} = $bw + $x - $ox; 654 $self->{user_w} = $bw + $x - $ox;
588 $self->{user_h} = $bh + $y - $oy; 655 $self->{user_h} = $bh + $y - $oy;
589 $self->update; 656 $self->check_size;
590 }; 657 };
591 658
592 } elsif ($x >= 0 && $x < $self->{w} 659 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $self->{border}) { 660 && $y >= 0 && $y < $self->{border}) {
594 661
… …
672 @_ 739 @_
673 ) 740 )
674} 741}
675 742
676sub add { 743sub add {
677 my ($self, $x, $y, $chld) = @_; 744 my ($self, $x, $y, $child) = @_;
678 745
746 $child->set_parent ($self);
679 $self->{children}[$y][$x] = $chld; 747 $self->{children}[$y][$x] = $child;
680 $chld->set_parent ($self);
681 748
682 $self->{w} = $self->{h} = -1; 749 $self->{w} = $self->{h} = -1;
750
751 $child->check_size;
752}
753
754# TODO: move to container class maybe? send childs a signal on removal?
755sub clear {
756 my ($self) = @_;
757
758 delete $self->{children};
683 $self->update; 759 $self->update;
684} 760}
685 761
686sub get_wh { 762sub get_wh {
687 my ($self) = @_; 763 my ($self) = @_;
… …
715 (sum @$hs), 791 (sum @$hs),
716 ) 792 )
717} 793}
718 794
719sub size_allocate { 795sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723 797
724 my ($ws, $hs) = $self->get_wh; 798 my ($ws, $hs) = $self->get_wh;
725 799
726 my $req_w = sum @$ws; 800 my $req_w = sum @$ws;
727 my $req_h = sum @$hs; 801 my $req_h = sum @$hs;
… …
733 807
734 # linearly scale sizes 808 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 809 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 810 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737 811
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems 812 CFClient::UI::harmonize $ws;
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems 813 CFClient::UI::harmonize $hs;
740 814
741 my $y; 815 my $y;
742 816
743 for my $r (0 .. $#{$self->{children}}) { 817 for my $r (0 .. $#{$self->{children}}) {
744 my $row = $self->{children}[$r] 818 my $row = $self->{children}[$r]
… …
749 823
750 for my $c (0 .. $#$row) { 824 for my $c (0 .. $#$row) {
751 my $col_w = $ws->[$c]; 825 my $col_w = $ws->[$c];
752 826
753 if (my $widget = $row->[$c]) { 827 if (my $widget = $row->[$c]) {
754 $widget->size_allocate ($x, $y, $col_w, $row_h); 828 $widget->configure ($x, $y, $col_w, $row_h);
755 } 829 }
756 830
757 $x += $col_w; 831 $x += $col_w;
758 } 832 }
759 833
… …
804 (List::Util::max map $_->[1], @alloc), 878 (List::Util::max map $_->[1], @alloc),
805 ) 879 )
806} 880}
807 881
808sub size_allocate { 882sub size_allocate {
809 my ($self, $x, $y, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
810
811 $self->_size_allocate ($x, $y, $w, $h);
812 884
813 ($h, $w) = ($w, $h); 885 ($h, $w) = ($w, $h);
814 886
815 my $children = $self->{children}; 887 my $children = $self->{children};
816 888
… …
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 904 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h; 905 $h[$_] = $alloc_h;
834 } 906 }
835 } 907 }
836 908
909 CFClient::UI::harmonize \@h;
910
837 my $y = 0; 911 my $y = 0;
838 for (0 .. $#$children) { 912 for (0 .. $#$children) {
839 my $child = $children->[$_]; 913 my $child = $children->[$_];
840 my $h = int $h[$_]; 914 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w); 915 $child->configure ($y, 0, $h, $w);
842 916
843 $y += $h; 917 $y += $h;
844 } 918 }
919
920 1
845} 921}
846 922
847############################################################################# 923#############################################################################
848 924
849package CFClient::UI::VBox; 925package CFClient::UI::VBox;
… …
862 (List::Util::sum map $_->[1], @alloc), 938 (List::Util::sum map $_->[1], @alloc),
863 ) 939 )
864} 940}
865 941
866sub size_allocate { 942sub size_allocate {
867 my ($self, $x, $y, $w, $h) = @_; 943 my ($self, $w, $h) = @_;
868
869 $self->_size_allocate ($x, $y, $w, $h);
870 944
871 my $children = $self->{children}; 945 my $children = $self->{children};
872 946
873 my @h = map +($_->size_request)[1], @$children; 947 my @h = map +($_->size_request)[1], @$children;
874 948
… …
886 960
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 961 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888 } 962 }
889 } 963 }
890 964
965 CFClient::UI::harmonize \@h;
966
891 my $y = 0; 967 my $y = 0;
892 for (0 .. $#$children) { 968 for (0 .. $#$children) {
893 my $child = $children->[$_]; 969 my $child = $children->[$_];
894 my $h = int $h[$_]; 970 my $h = $h[$_];
895 $child->size_allocate (0, $y, $w, $h); 971 $child->configure (0, $y, $w, $h);
896 972
897 $y += $h; 973 $y += $h;
898 } 974 }
975
976 1
899} 977}
900 978
901############################################################################# 979#############################################################################
902 980
903package CFClient::UI::Label; 981package CFClient::UI::Label;
… …
912 my $self = $class->SUPER::new ( 990 my $self = $class->SUPER::new (
913 fg => [1, 1, 1], 991 fg => [1, 1, 1],
914 fontsize => $::FONTSIZE, 992 fontsize => $::FONTSIZE,
915 text => "", 993 text => "",
916 align => -1, 994 align => -1,
995 valign => -1,
917 padding => 2, 996 padding => 2,
918 layout => new CFClient::Layout, 997 layout => new CFClient::Layout,
919 %arg 998 %arg
920 ); 999 );
921 1000
922 $self->set_text ($self->{text}); 1001 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1002
1003 $self->set_text (delete $self->{text}) if exists $self->{text};
1004 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
923 1005
924 $self 1006 $self
925} 1007}
926 1008
927sub escape_text { 1009sub escape_text {
… …
935} 1017}
936 1018
937sub set_text { 1019sub set_text {
938 my ($self, $text) = @_; 1020 my ($self, $text) = @_;
939 1021
940 $self->{text} = $text;
941 $self->{layout}->set_markup ($text); 1022 $self->{layout}->set_text ($text);
942 1023
943 delete $self->{texture}; 1024 delete $self->{texture};
944# $self->{w} = $self->{h} = -1;
945 $self->update; 1025 $self->update;
946} 1026}
947 1027
948sub get_text { 1028sub set_markup {
949 my ($self, $text) = @_; 1029 my ($self, $markup) = @_;
950 1030
951 $self->{text} 1031 $self->{layout}->set_markup ($markup);
1032
1033 delete $self->{texture};
1034 $self->update;
952} 1035}
953 1036
954sub size_request { 1037sub size_request {
955 my ($self) = @_; 1038 my ($self) = @_;
956 1039
957 $self->{layout}->set_width; 1040 $self->{layout}->set_width;
958 $self->{layout}->set_height ($self->{fontsize}); 1041 $self->{layout}->set_height ($self->{fontsize});
1042
959 my ($w, $h) = $self->{layout}->size; 1043 my ($w, $h) = $self->{layout}->size;
960 1044
961 ( 1045 (
962 $w + $self->{padding} * 2, 1046 $w + $self->{padding} * 2,
963 $h + $self->{padding} * 2, 1047 $h + $self->{padding} * 2,
964 ) 1048 )
965} 1049}
966 1050
967sub size_allocate { 1051sub size_allocate {
968 my ($self, $x, $y, $w, $h) = @_; 1052 my ($self, $w, $h) = @_;
969
970 $self->_size_allocate ($x, $y, $w, $h) or return;
971 1053
972 delete $self->{texture}; 1054 delete $self->{texture};
973} 1055}
974 1056
975sub update { 1057sub update {
… …
982sub _draw { 1064sub _draw {
983 my ($self) = @_; 1065 my ($self) = @_;
984 1066
985 my $tex = $self->{texture} ||= do { 1067 my $tex = $self->{texture} ||= do {
986 $self->{layout}->set_width ($self->{w}); 1068 $self->{layout}->set_width ($self->{w});
987 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); 1069 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
988 new_from_layout CFClient::Texture $self->{layout} 1070 new_from_layout CFClient::Texture $self->{layout}
989 }; 1071 };
990 1072
991 glEnable GL_BLEND; 1073 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1074 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
993 glEnable GL_TEXTURE_2D; 1075 glEnable GL_TEXTURE_2D;
994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1076 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
995 1077
996 glColor @{$self->{fg}}; 1078 glColor @{$self->{fg}};
997 1079
998 my $x = 1080 $self->{ox} = int (
999 $self->{align} < 0 ? $self->{padding} 1081 $self->{align} < 0 ? $self->{padding}
1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1082 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001 : ($self->{w} - $tex->{w}) * 0.5; 1083 : ($self->{w} - $tex->{w}) * 0.5
1084 );
1002 1085
1003 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); 1086 $self->{oy} = int (
1087 $self->{valign} < 0 ? $self->{padding}
1088 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1089 : ($self->{h} - $tex->{h}) * 0.5
1090 );
1091
1092 $tex->draw_quad ($self->{ox}, $self->{oy});
1004 1093
1005 glDisable GL_TEXTURE_2D; 1094 glDisable GL_TEXTURE_2D;
1006 glDisable GL_BLEND; 1095 glDisable GL_BLEND;
1007} 1096}
1008 1097
1009############################################################################# 1098#############################################################################
1010 1099
1011package CFClient::UI::Entry; 1100package CFClient::UI::EntryBase;
1012 1101
1013our @ISA = CFClient::UI::Label::; 1102our @ISA = CFClient::UI::Label::;
1014 1103
1015use SDL; 1104use SDL;
1016use SDL::OpenGL; 1105use SDL::OpenGL;
… …
1023 bg => [0, 0, 0, 0.2], 1112 bg => [0, 0, 0, 0.2],
1024 active_bg => [1, 1, 1, 0.5], 1113 active_bg => [1, 1, 1, 0.5],
1025 active_fg => [0, 0, 0], 1114 active_fg => [0, 0, 0],
1026 can_hover => 1, 1115 can_hover => 1,
1027 can_focus => 1, 1116 can_focus => 1,
1117 valign => 0,
1028 @_ 1118 @_
1029 ) 1119 )
1030} 1120}
1031 1121
1032sub _set_text { 1122sub _set_text {
1033 my ($self, $text) = @_; 1123 my ($self, $text) = @_;
1034 1124
1035 my $old_text = $self->{text}; 1125 delete $self->{cur_h};
1126
1127 return if $self->{text} eq $text;
1036 1128
1037 $self->{last_activity} = $::NOW; 1129 $self->{last_activity} = $::NOW;
1038
1039 $self->{text} = $text; 1130 $self->{text} = $text;
1040 $self->{layout}->set_width ($self->{w});
1041 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1042 1131
1043 $text =~ s/./*/g if $self->{hidden}; 1132 $text =~ s/./*/g if $self->{hidden};
1133 $self->{layout}->set_text ("$text ");
1044 1134
1045 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1135 $self->emit (changed => $self->{text});
1136}
1046 1137
1047 $text = substr $text, 0, $self->{cursor}; 1138sub get_text {
1048 utf8::encode $text; 1139 $_[0]{text}
1049
1050 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1051
1052 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1053 if $old_text ne $self->{text};
1054} 1140}
1055 1141
1056sub size_request { 1142sub size_request {
1057 my ($self) = @_; 1143 my ($self) = @_;
1058 1144
… …
1060 1146
1061 ($w + 1, $h) # add 1 for cursor 1147 ($w + 1, $h) # add 1 for cursor
1062} 1148}
1063 1149
1064sub size_allocate { 1150sub size_allocate {
1065 my ($self, $x, $y, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1066
1067 $self->SUPER::size_allocate ($x, $y, $w, $h);
1068 1152
1069 $self->_set_text ($self->{text}); 1153 $self->_set_text ($self->{text});
1070} 1154}
1071 1155
1072sub set_text { 1156sub set_text {
… …
1162 1246
1163 $self->SUPER::_draw; 1247 $self->SUPER::_draw;
1164 1248
1165 #TODO: force update every cursor change :( 1249 #TODO: force update every cursor change :(
1166 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1250 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1251
1252 unless (exists $self->{cur_h}) {
1253 my $text = substr $self->{text}, 0, $self->{cursor};
1254 utf8::encode $text;
1255
1256 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1257 }
1258
1167 glColor @{$self->{fg}}; 1259 glColor @{$self->{fg}};
1168 glBegin GL_LINES; 1260 glBegin GL_LINES;
1169 glVertex $self->{cur_x}, $self->{cur_y};
1170 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1261 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1262 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1171 glEnd; 1263 glEnd;
1172 } 1264 }
1173} 1265}
1174 1266
1175package CFClient::UI::LineEntry; 1267package CFClient::UI::Entry;
1176 1268
1177our @ISA = CFClient::UI::Entry::; 1269our @ISA = CFClient::UI::EntryBase::;
1178 1270
1179use SDL; 1271use SDL;
1180use SDL::OpenGL; 1272use SDL::OpenGL;
1181 1273
1182sub key_down { 1274sub key_down {
… …
1212 1304
1213 $class->SUPER::new ( 1305 $class->SUPER::new (
1214 padding => 4, 1306 padding => 4,
1215 fg => [1, 1, 1], 1307 fg => [1, 1, 1],
1216 bg => [1, 1, 1, 0.2], 1308 bg => [1, 1, 1, 0.2],
1217 active_fg => [1, 1, 0], 1309 active_fg => [0, 0, 1],
1218 can_hover => 1, 1310 can_hover => 1,
1311 align => 0,
1312 valign => 0,
1219 @_ 1313 @_
1220 ) 1314 )
1221} 1315}
1222 1316
1223sub button_up { 1317sub button_up {
… …
1231 1325
1232sub _draw { 1326sub _draw {
1233 my ($self) = @_; 1327 my ($self) = @_;
1234 1328
1235 local $self->{fg} = $self->{fg}; 1329 local $self->{fg} = $self->{fg};
1236 my $tex = $tex[0];
1237
1238 glEnable GL_BLEND;
1239 glEnable GL_TEXTURE_2D;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 1330
1242 if ($GRAB == $self) { 1331 if ($GRAB == $self) {
1243 $self->{fg} = $self->{active_fg}; 1332 $self->{fg} = $self->{active_fg};
1244 } 1333 }
1245 1334
1246 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1335 glEnable GL_BLEND;
1336 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1337 glEnable GL_TEXTURE_2D;
1247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1338 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1339 glColor 0, 0, 0, 1;
1248 1340
1249 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1341 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1250 1342
1251 glDisable GL_TEXTURE_2D; 1343 glDisable GL_TEXTURE_2D;
1252 glDisable GL_BLEND; 1344 glDisable GL_BLEND;
1253 1345
1254 $self->SUPER::_draw; 1346 $self->SUPER::_draw;
… …
1284 my ($self) = @_; 1376 my ($self) = @_;
1285 1377
1286 ($self->{padding} * 2 + 6) x 2 1378 ($self->{padding} * 2 + 6) x 2
1287} 1379}
1288 1380
1289sub size_allocate {
1290 my ($self, $x, $y, $w, $h) = @_;
1291
1292 $self->_size_allocate ($x, $y, $w, $h);
1293}
1294
1295sub button_down { 1381sub button_down {
1296 my ($self, $ev, $x, $y) = @_; 1382 my ($self, $ev, $x, $y) = @_;
1297 1383
1298 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1384 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1299 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1385 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1321 1407
1322 $tex->draw_quad (0, 0, $s, $s); 1408 $tex->draw_quad (0, 0, $s, $s);
1323 1409
1324 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1325 glDisable GL_BLEND; 1411 glDisable GL_BLEND;
1412}
1413
1414#############################################################################
1415
1416package CFClient::UI::VGauge;
1417
1418our @ISA = CFClient::UI::Base::;
1419
1420use SDL::OpenGL;
1421
1422my %tex = (
1423 food => [
1424 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1425 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1426 ],
1427 grace => [
1428 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1429 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1430 ],
1431 hp => [
1432 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1433 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1434 ],
1435 mana => [
1436 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1437 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1438 ],
1439);
1440
1441# eg. VGauge->new (gauge => 'food'), default gauge: food
1442sub new {
1443 my $class = shift;
1444
1445 my $self = $class->SUPER::new (gauge => 'food', @_);
1446
1447 $self
1448}
1449
1450sub size_request {
1451 my ($self) = @_;
1452
1453 my $tex = $tex{$self->{gauge}}[0];
1454
1455 @$tex{qw(w h)}
1456}
1457
1458sub set_max {
1459 my ($self, $max) = @_;
1460
1461 $self->{max_val} = $max;
1462}
1463
1464sub set_value {
1465 my ($self, $val, $max) = @_;
1466
1467 $self->set_max ($max)
1468 if defined $max;
1469
1470 $max = $self->{max_val};
1471 $self->{val} = $val;
1472
1473 $self->update;
1474}
1475
1476sub _draw {
1477 my ($self) = @_;
1478
1479 my $tex = $tex{$self->{gauge}};
1480
1481 my ($w, $h) = ($self->{w}, $self->{h});
1482
1483 my $ycut = $self->{val} / ($self->{max_val} || 1);
1484 $ycut = 1 if $self->{val} > $self->{max_val};
1485
1486 my $t1 = $tex->[0];
1487 my $t2 = $tex->[1];
1488
1489 glEnable GL_BLEND;
1490 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1491 glEnable GL_TEXTURE_2D;
1492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1493
1494 my $h1 = $self->{h} - $ycut * $self->{h};
1495 my $h2 = $ycut * $self->{h};
1496
1497 my $yp = 0;
1498
1499 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1500 glBegin (GL_QUADS);
1501 glTexCoord (0, 0); glVertex (0 , $yp);
1502 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1503 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1504 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1505 glEnd ();
1506
1507 $yp += $h1;
1508
1509 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1510 glBegin (GL_QUADS);
1511 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1512 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1513 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1514 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1515 glEnd ();
1516
1517 glDisable GL_BLEND;
1518 glDisable GL_TEXTURE_2D;
1326} 1519}
1327 1520
1328############################################################################# 1521#############################################################################
1329 1522
1330package CFClient::UI::Slider; 1523package CFClient::UI::Slider;
… …
1524 1717
1525 ($self->{req_w}, $self->{req_h}) 1718 ($self->{req_w}, $self->{req_h})
1526} 1719}
1527 1720
1528sub size_allocate { 1721sub size_allocate {
1529 my ($self, $x, $y, $w, $h) = @_; 1722 my ($self, $w, $h) = @_;
1530
1531 $self->SUPER::size_allocate ($x, $y, $w, $h);
1532 1723
1533 $self->{layout}->set_height ($self->{fontsize}); 1724 $self->{layout}->set_height ($self->{fontsize});
1534 $self->{layout}->set_width ($self->{w}); 1725 $self->{layout}->set_width ($self->{w});
1535 1726
1536 $self->reflow; 1727 $self->reflow;
1728 $self->update;
1537} 1729}
1538 1730
1539sub add_paragraph { 1731sub add_paragraph {
1540 my ($self, $color, $text) = @_; 1732 my ($self, $color, $text) = @_;
1541 1733
… …
1558 1750
1559 return unless $self->{h} > 0; 1751 return unless $self->{h} > 0;
1560 1752
1561 delete $self->{texture}; 1753 delete $self->{texture};
1562 1754
1563 $TOPLEVEL->on_refresh ($self, sub { 1755 $ROOT->on_refresh ($self, sub {
1564 if (delete $self->{need_reflow}) { 1756 if (delete $self->{need_reflow}) {
1565 my $height = 0; 1757 my $height = 0;
1566 1758
1567 $height += $_->[0] = $self->text_height ($_->[2]) 1759 $height += $_->[0] = $self->text_height ($_->[2])
1568 for @{$self->{par}}; 1760 for @{$self->{par}};
… …
1655} 1847}
1656 1848
1657sub key_up { 1849sub key_up {
1658} 1850}
1659 1851
1852sub button_down {
1853 my ($self, $ev, $x, $y) = @_;
1854
1855 $self->focus_in;
1856
1857 if ($ev->button == 2) {
1858 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1859 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1860
1861 $self->{motion} = sub {
1862 my ($ev, $x, $y) = @_;
1863
1864 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1865
1866 $::CFG->{map_shift_x} = $bw + $x - $ox;
1867 $::CFG->{map_shift_y} = $bh + $y - $oy;
1868
1869 $self->update;
1870 };
1871 }
1872}
1873
1874sub button_up {
1875 my ($self, $ev, $x, $y) = @_;
1876
1877 delete $self->{motion};
1878}
1879
1880sub mouse_motion {
1881 my ($self, $ev, $x, $y) = @_;
1882
1883 $self->{motion}->($ev, $x, $y) if $self->{motion};
1884}
1885
1660sub size_request { 1886sub size_request {
1661 ( 1887 (
1662 1 + 32 * int $::WIDTH / 32, 1888 1 + 32 * int $::WIDTH / 32,
1663 1 + 32 * int $::HEIGHT / 32, 1889 1 + 32 * int $::HEIGHT / 32,
1664 ) 1890 )
… …
1672} 1898}
1673 1899
1674sub draw { 1900sub draw {
1675 my ($self) = @_; 1901 my ($self) = @_;
1676 1902
1677 $self->{need_update}++;#d#
1678 if (delete $self->{need_update}) { 1903 if (delete $self->{need_update}) {
1679 glNewList $self->{list}, GL_COMPILE; 1904 glNewList $self->{list}, GL_COMPILE;
1680 1905
1681 my $sw = int $::WIDTH / 32;
1682 my $sh = int $::HEIGHT / 32;
1683
1684 if ($::MAP) { 1906 if ($::MAP) {
1907 my $sw = int $::WIDTH / 32;
1908 my $sh = int $::HEIGHT / 32;
1909
1910 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1911 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1912
1913 glTranslate $sx0 - 32, $sy0 - 32, 0;
1914
1685 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); 1915 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1686 1916
1687 if ($::CFG->{fow_enable}) { 1917 if ($::CFG->{fow_enable}) {
1688 if ($::CFG->{fow_smooth}) { # smooth fog of war 1918 if ($::CFG->{fow_smooth}) { # smooth fog of war
1689 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1919 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1690 glConvolutionFilter2D 1920 glConvolutionFilter2D (
1691 GL_CONVOLUTION_2D, 1921 GL_CONVOLUTION_2D,
1692 GL_ALPHA, 1922 GL_ALPHA,
1693 3, 3, 1923 3, 3,
1694 GL_ALPHA, GL_FLOAT, 1924 GL_ALPHA, GL_FLOAT,
1695 pack "f*", 1925 pack "f*",
1696 0.1, 0.1, 0.1, 1926 0.1, 0.1, 0.1,
1697 0.1, 0.2, 0.1, 1927 0.1, 0.2, 0.1,
1698 0.1, 0.1, 0.1, 1928 0.1, 0.1, 0.1,
1699 ; 1929 );
1700 glEnable GL_CONVOLUTION_2D; 1930 glEnable GL_CONVOLUTION_2D;
1701 } 1931 }
1702 1932
1703 my $tex = new CFClient::Texture 1933 $self->{fow_texture} = new CFClient::Texture
1704 w => $w, 1934 w => $w,
1705 h => $h, 1935 h => $h,
1706 data => $data, 1936 data => $data,
1707 internalformat => GL_ALPHA, 1937 internalformat => GL_ALPHA,
1708 format => GL_ALPHA; 1938 format => GL_ALPHA;
1709 1939
1710 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 1940 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1711 1941
1712 glEnable GL_BLEND; 1942 glEnable GL_BLEND;
1943 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1713 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1715 1946
1716 glColor +($::CFG->{fow_intensity}) x 3, 1; 1947 glColor +($::CFG->{fow_intensity}) x 3, 1;
1717 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1948 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1718 1949
1719 glDisable GL_TEXTURE_2D; 1950 glDisable GL_TEXTURE_2D;
1720 glDisable GL_BLEND; 1951 glDisable GL_BLEND;
1721 } 1952 }
1953
1954 # HACK BEGIN
1955 {
1956 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1957 my ($w, $h) = (250, 250);
1958
1959 glEnable GL_BLEND;
1960 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961 glEnable GL_TEXTURE_2D;
1962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963
1964 $self->{mapmap_texture} =
1965 new CFClient::Texture
1966 w => $w,
1967 h => $h,
1968 data => $::MAP->mapmap ($w, $h),
1969 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1970
1971 $self->{mapmap_texture}->draw_quad (100, 100);
1972
1973 glDisable GL_TEXTURE_2D;
1974 glDisable GL_BLEND;
1975 }
1976 # HACK END
1722 } 1977 }
1723 1978
1724 glEndList; 1979 glEndList;
1725 } 1980 }
1726 1981
1982 glPushMatrix;
1727 glCallList $self->{list}; 1983 glCallList $self->{list};
1984 glPopMatrix;
1728 1985
1729 if ($FOCUS != $self) { 1986 if ($FOCUS != $self) {
1730 glColor 64/255, 64/255, 64/255; 1987 glColor 64/255, 64/255, 64/255;
1731 glLogicOp GL_AND; 1988 glLogicOp GL_AND;
1732 glEnable GL_COLOR_LOGIC_OP; 1989 glEnable GL_COLOR_LOGIC_OP;
… …
1761 2018
1762 my $mod = $ev->key_mod; 2019 my $mod = $ev->key_mod;
1763 my $sym = $ev->key_sym; 2020 my $sym = $ev->key_sym;
1764 2021
1765 if ($sym == SDLK_KP5) { 2022 if ($sym == SDLK_KP5) {
1766 $::CONN->user_send ("command stay fire"); 2023 $::CONN->user_send ("stay fire");
1767 } elsif ($sym == SDLK_a) { 2024 } elsif ($sym == SDLK_a) {
1768 $::CONN->user_send ("command apply"); 2025 $::CONN->user_send ("apply");
1769 } elsif ($sym == SDLK_QUOTE) { 2026 } elsif ($sym == SDLK_QUOTE) {
1770 $self->emit ('activate_console'); 2027 $self->emit ('activate_console');
1771 } elsif ($sym == SDLK_SLASH) { 2028 } elsif ($sym == SDLK_SLASH) {
1772 $self->emit ('activate_console' => '/'); 2029 $self->emit ('activate_console' => '/');
1773 } elsif (exists $DIR{$sym}) { 2030 } elsif (exists $DIR{$sym}) {
1774 if ($mod & KMOD_SHIFT) { 2031 if ($mod & KMOD_SHIFT) {
1775 $self->{shft}++; 2032 $self->{shft}++;
1776 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 2033 $::CONN->user_send ("fire $DIR{$sym}[0]");
1777 } elsif ($mod & KMOD_CTRL) { 2034 } elsif ($mod & KMOD_CTRL) {
1778 $self->{ctrl}++; 2035 $self->{ctrl}++;
1779 $::CONN->user_send ("command run $DIR{$sym}[0]"); 2036 $::CONN->user_send ("run $DIR{$sym}[0]");
1780 } else { 2037 } else {
1781 $::CONN->user_send ("command $DIR{$sym}[1]"); 2038 $::CONN->user_send ("$DIR{$sym}[1]");
1782 } 2039 }
1783 } 2040 }
1784} 2041}
1785 2042
1786sub key_up { 2043sub key_up {
… …
1788 2045
1789 my $mod = $ev->key_mod; 2046 my $mod = $ev->key_mod;
1790 my $sym = $ev->key_sym; 2047 my $sym = $ev->key_sym;
1791 2048
1792 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2049 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1793 $::CONN->user_send ("command fire_stop"); 2050 $::CONN->user_send ("fire_stop");
1794 } 2051 }
1795 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2052 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1796 $::CONN->user_send ("command run_stop"); 2053 $::CONN->user_send ("run_stop");
1797 } 2054 }
1798} 2055}
1799 2056
1800############################################################################# 2057#############################################################################
1801 2058
… …
1865sub toggle_flopper { 2122sub toggle_flopper {
1866 my ($self) = @_; 2123 my ($self) = @_;
1867 2124
1868 # TODO: use animation 2125 # TODO: use animation
1869 if ($self->{state} = !$self->{state}) { 2126 if ($self->{state} = !$self->{state}) {
1870 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2127 $CFClient::UI::ROOT->add ($self->{other});
1871 $self->{other}->move ( 2128 $self->{other}->move ($self->coord2global (0, $self->{h}));
1872 ($::WIDTH - $self->{other}{w}) * 0.5, 2129 $self->emit ("open");
1873 ($::HEIGHT - $self->{other}{h}) * 0.5,
1874 );
1875 } else { 2130 } else {
1876 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2131 $CFClient::UI::ROOT->remove ($self->{other});
2132 $self->emit ("close");
1877 } 2133 }
1878}
1879 2134
1880############################################################################# 2135 $self->emit (changed => $self->{state});
2136}
1881 2137
2138#############################################################################
2139
1882package CFClient::UI::Toplevel; 2140package CFClient::UI::Root;
1883 2141
1884our @ISA = CFClient::UI::Container::; 2142our @ISA = CFClient::UI::Container::;
1885 2143
1886use SDL::OpenGL; 2144use SDL::OpenGL;
2145
2146sub check_size {
2147 my ($self) = @_;
2148
2149 $self->configure (0, 0, $::WITH, $::HEIGHT);
2150}
1887 2151
1888sub size_request { 2152sub size_request {
1889 ($::WIDTH, $::HEIGHT) 2153 ($::WIDTH, $::HEIGHT)
1890} 2154}
1891 2155
1892sub size_allocate { 2156sub configure {
1893 my ($self, $x, $y, $w, $h) = @_; 2157 my ($self, $x, $y, $w, $h) = @_;
1894 2158
1895 $self->_size_allocate ($x, $y, $w, $h); 2159 $self->SUPER::configure ($x, $y, $w, $h);
1896 2160
1897 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2161 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1898 for @{$self->{children}}; 2162 for @{$self->{children}};
1899} 2163}
1900 2164
1901sub translate { 2165sub _topleft {
1902 my ($self, $x, $y) = @_; 2166 my ($self, $x, $y) = @_;
1903 2167
1904 ($x, $y) 2168 ($x, $y)
1905} 2169}
1906 2170
1907sub update { 2171sub update {
1908 my ($self) = @_; 2172 my ($self) = @_;
1909 2173
1910 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2174 $self->check_size;
1911 ::refresh (); 2175 ::refresh ();
1912} 2176}
1913 2177
1914sub add { 2178sub add {
1915 my ($self, $widget) = @_; 2179 my ($self, $child) = @_;
1916 2180
1917 $self->SUPER::add ($widget); 2181 $self->SUPER::add ($child);
1918
1919 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1920} 2182}
1921 2183
1922sub on_refresh { 2184sub on_refresh {
1923 my ($self, $id, $cb) = @_; 2185 my ($self, $id, $cb) = @_;
1924 2186
… …
1947 2209
1948############################################################################# 2210#############################################################################
1949 2211
1950package CFClient::UI; 2212package CFClient::UI;
1951 2213
1952$TOPLEVEL = new CFClient::UI::Toplevel; 2214$ROOT = new CFClient::UI::Root;
1953 2215
19541 22161
1955 2217

Diff Legend

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