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.112 by root, Sat Apr 15 12:29:46 2006 UTC vs.
Revision 1.133 by root, Tue Apr 18 21:39:31 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} 71}
72 72
73# convert position array to integers 73# convert position array to integers
74sub harmonize { 74sub harmonize {
75 my ($vals) = @_; 75 my ($vals) = @_;
76 76
77 my $rem = 0; 77 my $rem = 0;
78 78
79 for ($vals) { 79 for (@$vals) {
80 my $i = int $_ + $rem; 80 my $i = int $_ + $rem;
81 $rem += $_ - $i; 81 $rem += $_ - $i;
82 $_ = $i; 82 $_ = $i;
83 } 83 }
84} 84}
… …
112 $self 112 $self
113} 113}
114 114
115sub move { 115sub move {
116 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
117
117 $self->{x} = $x; 118 $self->{x} = int $x;
118 $self->{y} = $y; 119 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 120 $self->{z} = $z if defined $z;
121
122 $self->update;
120} 123}
121 124
122sub needs_redraw { 125sub needs_redraw {
123 0 126 0
124} 127}
… …
126sub size_request { 129sub size_request {
127 require Carp; 130 require Carp;
128 Carp::confess "size_request is abtract"; 131 Carp::confess "size_request is abtract";
129} 132}
130 133
131sub _size_allocate { 134sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 135 my ($self, $x, $y, $w, $h) = @_;
133 136
134 $self->{x} = $x; 137 $self->{x} = $x;
135 $self->{y} = $y; 138 $self->{y} = $y;
136 139
137 return unless $self->{w} != $w || $self->{h} != $h; 140 return unless $self->{w} != $w || $self->{h} != $h;
138 141
139 $self->{w} = $w; 142 $self->{w} = $w;
140 $self->{h} = $h; 143 $self->{h} = $h;
141 144
142 1 145 $self->size_allocate ($w, $h);
143} 146}
144 147
145sub size_allocate { 148sub size_allocate {
149 # nothing to be done
150}
151
152# return top left coordinates
153sub _topleft {
146 my ($self, $x, $y, $w, $h) = @_; 154 my ($self, $x, $y) = @_;
147 155
148 $self->_size_allocate ($x, $y, $w, $h); 156 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
149} 157}
150 158
151# translate global coordinates to local coordinate system 159# translate global coordinates to local coordinate system
152sub translate { 160sub coord2local {
153 my ($self, $x, $y) = @_; 161 my ($self, $x, $y) = @_;
154 162
155 $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)
156} 173}
157 174
158sub focus_in { 175sub focus_in {
159 my ($self) = @_; 176 my ($self) = @_;
160 177
161 return if $FOCUS == $self; 178 return if $FOCUS == $self;
162 return unless $self->{can_focus}; 179 return unless $self->{can_focus};
163 180
164 my $focus = $FOCUS; $FOCUS = $self; 181 my $focus = $FOCUS; $FOCUS = $self;
182
183 $self->emit (focus_in => $focus);
184
165 $focus->update if $focus; 185 $focus->update if $focus;
166 $FOCUS->update; 186 $FOCUS->update;
167} 187}
168 188
169sub focus_out { 189sub focus_out {
170 my ($self) = @_; 190 my ($self) = @_;
171 191
172 return unless $FOCUS == $self; 192 return unless $FOCUS == $self;
173 193
174 my $focus = $FOCUS; undef $FOCUS; 194 my $focus = $FOCUS; undef $FOCUS;
195
196 $self->emit (focus_out => $focus);
197
175 $focus->update if $focus; #? 198 $focus->update if $focus; #?
176} 199}
177 200
178sub mouse_motion { } 201sub mouse_motion { }
179sub button_up { } 202sub button_up { }
… …
203 glPopMatrix; 226 glPopMatrix;
204 227
205 if ($self == $HOVER && $self->{can_hover}) { 228 if ($self == $HOVER && $self->{can_hover}) {
206 my ($x, $y) = @$self{qw(x y)}; 229 my ($x, $y) = @$self{qw(x y)};
207 230
208 glColor 0, 0, 1, 0.2; 231 glColor 1, 0.8, 0.5, 0.2;
209 glEnable GL_BLEND; 232 glEnable GL_BLEND;
210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 233 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
211 glBegin GL_QUADS; 234 glBegin GL_QUADS;
212 glVertex $x , $y; 235 glVertex $x , $y;
213 glVertex $x + $self->{w}, $y; 236 glVertex $x + $self->{w}, $y;
… …
233 256
234 () 257 ()
235} 258}
236 259
237sub set_parent { 260sub set_parent {
238 my ($self, $par) = @_; 261 my ($self, $parent) = @_;
239 262
240 $self->{parent} = $par;
241 Scalar::Util::weaken $self->{parent}; 263 Scalar::Util::weaken ($self->{parent} = $parent);
242} 264}
243 265
244sub get_parent { 266sub check_size {
245 $_[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 }
246} 281}
247 282
248sub update { 283sub update {
249 my ($self) = @_; 284 my ($self) = @_;
250 285
… …
253} 288}
254 289
255sub connect { 290sub connect {
256 my ($self, $signal, $cb) = @_; 291 my ($self, $signal, $cb) = @_;
257 292
258 push @{ $self->{cb}{$signal} }, $cb; 293 push @{ $self->{signal_cb}{$signal} }, $cb;
259} 294}
260 295
261sub emit { 296sub emit {
262 my ($self, $signal, @args) = @_; 297 my ($self, $signal, @args) = @_;
263 298
299 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
264 $_->($self, @args) 300 $cb->($self, @args);
265 for @{$self->{cb}{$signal} || []}; 301 }
266} 302}
267 303
268sub DESTROY { 304sub DESTROY {
269 my ($self) = @_; 305 my ($self) = @_;
270 306
… …
339 375
340 $self 376 $self
341} 377}
342 378
343sub add { 379sub add {
344 my ($self, $chld) = @_; 380 my ($self, $child) = @_;
345 381
346 $chld->set_parent ($self); 382 $child->set_parent ($self);
383
384 use sort 'stable';
347 385
348 $self->{children} = [ 386 $self->{children} = [
349 sort { $a->{z} <=> $b->{z} } 387 sort { $a->{z} <=> $b->{z} }
350 @{$self->{children}}, $chld 388 @{$self->{children}}, $child
351 ]; 389 ];
352 390
353 $self->{w} = $self->{h} = -1; 391 $self->{w} = $self->{h} = -1;
354 $self->update; 392
393 $child->check_size;
355} 394}
356 395
357sub remove { 396sub remove {
358 my ($self, $widget) = @_; 397 my ($self, $widget) = @_;
359 398
360 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
361 400
362 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 401 $self->check_size;
363} 402}
364 403
365sub find_widget { 404sub find_widget {
366 my ($self, $x, $y) = @_; 405 my ($self, $x, $y) = @_;
367 406
… …
420sub size_request { 459sub size_request {
421 $_[0]{children}[0]->size_request 460 $_[0]{children}[0]->size_request
422} 461}
423 462
424sub size_allocate { 463sub size_allocate {
425 my ($self, $x, $y, $w, $h) = @_; 464 my ($self, $w, $h) = @_;
426 465
427 $self->_size_allocate ($x, $y, $w, $h) or return;
428
429 $self->{children}[0]->size_allocate (0, 0, $w, $h); 466 $self->{children}[0]->configure (0, 0, $w, $h);
430} 467}
431 468
432############################################################################# 469#############################################################################
433 470
434package CFClient::UI::Window; 471package CFClient::UI::Window;
… …
460 $self->child->draw; 497 $self->child->draw;
461 }; 498 };
462} 499}
463 500
464sub size_allocate { 501sub size_allocate {
465 my ($self, $x, $y, $w, $h) = @_; 502 my ($self, $w, $h) = @_;
466 503
467 $self->_size_allocate ($x, $y, $w, $h) or return;
468
469 $self->child->size_allocate (0, 0, $w, $h); 504 $self->child->configure (0, 0, $w, $h);
470 505
471 $self->render_chld; 506 $self->render_chld;
472} 507}
473 508
474sub _draw { 509sub _draw {
… …
490 glDisable GL_TEXTURE_2D; 525 glDisable GL_TEXTURE_2D;
491} 526}
492 527
493############################################################################# 528#############################################################################
494 529
530package CFClient::UI::ViewPort;
531
532our @ISA = CFClient::UI::Window::;
533
534sub new { die }
535
536sub size_request {
537 my ($self) = @_;
538
539 @$self{qw(child_w child_h)} = $self->child->size_request;
540 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541
542 @$self{qw(child_w child_h)}
543}
544
545sub _draw {
546 my ($self) = @_;
547
548 $self->{children}[1]->draw;
549}
550
551
552#############################################################################
553
495package CFClient::UI::Frame; 554package CFClient::UI::Frame;
496 555
497our @ISA = CFClient::UI::Bin::; 556our @ISA = CFClient::UI::Bin::;
498 557
499use SDL::OpenGL; 558use SDL::OpenGL;
… …
509} 568}
510 569
511sub size_allocate { 570sub size_allocate {
512 my ($self, $x, $y, $w, $h) = @_; 571 my ($self, $x, $y, $w, $h) = @_;
513 572
514 $self->_size_allocate ($x, $y, $w, $h) or return;
515
516 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 573 $self->child->configure (2, 2, $w - 4, $h - 4);
517} 574}
518 575
519sub _draw { 576sub _draw {
520 my ($self) = @_; 577 my ($self) = @_;
521 578
… …
552 # TODO: user_x, user_y, overwrite moveto? 609 # TODO: user_x, user_y, overwrite moveto?
553 610
554 $class->SUPER::new ( 611 $class->SUPER::new (
555 bg => [1, 1, 1, 1], 612 bg => [1, 1, 1, 1],
556 border_bg => [1, 1, 1, 1], 613 border_bg => [1, 1, 1, 1],
557 border => $::FONTSIZE * 0.8, 614 border => int $::FONTSIZE * 0.8,
558 @_ 615 @_
559 ) 616 )
560} 617}
561 618
562sub size_request { 619sub size_request {
… …
571 $h + $self->{border} * 2, 628 $h + $self->{border} * 2,
572 ) 629 )
573} 630}
574 631
575sub size_allocate { 632sub size_allocate {
576 my ($self, $x, $y, $w, $h) = @_; 633 my ($self, $w, $h) = @_;
577
578 $self->_size_allocate ($x, $y, $w, $h) or return;
579 634
580 $h -= List::Util::max 0, $self->{border} * 2; 635 $h -= List::Util::max 0, $self->{border} * 2;
581 $w -= List::Util::max 0, $self->{border} * 2; 636 $w -= List::Util::max 0, $self->{border} * 2;
582 637
583 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 638 $self->child->configure ($self->{border}, $self->{border}, $w, $h);
584} 639}
585 640
586sub button_down { 641sub button_down {
587 my ($self, $ev, $x, $y) = @_; 642 my ($self, $ev, $x, $y) = @_;
588 643
… …
597 652
598 ($x, $y) = ($ev->motion_x, $ev->motion_y); 653 ($x, $y) = ($ev->motion_x, $ev->motion_y);
599 654
600 $self->{user_w} = $bw + $x - $ox; 655 $self->{user_w} = $bw + $x - $ox;
601 $self->{user_h} = $bh + $y - $oy; 656 $self->{user_h} = $bh + $y - $oy;
602 $self->update; 657 $self->check_size;
603 }; 658 };
604 659
605 } elsif ($x >= 0 && $x < $self->{w} 660 } elsif ($x >= 0 && $x < $self->{w}
606 && $y >= 0 && $y < $self->{border}) { 661 && $y >= 0 && $y < $self->{border}) {
607 662
… …
685 @_ 740 @_
686 ) 741 )
687} 742}
688 743
689sub add { 744sub add {
690 my ($self, $x, $y, $chld) = @_; 745 my ($self, $x, $y, $child) = @_;
691 746
747 $child->set_parent ($self);
692 $self->{children}[$y][$x] = $chld; 748 $self->{children}[$y][$x] = $child;
693 $chld->set_parent ($self);
694 749
695 $self->{w} = $self->{h} = -1; 750 $self->{w} = $self->{h} = -1;
751
752 $child->check_size;
753}
754
755# TODO: move to container class maybe? send childs a signal on removal?
756sub clear {
757 my ($self) = @_;
758
759 delete $self->{children};
696 $self->update; 760 $self->update;
697} 761}
698 762
699sub get_wh { 763sub get_wh {
700 my ($self) = @_; 764 my ($self) = @_;
… …
728 (sum @$hs), 792 (sum @$hs),
729 ) 793 )
730} 794}
731 795
732sub size_allocate { 796sub size_allocate {
733 my ($self, $x, $y, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
734
735 $self->_size_allocate ($x, $y, $w, $h) or return;
736 798
737 my ($ws, $hs) = $self->get_wh; 799 my ($ws, $hs) = $self->get_wh;
738 800
739 my $req_w = sum @$ws; 801 my $req_w = sum @$ws;
740 my $req_h = sum @$hs; 802 my $req_h = sum @$hs;
… …
762 824
763 for my $c (0 .. $#$row) { 825 for my $c (0 .. $#$row) {
764 my $col_w = $ws->[$c]; 826 my $col_w = $ws->[$c];
765 827
766 if (my $widget = $row->[$c]) { 828 if (my $widget = $row->[$c]) {
767 $widget->size_allocate ($x, $y, $col_w, $row_h); 829 $widget->configure ($x, $y, $col_w, $row_h);
768 } 830 }
769 831
770 $x += $col_w; 832 $x += $col_w;
771 } 833 }
772 834
… …
817 (List::Util::max map $_->[1], @alloc), 879 (List::Util::max map $_->[1], @alloc),
818 ) 880 )
819} 881}
820 882
821sub size_allocate { 883sub size_allocate {
822 my ($self, $x, $y, $w, $h) = @_; 884 my ($self, $w, $h) = @_;
823
824 $self->_size_allocate ($x, $y, $w, $h);
825 885
826 ($h, $w) = ($w, $h); 886 ($h, $w) = ($w, $h);
827 887
828 my $children = $self->{children}; 888 my $children = $self->{children};
829 889
… …
851 911
852 my $y = 0; 912 my $y = 0;
853 for (0 .. $#$children) { 913 for (0 .. $#$children) {
854 my $child = $children->[$_]; 914 my $child = $children->[$_];
855 my $h = $h[$_]; 915 my $h = $h[$_];
856 $child->size_allocate ($y, 0, $h, $w); 916 $child->configure ($y, 0, $h, $w);
857 917
858 $y += $h; 918 $y += $h;
859 } 919 }
920
921 1
860} 922}
861 923
862############################################################################# 924#############################################################################
863 925
864package CFClient::UI::VBox; 926package CFClient::UI::VBox;
… …
877 (List::Util::sum map $_->[1], @alloc), 939 (List::Util::sum map $_->[1], @alloc),
878 ) 940 )
879} 941}
880 942
881sub size_allocate { 943sub size_allocate {
882 my ($self, $x, $y, $w, $h) = @_; 944 my ($self, $w, $h) = @_;
883
884 $self->_size_allocate ($x, $y, $w, $h);
885 945
886 my $children = $self->{children}; 946 my $children = $self->{children};
887 947
888 my @h = map +($_->size_request)[1], @$children; 948 my @h = map +($_->size_request)[1], @$children;
889 949
… …
907 967
908 my $y = 0; 968 my $y = 0;
909 for (0 .. $#$children) { 969 for (0 .. $#$children) {
910 my $child = $children->[$_]; 970 my $child = $children->[$_];
911 my $h = $h[$_]; 971 my $h = $h[$_];
912 $child->size_allocate (0, $y, $w, $h); 972 $child->configure (0, $y, $w, $h);
913 973
914 $y += $h; 974 $y += $h;
915 } 975 }
976
977 1
916} 978}
917 979
918############################################################################# 980#############################################################################
919 981
920package CFClient::UI::Label; 982package CFClient::UI::Label;
… …
929 my $self = $class->SUPER::new ( 991 my $self = $class->SUPER::new (
930 fg => [1, 1, 1], 992 fg => [1, 1, 1],
931 fontsize => $::FONTSIZE, 993 fontsize => $::FONTSIZE,
932 text => "", 994 text => "",
933 align => -1, 995 align => -1,
996 valign => -1,
934 padding => 2, 997 padding => 2,
935 layout => new CFClient::Layout, 998 layout => new CFClient::Layout,
936 %arg 999 %arg
937 ); 1000 );
938 1001
939 $self->set_text ($self->{text}); 1002 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1003
1004 $self->set_text (delete $self->{text}) if exists $self->{text};
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
940 1006
941 $self 1007 $self
942} 1008}
943 1009
944sub escape_text { 1010sub escape_text {
… …
952} 1018}
953 1019
954sub set_text { 1020sub set_text {
955 my ($self, $text) = @_; 1021 my ($self, $text) = @_;
956 1022
957 $self->{text} = $text;
958 $self->{layout}->set_markup ($text); 1023 $self->{layout}->set_text ($text);
959 1024
960 delete $self->{texture}; 1025 delete $self->{texture};
961# $self->{w} = $self->{h} = -1;
962 $self->update; 1026 $self->update;
963} 1027}
964 1028
965sub get_text { 1029sub set_markup {
966 my ($self, $text) = @_; 1030 my ($self, $markup) = @_;
967 1031
968 $self->{text} 1032 $self->{layout}->set_markup ($markup);
1033
1034 delete $self->{texture};
1035 $self->update;
969} 1036}
970 1037
971sub size_request { 1038sub size_request {
972 my ($self) = @_; 1039 my ($self) = @_;
973 1040
974 $self->{layout}->set_width; 1041 $self->{layout}->set_width;
975 $self->{layout}->set_height ($self->{fontsize}); 1042 $self->{layout}->set_height ($self->{fontsize});
1043
976 my ($w, $h) = $self->{layout}->size; 1044 my ($w, $h) = $self->{layout}->size;
977 1045
978 ( 1046 (
979 $w + $self->{padding} * 2, 1047 $w + $self->{padding} * 2,
980 $h + $self->{padding} * 2, 1048 $h + $self->{padding} * 2,
981 ) 1049 )
982} 1050}
983 1051
984sub size_allocate { 1052sub size_allocate {
985 my ($self, $x, $y, $w, $h) = @_; 1053 my ($self, $w, $h) = @_;
986
987 $self->_size_allocate ($x, $y, $w, $h) or return;
988 1054
989 delete $self->{texture}; 1055 delete $self->{texture};
990} 1056}
991 1057
992sub update { 1058sub update {
… …
999sub _draw { 1065sub _draw {
1000 my ($self) = @_; 1066 my ($self) = @_;
1001 1067
1002 my $tex = $self->{texture} ||= do { 1068 my $tex = $self->{texture} ||= do {
1003 $self->{layout}->set_width ($self->{w}); 1069 $self->{layout}->set_width ($self->{w});
1004 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); 1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
1005 new_from_layout CFClient::Texture $self->{layout} 1071 new_from_layout CFClient::Texture $self->{layout}
1006 }; 1072 };
1007 1073
1008 glEnable GL_BLEND; 1074 glEnable GL_BLEND;
1009 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1010 glEnable GL_TEXTURE_2D; 1076 glEnable GL_TEXTURE_2D;
1011 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1077 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1012 1078
1013 glColor @{$self->{fg}}; 1079 glColor @{$self->{fg}};
1014 1080
1015 my $x = 1081 $self->{ox} = int (
1016 $self->{align} < 0 ? $self->{padding} 1082 $self->{align} < 0 ? $self->{padding}
1017 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1083 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1018 : ($self->{w} - $tex->{w}) * 0.5; 1084 : ($self->{w} - $tex->{w}) * 0.5
1085 );
1019 1086
1020 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); 1087 $self->{oy} = int (
1088 $self->{valign} < 0 ? $self->{padding}
1089 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1090 : ($self->{h} - $tex->{h}) * 0.5
1091 );
1092
1093 $tex->draw_quad ($self->{ox}, $self->{oy});
1021 1094
1022 glDisable GL_TEXTURE_2D; 1095 glDisable GL_TEXTURE_2D;
1023 glDisable GL_BLEND; 1096 glDisable GL_BLEND;
1024} 1097}
1025 1098
1026############################################################################# 1099#############################################################################
1027 1100
1028package CFClient::UI::Entry; 1101package CFClient::UI::EntryBase;
1029 1102
1030our @ISA = CFClient::UI::Label::; 1103our @ISA = CFClient::UI::Label::;
1031 1104
1032use SDL; 1105use SDL;
1033use SDL::OpenGL; 1106use SDL::OpenGL;
… …
1040 bg => [0, 0, 0, 0.2], 1113 bg => [0, 0, 0, 0.2],
1041 active_bg => [1, 1, 1, 0.5], 1114 active_bg => [1, 1, 1, 0.5],
1042 active_fg => [0, 0, 0], 1115 active_fg => [0, 0, 0],
1043 can_hover => 1, 1116 can_hover => 1,
1044 can_focus => 1, 1117 can_focus => 1,
1118 valign => 0,
1045 @_ 1119 @_
1046 ) 1120 )
1047} 1121}
1048 1122
1049sub _set_text { 1123sub _set_text {
1050 my ($self, $text) = @_; 1124 my ($self, $text) = @_;
1051 1125
1052 my $old_text = $self->{text}; 1126 delete $self->{cur_h};
1127
1128 return if $self->{text} eq $text;
1053 1129
1054 $self->{last_activity} = $::NOW; 1130 $self->{last_activity} = $::NOW;
1055
1056 $self->{text} = $text; 1131 $self->{text} = $text;
1057 $self->{layout}->set_width ($self->{w});
1058 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1059 1132
1060 $text =~ s/./*/g if $self->{hidden}; 1133 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text ");
1061 1135
1062 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1136 $self->emit (changed => $self->{text});
1137}
1063 1138
1064 $text = substr $text, 0, $self->{cursor}; 1139sub get_text {
1065 utf8::encode $text; 1140 $_[0]{text}
1066
1067 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1068
1069 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1070 if $old_text ne $self->{text};
1071} 1141}
1072 1142
1073sub size_request { 1143sub size_request {
1074 my ($self) = @_; 1144 my ($self) = @_;
1075 1145
… …
1077 1147
1078 ($w + 1, $h) # add 1 for cursor 1148 ($w + 1, $h) # add 1 for cursor
1079} 1149}
1080 1150
1081sub size_allocate { 1151sub size_allocate {
1082 my ($self, $x, $y, $w, $h) = @_; 1152 my ($self, $w, $h) = @_;
1083
1084 $self->SUPER::size_allocate ($x, $y, $w, $h);
1085 1153
1086 $self->_set_text ($self->{text}); 1154 $self->_set_text ($self->{text});
1087} 1155}
1088 1156
1089sub set_text { 1157sub set_text {
… …
1179 1247
1180 $self->SUPER::_draw; 1248 $self->SUPER::_draw;
1181 1249
1182 #TODO: force update every cursor change :( 1250 #TODO: force update every cursor change :(
1183 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1251 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1252
1253 unless (exists $self->{cur_h}) {
1254 my $text = substr $self->{text}, 0, $self->{cursor};
1255 utf8::encode $text;
1256
1257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1258 }
1259
1184 glColor @{$self->{fg}}; 1260 glColor @{$self->{fg}};
1185 glBegin GL_LINES; 1261 glBegin GL_LINES;
1186 glVertex $self->{cur_x}, $self->{cur_y};
1187 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1262 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1263 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1188 glEnd; 1264 glEnd;
1189 } 1265 }
1190} 1266}
1191 1267
1192package CFClient::UI::LineEntry; 1268package CFClient::UI::Entry;
1193 1269
1194our @ISA = CFClient::UI::Entry::; 1270our @ISA = CFClient::UI::EntryBase::;
1195 1271
1196use SDL; 1272use SDL;
1197use SDL::OpenGL; 1273use SDL::OpenGL;
1198 1274
1199sub key_down { 1275sub key_down {
… …
1229 1305
1230 $class->SUPER::new ( 1306 $class->SUPER::new (
1231 padding => 4, 1307 padding => 4,
1232 fg => [1, 1, 1], 1308 fg => [1, 1, 1],
1233 bg => [1, 1, 1, 0.2], 1309 bg => [1, 1, 1, 0.2],
1234 active_fg => [1, 1, 0], 1310 active_fg => [0, 0, 1],
1235 can_hover => 1, 1311 can_hover => 1,
1312 align => 0,
1313 valign => 0,
1236 @_ 1314 @_
1237 ) 1315 )
1238} 1316}
1239 1317
1240sub button_up { 1318sub button_up {
… …
1248 1326
1249sub _draw { 1327sub _draw {
1250 my ($self) = @_; 1328 my ($self) = @_;
1251 1329
1252 local $self->{fg} = $self->{fg}; 1330 local $self->{fg} = $self->{fg};
1253 my $tex = $tex[0];
1254
1255 glEnable GL_BLEND;
1256 glEnable GL_TEXTURE_2D;
1257 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1258 1331
1259 if ($GRAB == $self) { 1332 if ($GRAB == $self) {
1260 $self->{fg} = $self->{active_fg}; 1333 $self->{fg} = $self->{active_fg};
1261 } 1334 }
1262 1335
1263 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1336 glEnable GL_BLEND;
1337 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1338 glEnable GL_TEXTURE_2D;
1264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1339 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1340 glColor 0, 0, 0, 1;
1265 1341
1266 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1342 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1267 1343
1268 glDisable GL_TEXTURE_2D; 1344 glDisable GL_TEXTURE_2D;
1269 glDisable GL_BLEND; 1345 glDisable GL_BLEND;
1270 1346
1271 $self->SUPER::_draw; 1347 $self->SUPER::_draw;
… …
1301 my ($self) = @_; 1377 my ($self) = @_;
1302 1378
1303 ($self->{padding} * 2 + 6) x 2 1379 ($self->{padding} * 2 + 6) x 2
1304} 1380}
1305 1381
1306sub size_allocate {
1307 my ($self, $x, $y, $w, $h) = @_;
1308
1309 $self->_size_allocate ($x, $y, $w, $h);
1310}
1311
1312sub button_down { 1382sub button_down {
1313 my ($self, $ev, $x, $y) = @_; 1383 my ($self, $ev, $x, $y) = @_;
1314 1384
1315 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1385 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1316 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1386 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1338 1408
1339 $tex->draw_quad (0, 0, $s, $s); 1409 $tex->draw_quad (0, 0, $s, $s);
1340 1410
1341 glDisable GL_TEXTURE_2D; 1411 glDisable GL_TEXTURE_2D;
1342 glDisable GL_BLEND; 1412 glDisable GL_BLEND;
1413}
1414
1415#############################################################################
1416
1417package CFClient::UI::VGauge;
1418
1419our @ISA = CFClient::UI::Base::;
1420
1421use SDL::OpenGL;
1422
1423my %tex = (
1424 food => [
1425 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1426 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1427 ],
1428 grace => [
1429 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1430 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1431 ],
1432 hp => [
1433 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1434 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1435 ],
1436 mana => [
1437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1438 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1439 ],
1440);
1441
1442# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new {
1444 my $class = shift;
1445
1446 my $self = $class->SUPER::new (gauge => 'food', @_);
1447
1448 $self
1449}
1450
1451sub size_request {
1452 my ($self) = @_;
1453
1454 my $tex = $tex{$self->{gauge}}[0];
1455
1456 @$tex{qw(w h)}
1457}
1458
1459sub set_max {
1460 my ($self, $max) = @_;
1461
1462 $self->{max_val} = $max;
1463}
1464
1465sub set_value {
1466 my ($self, $val, $max) = @_;
1467
1468 $self->set_max ($max)
1469 if defined $max;
1470
1471 $max = $self->{max_val};
1472 $self->{val} = $val;
1473
1474 $self->update;
1475}
1476
1477sub _draw {
1478 my ($self) = @_;
1479
1480 my $tex = $tex{$self->{gauge}};
1481
1482 my ($w, $h) = ($self->{w}, $self->{h});
1483
1484 my $ycut = $self->{val} / ($self->{max_val} || 1);
1485 $ycut = 1 if $self->{val} > $self->{max_val};
1486
1487 my $t1 = $tex->[0];
1488 my $t2 = $tex->[1];
1489
1490 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494
1495 my $h1 = $self->{h} - $ycut * $self->{h};
1496 my $h2 = $ycut * $self->{h};
1497
1498 my $yp = 0;
1499
1500 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;
1506 glEnd;
1507
1508 $yp += $h1;
1509
1510 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;
1514 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1515 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
1516 glEnd;
1517
1518 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D;
1343} 1520}
1344 1521
1345############################################################################# 1522#############################################################################
1346 1523
1347package CFClient::UI::Slider; 1524package CFClient::UI::Slider;
… …
1541 1718
1542 ($self->{req_w}, $self->{req_h}) 1719 ($self->{req_w}, $self->{req_h})
1543} 1720}
1544 1721
1545sub size_allocate { 1722sub size_allocate {
1546 my ($self, $x, $y, $w, $h) = @_; 1723 my ($self, $w, $h) = @_;
1547
1548 $self->SUPER::size_allocate ($x, $y, $w, $h);
1549 1724
1550 $self->{layout}->set_height ($self->{fontsize}); 1725 $self->{layout}->set_height ($self->{fontsize});
1551 $self->{layout}->set_width ($self->{w}); 1726 $self->{layout}->set_width ($self->{w});
1552 1727
1553 $self->reflow; 1728 $self->reflow;
1729 $self->update;
1554} 1730}
1555 1731
1556sub add_paragraph { 1732sub add_paragraph {
1557 my ($self, $color, $text) = @_; 1733 my ($self, $color, $text) = @_;
1558 1734
… …
1575 1751
1576 return unless $self->{h} > 0; 1752 return unless $self->{h} > 0;
1577 1753
1578 delete $self->{texture}; 1754 delete $self->{texture};
1579 1755
1580 $TOPLEVEL->on_refresh ($self, sub { 1756 $ROOT->on_refresh ($self, sub {
1581 if (delete $self->{need_reflow}) { 1757 if (delete $self->{need_reflow}) {
1582 my $height = 0; 1758 my $height = 0;
1583 1759
1584 $height += $_->[0] = $self->text_height ($_->[2]) 1760 $height += $_->[0] = $self->text_height ($_->[2])
1585 for @{$self->{par}}; 1761 for @{$self->{par}};
… …
1738 glTranslate $sx0 - 32, $sy0 - 32, 0; 1914 glTranslate $sx0 - 32, $sy0 - 32, 0;
1739 1915
1740 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 1916 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1741 1917
1742 if ($::CFG->{fow_enable}) { 1918 if ($::CFG->{fow_enable}) {
1743 if ($::CFG->{fow_smooth}) { # smooth fog of war 1919 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1744 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1920 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1745 glConvolutionFilter2D 1921 glConvolutionFilter2D (
1746 GL_CONVOLUTION_2D, 1922 GL_CONVOLUTION_2D,
1747 GL_ALPHA, 1923 GL_ALPHA,
1748 3, 3, 1924 3, 3,
1749 GL_ALPHA, GL_FLOAT, 1925 GL_ALPHA, GL_FLOAT,
1750 pack "f*", 1926 pack "f*",
1751 0.1, 0.1, 0.1, 1927 0.1, 0.1, 0.1,
1752 0.1, 0.2, 0.1, 1928 0.1, 0.2, 0.1,
1753 0.1, 0.1, 0.1, 1929 0.1, 0.1, 0.1,
1754 ; 1930 );
1755 glEnable GL_CONVOLUTION_2D; 1931 glEnable GL_CONVOLUTION_2D;
1756 } 1932 }
1757 1933
1758 my $tex = new CFClient::Texture 1934 $self->{fow_texture} = new CFClient::Texture
1759 w => $w, 1935 w => $w,
1760 h => $h, 1936 h => $h,
1761 data => $data, 1937 data => $data,
1762 internalformat => GL_ALPHA, 1938 internalformat => GL_ALPHA,
1763 format => GL_ALPHA; 1939 format => GL_ALPHA;
… …
1768 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1944 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1769 glEnable GL_TEXTURE_2D; 1945 glEnable GL_TEXTURE_2D;
1770 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1946 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1771 1947
1772 glColor +($::CFG->{fow_intensity}) x 3, 1; 1948 glColor +($::CFG->{fow_intensity}) x 3, 1;
1773 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1949 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1774 1950
1775 glDisable GL_TEXTURE_2D; 1951 glDisable GL_TEXTURE_2D;
1776 glDisable GL_BLEND; 1952 glDisable GL_BLEND;
1777 } 1953 }
1778 1954
… …
1784 glEnable GL_BLEND; 1960 glEnable GL_BLEND;
1785 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1961 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1786 glEnable GL_TEXTURE_2D; 1962 glEnable GL_TEXTURE_2D;
1787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1788 1964
1965 $self->{mapmap_texture} =
1789 CFClient::Texture->new ( 1966 new CFClient::Texture
1790 w => $w, 1967 w => $w,
1791 h => $h, 1968 h => $h,
1792 data => $::MAP->mapmap ($w, $h), 1969 data => $::MAP->mapmap ($w, $h),
1793 type => GL_UNSIGNED_INT_8_8_8_8_REV 1970 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1794 )->draw_quad (100, 100); 1971
1972 $self->{mapmap_texture}->draw_quad (100, 100);
1795 1973
1796 glDisable GL_TEXTURE_2D; 1974 glDisable GL_TEXTURE_2D;
1797 glDisable GL_BLEND; 1975 glDisable GL_BLEND;
1798 } 1976 }
1799 # HACK END 1977 # HACK END
… …
1841 2019
1842 my $mod = $ev->key_mod; 2020 my $mod = $ev->key_mod;
1843 my $sym = $ev->key_sym; 2021 my $sym = $ev->key_sym;
1844 2022
1845 if ($sym == SDLK_KP5) { 2023 if ($sym == SDLK_KP5) {
1846 $::CONN->user_send ("command stay fire"); 2024 $::CONN->user_send ("stay fire");
1847 } elsif ($sym == SDLK_a) { 2025 } elsif ($sym == SDLK_a) {
1848 $::CONN->user_send ("command apply"); 2026 $::CONN->user_send ("apply");
1849 } elsif ($sym == SDLK_QUOTE) { 2027 } elsif ($sym == SDLK_QUOTE) {
1850 $self->emit ('activate_console'); 2028 $self->emit ('activate_console');
1851 } elsif ($sym == SDLK_SLASH) { 2029 } elsif ($sym == SDLK_SLASH) {
1852 $self->emit ('activate_console' => '/'); 2030 $self->emit ('activate_console' => '/');
1853 } elsif (exists $DIR{$sym}) { 2031 } elsif (exists $DIR{$sym}) {
1854 if ($mod & KMOD_SHIFT) { 2032 if ($mod & KMOD_SHIFT) {
1855 $self->{shft}++; 2033 $self->{shft}++;
1856 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 2034 $::CONN->user_send ("fire $DIR{$sym}[0]");
1857 } elsif ($mod & KMOD_CTRL) { 2035 } elsif ($mod & KMOD_CTRL) {
1858 $self->{ctrl}++; 2036 $self->{ctrl}++;
1859 $::CONN->user_send ("command run $DIR{$sym}[0]"); 2037 $::CONN->user_send ("run $DIR{$sym}[0]");
1860 } else { 2038 } else {
1861 $::CONN->user_send ("command $DIR{$sym}[1]"); 2039 $::CONN->user_send ("$DIR{$sym}[1]");
1862 } 2040 }
1863 } 2041 }
1864} 2042}
1865 2043
1866sub key_up { 2044sub key_up {
… …
1868 2046
1869 my $mod = $ev->key_mod; 2047 my $mod = $ev->key_mod;
1870 my $sym = $ev->key_sym; 2048 my $sym = $ev->key_sym;
1871 2049
1872 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2050 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1873 $::CONN->user_send ("command fire_stop"); 2051 $::CONN->user_send ("fire_stop");
1874 } 2052 }
1875 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2053 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1876 $::CONN->user_send ("command run_stop"); 2054 $::CONN->user_send ("run_stop");
1877 } 2055 }
1878} 2056}
1879 2057
1880############################################################################# 2058#############################################################################
1881 2059
… …
1945sub toggle_flopper { 2123sub toggle_flopper {
1946 my ($self) = @_; 2124 my ($self) = @_;
1947 2125
1948 # TODO: use animation 2126 # TODO: use animation
1949 if ($self->{state} = !$self->{state}) { 2127 if ($self->{state} = !$self->{state}) {
1950 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2128 $CFClient::UI::ROOT->add ($self->{other});
1951 $self->{other}->move ( 2129 $self->{other}->move ($self->coord2global (0, $self->{h}));
1952 ($::WIDTH - $self->{other}{w}) * 0.5, 2130 $self->emit ("open");
1953 ($::HEIGHT - $self->{other}{h}) * 0.5,
1954 );
1955 } else { 2131 } else {
1956 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2132 $CFClient::UI::ROOT->remove ($self->{other});
2133 $self->emit ("close");
1957 } 2134 }
1958}
1959 2135
1960############################################################################# 2136 $self->emit (changed => $self->{state});
2137}
1961 2138
2139#############################################################################
2140
1962package CFClient::UI::Toplevel; 2141package CFClient::UI::Root;
1963 2142
1964our @ISA = CFClient::UI::Container::; 2143our @ISA = CFClient::UI::Container::;
1965 2144
1966use SDL::OpenGL; 2145use SDL::OpenGL;
2146
2147sub check_size {
2148 my ($self) = @_;
2149
2150 $self->configure (0, 0, $::WITH, $::HEIGHT);
2151}
1967 2152
1968sub size_request { 2153sub size_request {
1969 ($::WIDTH, $::HEIGHT) 2154 ($::WIDTH, $::HEIGHT)
1970} 2155}
1971 2156
1972sub size_allocate { 2157sub configure {
1973 my ($self, $x, $y, $w, $h) = @_; 2158 my ($self, $x, $y, $w, $h) = @_;
1974 2159
1975 $self->_size_allocate ($x, $y, $w, $h); 2160 $self->SUPER::configure ($x, $y, $w, $h);
1976 2161
1977 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1978 for @{$self->{children}}; 2163 for @{$self->{children}};
1979} 2164}
1980 2165
1981sub translate { 2166sub _topleft {
1982 my ($self, $x, $y) = @_; 2167 my ($self, $x, $y) = @_;
1983 2168
1984 ($x, $y) 2169 ($x, $y)
1985} 2170}
1986 2171
1987sub update { 2172sub update {
1988 my ($self) = @_; 2173 my ($self) = @_;
1989 2174
1990 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2175 $self->check_size;
1991 ::refresh (); 2176 ::refresh ();
1992} 2177}
1993 2178
1994sub add { 2179sub add {
1995 my ($self, $widget) = @_; 2180 my ($self, $child) = @_;
1996 2181
1997 $self->SUPER::add ($widget); 2182 $self->SUPER::add ($child);
1998
1999 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
2000} 2183}
2001 2184
2002sub on_refresh { 2185sub on_refresh {
2003 my ($self, $id, $cb) = @_; 2186 my ($self, $id, $cb) = @_;
2004 2187
… …
2027 2210
2028############################################################################# 2211#############################################################################
2029 2212
2030package CFClient::UI; 2213package CFClient::UI;
2031 2214
2032$TOPLEVEL = new CFClient::UI::Toplevel; 2215$ROOT = new CFClient::UI::Root;
2033 2216
20341 22171
2035 2218

Diff Legend

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