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.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; 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) = @_;
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
… …
240} 288}
241 289
242sub connect { 290sub connect {
243 my ($self, $signal, $cb) = @_; 291 my ($self, $signal, $cb) = @_;
244 292
245 push @{ $self->{cb}{$signal} }, $cb; 293 push @{ $self->{signal_cb}{$signal} }, $cb;
246} 294}
247 295
248sub emit { 296sub emit {
249 my ($self, $signal, @args) = @_; 297 my ($self, $signal, @args) = @_;
250 298
299 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
251 $_->($self, @args) 300 $cb->($self, @args);
252 for @{$self->{cb}{$signal} || []}; 301 }
253} 302}
254 303
255sub DESTROY { 304sub DESTROY {
256 my ($self) = @_; 305 my ($self) = @_;
257 306
… …
326 375
327 $self 376 $self
328} 377}
329 378
330sub add { 379sub add {
331 my ($self, $chld) = @_; 380 my ($self, $child) = @_;
332 381
333 $chld->set_parent ($self); 382 $child->set_parent ($self);
383
384 use sort 'stable';
334 385
335 $self->{children} = [ 386 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 387 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 388 @{$self->{children}}, $child
338 ]; 389 ];
339 390
340 $self->{w} = $self->{h} = -1; 391 $self->{w} = $self->{h} = -1;
341 $self->update; 392
393 $child->check_size;
342} 394}
343 395
344sub remove { 396sub remove {
345 my ($self, $widget) = @_; 397 my ($self, $widget) = @_;
346 398
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348 400
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 401 $self->check_size;
350} 402}
351 403
352sub find_widget { 404sub find_widget {
353 my ($self, $x, $y) = @_; 405 my ($self, $x, $y) = @_;
354 406
… …
407sub size_request { 459sub size_request {
408 $_[0]{children}[0]->size_request 460 $_[0]{children}[0]->size_request
409} 461}
410 462
411sub size_allocate { 463sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_; 464 my ($self, $w, $h) = @_;
413 465
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h); 466 $self->{children}[0]->configure (0, 0, $w, $h);
417} 467}
418 468
419############################################################################# 469#############################################################################
420 470
421package CFClient::UI::Window; 471package CFClient::UI::Window;
… …
439} 489}
440 490
441sub render_chld { 491sub render_chld {
442 my ($self) = @_; 492 my ($self) = @_;
443 493
444 $self->{texture} = 494 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 495 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 496 glClear GL_COLOR_BUFFER_BIT;
447 ); 497 $self->child->draw;
498 };
448} 499}
449 500
450sub size_allocate { 501sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 502 my ($self, $w, $h) = @_;
452 503
453 $self->_size_allocate ($x, $y, $w, $h) or return;
454
455 $self->child->size_allocate (0, 0, $w, $h); 504 $self->child->configure (0, 0, $w, $h);
456 505
457 $self->render_chld; 506 $self->render_chld;
458} 507}
459 508
460sub _draw { 509sub _draw {
… …
476 glDisable GL_TEXTURE_2D; 525 glDisable GL_TEXTURE_2D;
477} 526}
478 527
479############################################################################# 528#############################################################################
480 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
481package CFClient::UI::Frame; 554package CFClient::UI::Frame;
482 555
483our @ISA = CFClient::UI::Bin::; 556our @ISA = CFClient::UI::Bin::;
484 557
485use SDL::OpenGL; 558use SDL::OpenGL;
… …
495} 568}
496 569
497sub size_allocate { 570sub size_allocate {
498 my ($self, $x, $y, $w, $h) = @_; 571 my ($self, $x, $y, $w, $h) = @_;
499 572
500 $self->_size_allocate ($x, $y, $w, $h) or return;
501
502 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 573 $self->child->configure (2, 2, $w - 4, $h - 4);
503} 574}
504 575
505sub _draw { 576sub _draw {
506 my ($self) = @_; 577 my ($self) = @_;
507 578
… …
538 # TODO: user_x, user_y, overwrite moveto? 609 # TODO: user_x, user_y, overwrite moveto?
539 610
540 $class->SUPER::new ( 611 $class->SUPER::new (
541 bg => [1, 1, 1, 1], 612 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1], 613 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8, 614 border => int $::FONTSIZE * 0.8,
544 @_ 615 @_
545 ) 616 )
546} 617}
547 618
548sub size_request { 619sub size_request {
… …
557 $h + $self->{border} * 2, 628 $h + $self->{border} * 2,
558 ) 629 )
559} 630}
560 631
561sub size_allocate { 632sub size_allocate {
562 my ($self, $x, $y, $w, $h) = @_; 633 my ($self, $w, $h) = @_;
563
564 $self->_size_allocate ($x, $y, $w, $h) or return;
565 634
566 $h -= List::Util::max 0, $self->{border} * 2; 635 $h -= List::Util::max 0, $self->{border} * 2;
567 $w -= List::Util::max 0, $self->{border} * 2; 636 $w -= List::Util::max 0, $self->{border} * 2;
568 637
569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 638 $self->child->configure ($self->{border}, $self->{border}, $w, $h);
570} 639}
571 640
572sub button_down { 641sub button_down {
573 my ($self, $ev, $x, $y) = @_; 642 my ($self, $ev, $x, $y) = @_;
574 643
… …
583 652
584 ($x, $y) = ($ev->motion_x, $ev->motion_y); 653 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585 654
586 $self->{user_w} = $bw + $x - $ox; 655 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy; 656 $self->{user_h} = $bh + $y - $oy;
588 $self->update; 657 $self->check_size;
589 }; 658 };
590 659
591 } elsif ($x >= 0 && $x < $self->{w} 660 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) { 661 && $y >= 0 && $y < $self->{border}) {
593 662
… …
671 @_ 740 @_
672 ) 741 )
673} 742}
674 743
675sub add { 744sub add {
676 my ($self, $x, $y, $chld) = @_; 745 my ($self, $x, $y, $child) = @_;
677 746
747 $child->set_parent ($self);
678 $self->{children}[$y][$x] = $chld; 748 $self->{children}[$y][$x] = $child;
679 $chld->set_parent ($self);
680 749
681 $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};
682 $self->update; 760 $self->update;
683} 761}
684 762
685sub get_wh { 763sub get_wh {
686 my ($self) = @_; 764 my ($self) = @_;
… …
714 (sum @$hs), 792 (sum @$hs),
715 ) 793 )
716} 794}
717 795
718sub size_allocate { 796sub size_allocate {
719 my ($self, $x, $y, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
720
721 $self->_size_allocate ($x, $y, $w, $h) or return;
722 798
723 my ($ws, $hs) = $self->get_wh; 799 my ($ws, $hs) = $self->get_wh;
724 800
725 my $req_w = sum @$ws; 801 my $req_w = sum @$ws;
726 my $req_h = sum @$hs; 802 my $req_h = sum @$hs;
… …
731 my $col_expand = (sum @col_expand) || 1; 807 my $col_expand = (sum @col_expand) || 1;
732 808
733 # linearly scale sizes 809 # linearly scale sizes
734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 810 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 811 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
812
813 CFClient::UI::harmonize $ws;
814 CFClient::UI::harmonize $hs;
736 815
737 my $y; 816 my $y;
738 817
739 for my $r (0 .. $#{$self->{children}}) { 818 for my $r (0 .. $#{$self->{children}}) {
740 my $row = $self->{children}[$r] 819 my $row = $self->{children}[$r]
… …
745 824
746 for my $c (0 .. $#$row) { 825 for my $c (0 .. $#$row) {
747 my $col_w = $ws->[$c]; 826 my $col_w = $ws->[$c];
748 827
749 if (my $widget = $row->[$c]) { 828 if (my $widget = $row->[$c]) {
750 $widget->size_allocate ($x, $y, $col_w, $row_h); 829 $widget->configure ($x, $y, $col_w, $row_h);
751 } 830 }
752 831
753 $x += $col_w; 832 $x += $col_w;
754 } 833 }
755 834
… …
800 (List::Util::max map $_->[1], @alloc), 879 (List::Util::max map $_->[1], @alloc),
801 ) 880 )
802} 881}
803 882
804sub size_allocate { 883sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_; 884 my ($self, $w, $h) = @_;
806
807 $self->_size_allocate ($x, $y, $w, $h);
808 885
809 ($h, $w) = ($w, $h); 886 ($h, $w) = ($w, $h);
810 887
811 my $children = $self->{children}; 888 my $children = $self->{children};
812 889
… …
828 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 905 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829 $h[$_] = $alloc_h; 906 $h[$_] = $alloc_h;
830 } 907 }
831 } 908 }
832 909
910 CFClient::UI::harmonize \@h;
911
833 my $y = 0; 912 my $y = 0;
834 for (0 .. $#$children) { 913 for (0 .. $#$children) {
835 my $child = $children->[$_]; 914 my $child = $children->[$_];
836 my $h = $h[$_]; 915 my $h = $h[$_];
837 $child->size_allocate ($y, 0, $h, $w); 916 $child->configure ($y, 0, $h, $w);
838 917
839 $y += $h; 918 $y += $h;
840 } 919 }
920
921 1
841} 922}
842 923
843############################################################################# 924#############################################################################
844 925
845package CFClient::UI::VBox; 926package CFClient::UI::VBox;
… …
858 (List::Util::sum map $_->[1], @alloc), 939 (List::Util::sum map $_->[1], @alloc),
859 ) 940 )
860} 941}
861 942
862sub size_allocate { 943sub size_allocate {
863 my ($self, $x, $y, $w, $h) = @_; 944 my ($self, $w, $h) = @_;
864
865 $self->_size_allocate ($x, $y, $w, $h);
866 945
867 my $children = $self->{children}; 946 my $children = $self->{children};
868 947
869 my @h = map +($_->size_request)[1], @$children; 948 my @h = map +($_->size_request)[1], @$children;
870 949
… …
882 961
883 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 962 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
884 } 963 }
885 } 964 }
886 965
966 CFClient::UI::harmonize \@h;
967
887 my $y = 0; 968 my $y = 0;
888 for (0 .. $#$children) { 969 for (0 .. $#$children) {
889 my $child = $children->[$_]; 970 my $child = $children->[$_];
890 my $h = $h[$_]; 971 my $h = $h[$_];
891 $child->size_allocate (0, $y, $w, $h); 972 $child->configure (0, $y, $w, $h);
892 973
893 $y += $h; 974 $y += $h;
894 } 975 }
976
977 1
895} 978}
896 979
897############################################################################# 980#############################################################################
898 981
899package CFClient::UI::Label; 982package CFClient::UI::Label;
… …
904 987
905sub new { 988sub new {
906 my ($class, %arg) = @_; 989 my ($class, %arg) = @_;
907 990
908 my $self = $class->SUPER::new ( 991 my $self = $class->SUPER::new (
909 fg => [1, 1, 1], 992 fg => [1, 1, 1],
910 height => $::FONTSIZE, 993 fontsize => $::FONTSIZE,
911 text => "", 994 text => "",
912 align => -1, 995 align => -1,
996 valign => -1,
913 padding => 2, 997 padding => 2,
914 layout => new CFClient::Layout, 998 layout => new CFClient::Layout,
915 %arg 999 %arg
916 ); 1000 );
917 1001
918 $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};
919 1006
920 $self 1007 $self
921} 1008}
922 1009
923sub escape_text { 1010sub escape_text {
… …
931} 1018}
932 1019
933sub set_text { 1020sub set_text {
934 my ($self, $text) = @_; 1021 my ($self, $text) = @_;
935 1022
936 $self->{text} = $text;
937 $self->{layout}->set_markup ($text); 1023 $self->{layout}->set_text ($text);
938 1024
939 delete $self->{texture}; 1025 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
941 $self->update; 1026 $self->update;
942} 1027}
943 1028
944sub get_text { 1029sub set_markup {
945 my ($self, $text) = @_; 1030 my ($self, $markup) = @_;
946 1031
947 $self->{text} 1032 $self->{layout}->set_markup ($markup);
1033
1034 delete $self->{texture};
1035 $self->update;
948} 1036}
949 1037
950sub size_request { 1038sub size_request {
951 my ($self) = @_; 1039 my ($self) = @_;
952 1040
953 $self->{layout}->set_width; 1041 $self->{layout}->set_width;
954 $self->{layout}->set_height ($self->{height}); 1042 $self->{layout}->set_height ($self->{fontsize});
1043
955 my ($w, $h) = $self->{layout}->size; 1044 my ($w, $h) = $self->{layout}->size;
956 1045
957 ( 1046 (
958 $w + $self->{padding} * 2, 1047 $w + $self->{padding} * 2,
959 $h + $self->{padding} * 2, 1048 $h + $self->{padding} * 2,
960 ) 1049 )
961} 1050}
962 1051
963sub size_allocate { 1052sub size_allocate {
964 my ($self, $x, $y, $w, $h) = @_; 1053 my ($self, $w, $h) = @_;
965
966 $self->_size_allocate ($x, $y, $w, $h) or return;
967 1054
968 delete $self->{texture}; 1055 delete $self->{texture};
969} 1056}
970 1057
971sub update { 1058sub update {
… …
978sub _draw { 1065sub _draw {
979 my ($self) = @_; 1066 my ($self) = @_;
980 1067
981 my $tex = $self->{texture} ||= do { 1068 my $tex = $self->{texture} ||= do {
982 $self->{layout}->set_width ($self->{w}); 1069 $self->{layout}->set_width ($self->{w});
983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
984 new_from_layout CFClient::Texture $self->{layout} 1071 new_from_layout CFClient::Texture $self->{layout}
985 }; 1072 };
986 1073
987 glEnable GL_BLEND; 1074 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989 glEnable GL_TEXTURE_2D; 1076 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1077 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991 1078
992 glColor @{$self->{fg}}; 1079 glColor @{$self->{fg}};
993 1080
994 my $x = 1081 $self->{ox} = int (
995 $self->{align} < 0 ? $self->{padding} 1082 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1083 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5; 1084 : ($self->{w} - $tex->{w}) * 0.5
1085 );
998 1086
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1087 $self->{oy} = int (
1000 $tex->draw_quad (0, 0); 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});
1001 1094
1002 glDisable GL_TEXTURE_2D; 1095 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND; 1096 glDisable GL_BLEND;
1004} 1097}
1005 1098
1006############################################################################# 1099#############################################################################
1007 1100
1008package CFClient::UI::Entry; 1101package CFClient::UI::EntryBase;
1009 1102
1010our @ISA = CFClient::UI::Label::; 1103our @ISA = CFClient::UI::Label::;
1011 1104
1012use SDL; 1105use SDL;
1013use SDL::OpenGL; 1106use SDL::OpenGL;
… …
1020 bg => [0, 0, 0, 0.2], 1113 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5], 1114 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0], 1115 active_fg => [0, 0, 0],
1023 can_hover => 1, 1116 can_hover => 1,
1024 can_focus => 1, 1117 can_focus => 1,
1118 valign => 0,
1025 @_ 1119 @_
1026 ) 1120 )
1027} 1121}
1028 1122
1029sub _set_text { 1123sub _set_text {
1030 my ($self, $text) = @_; 1124 my ($self, $text) = @_;
1031 1125
1032 my $old_text = $self->{text}; 1126 delete $self->{cur_h};
1127
1128 return if $self->{text} eq $text;
1033 1129
1034 $self->{last_activity} = $::NOW; 1130 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text; 1131 $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 1132
1040 $text =~ s/./*/g if $self->{hidden}; 1133 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text ");
1041 1135
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1136 $self->emit (changed => $self->{text});
1137}
1043 1138
1044 $text = substr $text, 0, $self->{cursor}; 1139sub get_text {
1045 utf8::encode $text; 1140 $_[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} 1141}
1052 1142
1053sub size_request { 1143sub size_request {
1054 my ($self) = @_; 1144 my ($self) = @_;
1055 1145
… …
1057 1147
1058 ($w + 1, $h) # add 1 for cursor 1148 ($w + 1, $h) # add 1 for cursor
1059} 1149}
1060 1150
1061sub size_allocate { 1151sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_; 1152 my ($self, $w, $h) = @_;
1063
1064 $self->SUPER::size_allocate ($x, $y, $w, $h);
1065 1153
1066 $self->_set_text ($self->{text}); 1154 $self->_set_text ($self->{text});
1067} 1155}
1068 1156
1069sub set_text { 1157sub set_text {
… …
1159 1247
1160 $self->SUPER::_draw; 1248 $self->SUPER::_draw;
1161 1249
1162 #TODO: force update every cursor change :( 1250 #TODO: force update every cursor change :(
1163 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
1164 glColor @{$self->{fg}}; 1260 glColor @{$self->{fg}};
1165 glBegin GL_LINES; 1261 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 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};
1168 glEnd; 1264 glEnd;
1169 } 1265 }
1170} 1266}
1171 1267
1172package CFClient::UI::LineEntry; 1268package CFClient::UI::Entry;
1173 1269
1174our @ISA = CFClient::UI::Entry::; 1270our @ISA = CFClient::UI::EntryBase::;
1175 1271
1176use SDL; 1272use SDL;
1177use SDL::OpenGL; 1273use SDL::OpenGL;
1178 1274
1179sub key_down { 1275sub key_down {
… …
1209 1305
1210 $class->SUPER::new ( 1306 $class->SUPER::new (
1211 padding => 4, 1307 padding => 4,
1212 fg => [1, 1, 1], 1308 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2], 1309 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0], 1310 active_fg => [0, 0, 1],
1215 can_hover => 1, 1311 can_hover => 1,
1312 align => 0,
1313 valign => 0,
1216 @_ 1314 @_
1217 ) 1315 )
1218} 1316}
1219 1317
1220sub button_up { 1318sub button_up {
… …
1228 1326
1229sub _draw { 1327sub _draw {
1230 my ($self) = @_; 1328 my ($self) = @_;
1231 1329
1232 local $self->{fg} = $self->{fg}; 1330 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 1331
1239 if ($GRAB == $self) { 1332 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg}; 1333 $self->{fg} = $self->{active_fg};
1241 } 1334 }
1242 1335
1243 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;
1244 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;
1245 1341
1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1342 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247 1343
1248 glDisable GL_TEXTURE_2D; 1344 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND; 1345 glDisable GL_BLEND;
1250 1346
1251 $self->SUPER::_draw; 1347 $self->SUPER::_draw;
… …
1254############################################################################# 1350#############################################################################
1255 1351
1256package CFClient::UI::CheckBox; 1352package CFClient::UI::CheckBox;
1257 1353
1258our @ISA = CFClient::UI::DrawBG::; 1354our @ISA = CFClient::UI::DrawBG::;
1355
1356my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1259 1359
1260use SDL; 1360use SDL;
1261use SDL::OpenGL; 1361use SDL::OpenGL;
1262 1362
1263sub new { 1363sub new {
… …
1277 my ($self) = @_; 1377 my ($self) = @_;
1278 1378
1279 ($self->{padding} * 2 + 6) x 2 1379 ($self->{padding} * 2 + 6) x 2
1280} 1380}
1281 1381
1282sub size_allocate {
1283 my ($self, $x, $y, $w, $h) = @_;
1284
1285 $self->_size_allocate ($x, $y, $w, $h);
1286}
1287
1288sub button_down { 1382sub button_down {
1289 my ($self, $ev, $x, $y) = @_; 1383 my ($self, $ev, $x, $y) = @_;
1290 1384
1291 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1385 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1292 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1386 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1301 $self->SUPER::_draw; 1395 $self->SUPER::_draw;
1302 1396
1303 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1397 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1304 1398
1305 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1399 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1400
1401 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1402
1403 glEnable GL_BLEND;
1404 glEnable GL_TEXTURE_2D;
1405 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1406
1407 my $tex = $self->{state} ? $tex[1] : $tex[0];
1408
1409 $tex->draw_quad (0, 0, $s, $s);
1410
1411 glDisable GL_TEXTURE_2D;
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];
1306 1455
1307 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1456 @$tex{qw(w h)}
1457}
1308 1458
1309 glBegin GL_LINE_LOOP; 1459sub set_max {
1310 glVertex 0 , 0; 1460 my ($self, $max) = @_;
1311 glVertex 0 , $s; 1461
1312 glVertex $s, $s; 1462 $self->{max_val} = $max;
1313 glVertex $s, 0; 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;
1314 glEnd; 1506 glEnd;
1315 1507
1316 if ($self->{state}) { 1508 $yp += $h1;
1317 glBegin GL_LINES; 1509
1318 glVertex 0 , 0; 1510 glBindTexture GL_TEXTURE_2D, $t2->{name};
1319 glVertex $s, $s; 1511 glBegin GL_QUADS;
1320 glVertex $s, 0; 1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
1321 glVertex 0 , $s; 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;
1322 glEnd; 1516 glEnd;
1323 } 1517
1518 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D;
1324} 1520}
1325 1521
1326############################################################################# 1522#############################################################################
1327 1523
1328package CFClient::UI::Slider; 1524package CFClient::UI::Slider;
… …
1351 range => [0, 0, 100, 10], 1547 range => [0, 0, 100, 10],
1352 req_w => 40, 1548 req_w => 40,
1353 req_h => 13, 1549 req_h => 13,
1354 vertical => 0, 1550 vertical => 0,
1355 can_hover => 1, 1551 can_hover => 1,
1552 inner_pad => 5,
1356 @_ 1553 @_
1357 ); 1554 );
1358 1555
1359 $self 1556 $self
1360} 1557}
… …
1381 if ($GRAB == $self) { 1578 if ($GRAB == $self) {
1382 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1579 my ($value, $lo, $hi, $page) = @{$self->{range}};
1383 1580
1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1581 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1385 1582
1583 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1584 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1585
1586 $x -= $inner_pad_px; # substract the padding
1386 $x = $x * ($hi - $lo) / $w + $lo; 1587 $x = $x * ($hi - $lo) / $inner_w + $lo;
1387 $x = $lo if $x < $lo; 1588 $x = $lo if $x < $lo;
1388 $x = $hi - $page if $x > $hi - $page; 1589 $x = $hi - $page if $x > $hi - $page;
1389 $self->{range}[0] = $x; 1590 $self->{range}[0] = $x;
1390 1591
1391 $self->emit (changed => $x); 1592 $self->emit (changed => $x);
1392 $self->update; 1593 $self->update;
1393 } 1594 }
1595}
1596
1597# the inner_* stuff is for generating a padding for the slider handle,
1598# so that the handle doesn't leave the texture. This calculation isn't 100%
1599# correct propably, but it does the job for now
1600sub _calc_inner_pad_px {
1601 my ($self, $w) = @_;
1602 ($w / 100) * $self->{inner_pad} # % to pixels
1394} 1603}
1395 1604
1396sub _draw { 1605sub _draw {
1397 my ($self) = @_; 1606 my ($self) = @_;
1398 1607
… …
1412 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1621 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1413 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1622 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1414 1623
1415 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1624 my ($value, $lo, $hi, $page) = @{$self->{range}};
1416 1625
1417 # the inner_* stuff is for generating a padding for the slider handle, 1626 $hi = $value + 1 if $lo == $hi;
1418 # so that the handle doesn't leave the texture. This calculation isn't 100% 1627
1419 # correct propably, but it does the job for now 1628 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 1629 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1423 1630
1424 $page = int $page * $inner_w / ($hi - $lo); 1631 $page = int $page * $inner_w / ($hi - $lo);
1425 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1632 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1426 1633
1427 $w -= $page; 1634 $w -= $page;
… …
1457 1664
1458sub new { 1665sub new {
1459 my $class = shift; 1666 my $class = shift;
1460 1667
1461 my $self = $class->SUPER::new ( 1668 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6,
1670 req_h => $::HEIGHT / 6,
1671 fontsize => $::FONTSIZE,
1672 @_,
1673
1674 layout => (new CFClient::Layout),
1462 par => [], 1675 par => [],
1463 @_, 1676 height => 0,
1464 children => [ 1677 children => [
1465 (new CFClient::UI::Empty expand => 1), 1678 (new CFClient::UI::Empty expand => 1),
1466 (new CFClient::UI::Slider vertical => 1), 1679 (new CFClient::UI::Slider vertical => 1),
1467 ], 1680 ],
1468 ); 1681 );
1469 1682
1683 $self->{children}[1]->connect (changed => sub {
1684 $self->update;
1685 });
1686
1470 $self 1687 $self
1688}
1689
1690sub set_fontsize {
1691 my ($self, $fontsize) = @_;
1692
1693 $self->{fontsize} = $fontsize;
1694 $self->reflow;
1695}
1696
1697sub text_height {
1698 my ($self, $text) = @_;
1699
1700 my $layout = $self->{layout};
1701
1702 $layout->set_height ($self->{fontsize});
1703 $layout->set_width ($self->{w});
1704 $layout->set_text ($text);
1705
1706 ($layout->size)[1]
1707}
1708
1709sub reflow {
1710 my ($self) = @_;
1711
1712 $self->{need_reflow}++;
1713 $self->update;
1714}
1715
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate {
1723 my ($self, $w, $h) = @_;
1724
1725 $self->{layout}->set_height ($self->{fontsize});
1726 $self->{layout}->set_width ($self->{w});
1727
1728 $self->reflow;
1729 $self->update;
1471} 1730}
1472 1731
1473sub add_paragraph { 1732sub add_paragraph {
1474 my ($self, $color, $text) = @_; 1733 my ($self, $color, $text) = @_;
1475 1734
1735 #TODO: intelligently "reformat" paragraph
1736
1737 my $height = $self->text_height ($text);
1738
1739 $self->{height} += $height;
1740
1476 push @{$self->{par}}, [$color, $text]; 1741 push @{$self->{par}}, [$height, $color, $text];
1477 my $count = scalar @{$self->{par}}; 1742
1478 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 1743 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1479 $self->{children}[1]->update; 1744 $self->{children}[1]->update;
1480} 1745}
1481 1746
1747sub update {
1748 my ($self) = @_;
1749
1750 $self->SUPER::update;
1751
1752 return unless $self->{h} > 0;
1753
1754 delete $self->{texture};
1755
1756 $ROOT->on_refresh ($self, sub {
1757 if (delete $self->{need_reflow}) {
1758 my $height = 0;
1759
1760 $height += $_->[0] = $self->text_height ($_->[2])
1761 for @{$self->{par}};
1762
1763 $self->{height} = $height;
1764
1765 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1766
1767 delete $self->{texture};
1768 }
1769
1770 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1771 glClearColor 0, 0, 0, 1;
1772 glClear GL_COLOR_BUFFER_BIT;
1773
1774 glEnable GL_BLEND;
1775 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1776 glEnable GL_TEXTURE_2D;
1777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1778
1779 my $top = int $self->{children}[1]{range}[0];
1780
1781 my $y0 = $top;
1782 my $y1 = $top + $self->{h};
1783
1784 my $y = 0;
1785
1786 my $layout = $self->{layout};
1787
1788 for my $par (@{$self->{par}}) {
1789 my $h = $par->[0];
1790
1791 if ($y0 < $y + $h && $y < $y1) {
1792 $layout->set_text ($par->[2]);
1793
1794 glColor @{ $par->[1] };
1795 my ($W, $H) = $layout->size;
1796 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1797 }
1798
1799 $y += $h;
1800 }
1801
1802 glDisable GL_TEXTURE_2D;
1803 glDisable GL_BLEND;
1804 };
1805 });
1806}
1807
1482sub _draw { 1808sub _draw {
1483 my ($self) = @_; 1809 my ($self) = @_;
1484 1810
1485 my $par = $self->{par}; 1811 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; 1812 glEnable GL_TEXTURE_2D;
1495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1496 1814 $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; 1815 glDisable GL_TEXTURE_2D;
1514 glDisable GL_BLEND; 1816 }
1817
1818 $self->{children}[1]->draw;
1819
1515} 1820}
1516 1821
1517############################################################################# 1822#############################################################################
1518 1823
1519package CFClient::UI::MapWidget; 1824package CFClient::UI::MapWidget;
… …
1543} 1848}
1544 1849
1545sub key_up { 1850sub key_up {
1546} 1851}
1547 1852
1853sub button_down {
1854 my ($self, $ev, $x, $y) = @_;
1855
1856 $self->focus_in;
1857
1858 if ($ev->button == 2) {
1859 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1860 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1861
1862 $self->{motion} = sub {
1863 my ($ev, $x, $y) = @_;
1864
1865 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1866
1867 $::CFG->{map_shift_x} = $bw + $x - $ox;
1868 $::CFG->{map_shift_y} = $bh + $y - $oy;
1869
1870 $self->update;
1871 };
1872 }
1873}
1874
1875sub button_up {
1876 my ($self, $ev, $x, $y) = @_;
1877
1878 delete $self->{motion};
1879}
1880
1881sub mouse_motion {
1882 my ($self, $ev, $x, $y) = @_;
1883
1884 $self->{motion}->($ev, $x, $y) if $self->{motion};
1885}
1886
1548sub size_request { 1887sub size_request {
1549 ( 1888 (
1550 1 + 32 * int $::WIDTH / 32, 1889 1 + 32 * int $::WIDTH / 32,
1551 1 + 32 * int $::HEIGHT / 32, 1890 1 + 32 * int $::HEIGHT / 32,
1552 ) 1891 )
… …
1560} 1899}
1561 1900
1562sub draw { 1901sub draw {
1563 my ($self) = @_; 1902 my ($self) = @_;
1564 1903
1565 $self->{need_update}++;#d#
1566 if (delete $self->{need_update}) { 1904 if (delete $self->{need_update}) {
1567 glNewList $self->{list}, GL_COMPILE; 1905 glNewList $self->{list}, GL_COMPILE;
1568 1906
1569 my $sw = int $::WIDTH / 32;
1570 my $sh = int $::HEIGHT / 32;
1571
1572 if ($::MAP) { 1907 if ($::MAP) {
1908 my $sw = int $::WIDTH / 32;
1909 my $sh = int $::HEIGHT / 32;
1910
1911 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1912 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1913
1914 glTranslate $sx0 - 32, $sy0 - 32, 0;
1915
1573 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); 1916 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1574 1917
1575 if ($::CFG->{fow_enable}) { 1918 if ($::CFG->{fow_enable}) {
1576 if ($::CFG->{fow_smooth}) { # smooth fog of war 1919 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1577 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1920 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1578 glConvolutionFilter2D 1921 glConvolutionFilter2D (
1579 GL_CONVOLUTION_2D, 1922 GL_CONVOLUTION_2D,
1580 GL_ALPHA, 1923 GL_ALPHA,
1581 3, 3, 1924 3, 3,
1582 GL_ALPHA, GL_FLOAT, 1925 GL_ALPHA, GL_FLOAT,
1583 pack "f*", 1926 pack "f*",
1584 0.1, 0.1, 0.1, 1927 0.1, 0.1, 0.1,
1585 0.1, 0.2, 0.1, 1928 0.1, 0.2, 0.1,
1586 0.1, 0.1, 0.1, 1929 0.1, 0.1, 0.1,
1587 ; 1930 );
1588 glEnable GL_CONVOLUTION_2D; 1931 glEnable GL_CONVOLUTION_2D;
1589 } 1932 }
1590 1933
1591 my $tex = new CFClient::Texture 1934 $self->{fow_texture} = new CFClient::Texture
1592 w => $w, 1935 w => $w,
1593 h => $h, 1936 h => $h,
1594 data => $data, 1937 data => $data,
1595 internalformat => GL_ALPHA, 1938 internalformat => GL_ALPHA,
1596 format => GL_ALPHA; 1939 format => GL_ALPHA;
1597 1940
1598 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 1941 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1599 1942
1600 glEnable GL_BLEND; 1943 glEnable GL_BLEND;
1944 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 1945 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1946 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1603 1947
1604 glColor +($::CFG->{fow_intensity}) x 3, 1; 1948 glColor +($::CFG->{fow_intensity}) x 3, 1;
1605 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1949 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1606 1950
1607 glDisable GL_TEXTURE_2D; 1951 glDisable GL_TEXTURE_2D;
1608 glDisable GL_BLEND; 1952 glDisable GL_BLEND;
1609 } 1953 }
1954
1955 # HACK BEGIN
1956 {
1957 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1958 my ($w, $h) = (250, 250);
1959
1960 glEnable GL_BLEND;
1961 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962 glEnable GL_TEXTURE_2D;
1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964
1965 $self->{mapmap_texture} =
1966 new CFClient::Texture
1967 w => $w,
1968 h => $h,
1969 data => $::MAP->mapmap ($w, $h),
1970 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1971
1972 $self->{mapmap_texture}->draw_quad (100, 100);
1973
1974 glDisable GL_TEXTURE_2D;
1975 glDisable GL_BLEND;
1976 }
1977 # HACK END
1610 } 1978 }
1611 1979
1612 glEndList; 1980 glEndList;
1613 } 1981 }
1614 1982
1983 glPushMatrix;
1615 glCallList $self->{list}; 1984 glCallList $self->{list};
1985 glPopMatrix;
1616 1986
1617 if ($FOCUS != $self) { 1987 if ($FOCUS != $self) {
1618 glColor 64/255, 64/255, 64/255; 1988 glColor 64/255, 64/255, 64/255;
1619 glLogicOp GL_AND; 1989 glLogicOp GL_AND;
1620 glEnable GL_COLOR_LOGIC_OP; 1990 glEnable GL_COLOR_LOGIC_OP;
… …
1649 2019
1650 my $mod = $ev->key_mod; 2020 my $mod = $ev->key_mod;
1651 my $sym = $ev->key_sym; 2021 my $sym = $ev->key_sym;
1652 2022
1653 if ($sym == SDLK_KP5) { 2023 if ($sym == SDLK_KP5) {
1654 $::CONN->user_send ("command stay fire"); 2024 $::CONN->user_send ("stay fire");
1655 } elsif ($sym == SDLK_a) { 2025 } elsif ($sym == SDLK_a) {
1656 $::CONN->user_send ("command apply"); 2026 $::CONN->user_send ("apply");
1657 } elsif ($sym == SDLK_QUOTE) { 2027 } elsif ($sym == SDLK_QUOTE) {
1658 $self->emit ('activate_console'); 2028 $self->emit ('activate_console');
2029 } elsif ($sym == SDLK_SLASH) {
2030 $self->emit ('activate_console' => '/');
1659 } elsif (exists $DIR{$sym}) { 2031 } elsif (exists $DIR{$sym}) {
1660 if ($mod & KMOD_SHIFT) { 2032 if ($mod & KMOD_SHIFT) {
1661 $self->{shft}++; 2033 $self->{shft}++;
1662 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 2034 $::CONN->user_send ("fire $DIR{$sym}[0]");
1663 } elsif ($mod & KMOD_CTRL) { 2035 } elsif ($mod & KMOD_CTRL) {
1664 $self->{ctrl}++; 2036 $self->{ctrl}++;
1665 $::CONN->user_send ("command run $DIR{$sym}[0]"); 2037 $::CONN->user_send ("run $DIR{$sym}[0]");
1666 } else { 2038 } else {
1667 $::CONN->user_send ("command $DIR{$sym}[1]"); 2039 $::CONN->user_send ("$DIR{$sym}[1]");
1668 } 2040 }
1669 } 2041 }
1670} 2042}
1671 2043
1672sub key_up { 2044sub key_up {
… …
1674 2046
1675 my $mod = $ev->key_mod; 2047 my $mod = $ev->key_mod;
1676 my $sym = $ev->key_sym; 2048 my $sym = $ev->key_sym;
1677 2049
1678 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2050 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1679 $::CONN->user_send ("command fire_stop"); 2051 $::CONN->user_send ("fire_stop");
1680 } 2052 }
1681 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2053 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1682 $::CONN->user_send ("command run_stop"); 2054 $::CONN->user_send ("run_stop");
1683 } 2055 }
1684} 2056}
1685 2057
1686############################################################################# 2058#############################################################################
1687 2059
… …
1751sub toggle_flopper { 2123sub toggle_flopper {
1752 my ($self) = @_; 2124 my ($self) = @_;
1753 2125
1754 # TODO: use animation 2126 # TODO: use animation
1755 if ($self->{state} = !$self->{state}) { 2127 if ($self->{state} = !$self->{state}) {
1756 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2128 $CFClient::UI::ROOT->add ($self->{other});
1757 $self->{other}->move ( 2129 $self->{other}->move ($self->coord2global (0, $self->{h}));
1758 ($::WIDTH - $self->{other}{w}) * 0.5, 2130 $self->emit ("open");
1759 ($::HEIGHT - $self->{other}{h}) * 0.5,
1760 );
1761 } else { 2131 } else {
1762 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2132 $CFClient::UI::ROOT->remove ($self->{other});
2133 $self->emit ("close");
1763 } 2134 }
1764}
1765 2135
1766############################################################################# 2136 $self->emit (changed => $self->{state});
2137}
1767 2138
2139#############################################################################
2140
1768package CFClient::UI::Toplevel; 2141package CFClient::UI::Root;
1769 2142
1770our @ISA = CFClient::UI::Container::; 2143our @ISA = CFClient::UI::Container::;
2144
2145use SDL::OpenGL;
2146
2147sub check_size {
2148 my ($self) = @_;
2149
2150 $self->configure (0, 0, $::WITH, $::HEIGHT);
2151}
1771 2152
1772sub size_request { 2153sub size_request {
1773 ($::WIDTH, $::HEIGHT) 2154 ($::WIDTH, $::HEIGHT)
1774} 2155}
1775 2156
1776sub size_allocate { 2157sub configure {
1777 my ($self, $x, $y, $w, $h) = @_; 2158 my ($self, $x, $y, $w, $h) = @_;
1778 2159
1779 $self->_size_allocate ($x, $y, $w, $h); 2160 $self->SUPER::configure ($x, $y, $w, $h);
1780 2161
1781 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1782 for @{$self->{children}}; 2163 for @{$self->{children}};
1783} 2164}
1784 2165
1785sub translate { 2166sub _topleft {
1786 my ($self, $x, $y) = @_; 2167 my ($self, $x, $y) = @_;
1787 2168
1788 ($x, $y) 2169 ($x, $y)
1789} 2170}
1790 2171
1791sub update { 2172sub update {
1792 my ($self) = @_; 2173 my ($self) = @_;
1793 2174
1794 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2175 $self->check_size;
1795 ::refresh (); 2176 ::refresh ();
1796} 2177}
1797 2178
1798sub add { 2179sub add {
1799 my ($self, $widget) = @_; 2180 my ($self, $child) = @_;
1800 2181
1801 $self->SUPER::add ($widget); 2182 $self->SUPER::add ($child);
2183}
1802 2184
1803 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2185sub on_refresh {
2186 my ($self, $id, $cb) = @_;
2187
2188 $self->{refresh_hook}{$id} = $cb;
1804} 2189}
1805 2190
1806sub draw { 2191sub draw {
1807 my ($self) = @_; 2192 my ($self) = @_;
1808 2193
2194 while (my $rcb = delete $self->{refresh_hook}) {
2195 $_->() for values %$rcb;
2196 }
2197
2198 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2199 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2200 glClear GL_COLOR_BUFFER_BIT;
2201
2202 glMatrixMode GL_PROJECTION;
2203 glLoadIdentity;
2204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2205 glMatrixMode GL_MODELVIEW;
2206 glLoadIdentity;
2207
1809 $self->_draw; 2208 $self->_draw;
1810} 2209}
1811 2210
1812############################################################################# 2211#############################################################################
1813 2212
1814package CFClient::UI; 2213package CFClient::UI;
1815 2214
1816$TOPLEVEL = new CFClient::UI::Toplevel; 2215$ROOT = new CFClient::UI::Root;
1817 2216
18181 22171
1819 2218

Diff Legend

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