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.99 by elmex, Fri Apr 14 10:57:35 2006 UTC vs.
Revision 1.136 by root, Wed Apr 19 20:46:44 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;
… …
83 96
84 my $self = bless { 97 my $self = bless {
85 x => 0, 98 x => 0,
86 y => 0, 99 y => 0,
87 z => 0, 100 z => 0,
88 w => -1,
89 h => -1,
90 @_ 101 @_
91 }, $class; 102 }, $class;
92 103
93 for (keys %$self) { 104 for (keys %$self) {
94 if (/^connect_(.*)$/) { 105 if (/^connect_(.*)$/) {
… …
97 } 108 }
98 109
99 $self 110 $self
100} 111}
101 112
113sub show {
114 my ($self) = @_;
115
116 return if $self->{parent};
117
118 $CFClient::UI::ROOT->add ($self);
119}
120
121sub hide {
122 my ($self) = @_;
123
124 return unless $self->{parent};
125
126 $self->{parent}->remove ($self);
127}
128
102sub move { 129sub move {
103 my ($self, $x, $y, $z) = @_; 130 my ($self, $x, $y, $z) = @_;
131
104 $self->{x} = $x; 132 $self->{x} = int $x;
105 $self->{y} = $y; 133 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 134 $self->{z} = $z if defined $z;
135
136 $self->update;
107} 137}
108 138
109sub needs_redraw { 139sub needs_redraw {
110 0 140 0
111} 141}
… …
113sub size_request { 143sub size_request {
114 require Carp; 144 require Carp;
115 Carp::confess "size_request is abtract"; 145 Carp::confess "size_request is abtract";
116} 146}
117 147
118sub _size_allocate { 148sub configure {
119 my ($self, $x, $y, $w, $h) = @_; 149 my ($self, $x, $y, $w, $h) = @_;
120 150
121 $self->{x} = $x; 151 $self->{x} = $x;
122 $self->{y} = $y; 152 $self->{y} = $y;
123 153
124 return unless $self->{w} != $w || $self->{h} != $h; 154 return unless $self->{w} != $w || $self->{h} != $h;
125 155
126 $self->{w} = $w; 156 $self->{w} = $w;
127 $self->{h} = $h; 157 $self->{h} = $h;
128 158
129 1 159 $self->size_allocate ($w, $h);
160 $self->update;
130} 161}
131 162
132sub size_allocate { 163sub size_allocate {
164 # nothing to be done
165}
166
167# return top left coordinates
168sub _topleft {
133 my ($self, $x, $y, $w, $h) = @_; 169 my ($self, $x, $y) = @_;
134 170
135 $self->_size_allocate ($x, $y, $w, $h); 171 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
136} 172}
137 173
138# translate global coordinates to local coordinate system 174# translate global coordinates to local coordinate system
139sub translate { 175sub coord2local {
140 my ($self, $x, $y) = @_; 176 my ($self, $x, $y) = @_;
141 177
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 178 my ($X, $Y) = $self->_topleft;
179 ($x - $X, $y - $Y)
180}
181
182# translate local coordinates to global coordinate system
183sub coord2global {
184 my ($self, $x, $y) = @_;
185
186 my ($X, $Y) = $self->_topleft;
187 ($x + $X, $y + $Y)
143} 188}
144 189
145sub focus_in { 190sub focus_in {
146 my ($self) = @_; 191 my ($self) = @_;
147 192
148 return if $FOCUS == $self; 193 return if $FOCUS == $self;
149 return unless $self->{can_focus}; 194 return unless $self->{can_focus};
150 195
151 my $focus = $FOCUS; $FOCUS = $self; 196 my $focus = $FOCUS; $FOCUS = $self;
197
198 $self->emit (focus_in => $focus);
199
152 $focus->update if $focus; 200 $focus->update if $focus;
153 $FOCUS->update; 201 $FOCUS->update;
154} 202}
155 203
156sub focus_out { 204sub focus_out {
157 my ($self) = @_; 205 my ($self) = @_;
158 206
159 return unless $FOCUS == $self; 207 return unless $FOCUS == $self;
160 208
161 my $focus = $FOCUS; undef $FOCUS; 209 my $focus = $FOCUS; undef $FOCUS;
210
211 $self->emit (focus_out => $focus);
212
162 $focus->update if $focus; #? 213 $focus->update if $focus; #?
163} 214}
164 215
165sub mouse_motion { } 216sub mouse_motion { }
166sub button_up { } 217sub button_up { }
… …
190 glPopMatrix; 241 glPopMatrix;
191 242
192 if ($self == $HOVER && $self->{can_hover}) { 243 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)}; 244 my ($x, $y) = @$self{qw(x y)};
194 245
195 glColor 0, 0, 1, 0.2; 246 glColor 1, 0.8, 0.5, 0.2;
196 glEnable GL_BLEND; 247 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 248 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198 glBegin GL_QUADS; 249 glBegin GL_QUADS;
199 glVertex $x , $y; 250 glVertex $x , $y;
200 glVertex $x + $self->{w}, $y; 251 glVertex $x + $self->{w}, $y;
… …
220 271
221 () 272 ()
222} 273}
223 274
224sub set_parent { 275sub set_parent {
225 my ($self, $par) = @_; 276 my ($self, $parent) = @_;
226 277
227 $self->{parent} = $par;
228 Scalar::Util::weaken $self->{parent}; 278 Scalar::Util::weaken ($self->{parent} = $parent);
229} 279}
230 280
231sub get_parent { 281sub check_size {
232 $_[0]->{parent} 282 my ($self) = @_;
283
284 my ($w, $h) = $self->size_request;
285
286 if ($w != $self->{req_w} || $h != $self->{req_h}) {
287 $self->{req_w} = $w;
288 $self->{req_h} = $h;
289
290 $self->{parent}->check_size
291 if $self->{parent};
292 }
233} 293}
234 294
235sub update { 295sub update {
236 my ($self) = @_; 296 my ($self) = @_;
237 297
… …
240} 300}
241 301
242sub connect { 302sub connect {
243 my ($self, $signal, $cb) = @_; 303 my ($self, $signal, $cb) = @_;
244 304
245 push @{ $self->{cb}{$signal} }, $cb; 305 push @{ $self->{signal_cb}{$signal} }, $cb;
246} 306}
247 307
248sub emit { 308sub emit {
249 my ($self, $signal, @args) = @_; 309 my ($self, $signal, @args) = @_;
250 310
311 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
251 $_->($self, @args) 312 $cb->($self, @args);
252 for @{$self->{cb}{$signal} || []}; 313 }
253} 314}
254 315
255sub DESTROY { 316sub DESTROY {
256 my ($self) = @_; 317 my ($self) = @_;
257 318
… …
326 387
327 $self 388 $self
328} 389}
329 390
330sub add { 391sub add {
331 my ($self, $chld) = @_; 392 my ($self, $child) = @_;
332 393
333 $chld->set_parent ($self); 394 $child->set_parent ($self);
395
396 use sort 'stable';
334 397
335 $self->{children} = [ 398 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 399 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 400 @{$self->{children}}, $child
338 ]; 401 ];
339 402
340 $self->{w} = $self->{h} = -1; 403 $child->check_size;
341 $self->update;
342} 404}
343 405
344sub remove { 406sub remove {
345 my ($self, $widget) = @_; 407 my ($self, $child) = @_;
346 408
409 delete $child->{parent};
410
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 411 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
348 412
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 413 $self->check_size;
350} 414}
351 415
352sub find_widget { 416sub find_widget {
353 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
354 418
… …
384 448
385 $class->SUPER::new (children => [$child], %arg) 449 $class->SUPER::new (children => [$child], %arg)
386} 450}
387 451
388sub add { 452sub add {
389 my ($self, $widget) = @_; 453 my ($self, $child) = @_;
390 454
391 $self->{children} = []; 455 $self->{children} = [];
392 456
393 $self->SUPER::add ($widget); 457 $self->SUPER::add ($child);
394} 458}
395 459
396sub remove { 460sub remove {
397 my ($self, $widget) = @_; 461 my ($self, $widget) = @_;
398 462
… …
407sub size_request { 471sub size_request {
408 $_[0]{children}[0]->size_request 472 $_[0]{children}[0]->size_request
409} 473}
410 474
411sub size_allocate { 475sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_; 476 my ($self, $w, $h) = @_;
413 477
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h); 478 $self->{children}[0]->configure (0, 0, $w, $h);
417} 479}
418 480
419############################################################################# 481#############################################################################
420 482
421package CFClient::UI::Window; 483package CFClient::UI::Window;
… …
439} 501}
440 502
441sub render_chld { 503sub render_chld {
442 my ($self) = @_; 504 my ($self) = @_;
443 505
444 $self->{texture} = 506 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 507 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 508 glClear GL_COLOR_BUFFER_BIT;
447 ); 509 $self->child->draw;
510 };
448} 511}
449 512
450sub size_allocate { 513sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 514 my ($self, $w, $h) = @_;
452 515
453 $self->_size_allocate ($x, $y, $w, $h) or return;
454
455 $self->child->size_allocate (0, 0, $w, $h); 516 $self->child->configure (0, 0, $w, $h);
456 517
457 $self->render_chld; 518 $self->render_chld;
458} 519}
459 520
460sub _draw { 521sub _draw {
… …
476 glDisable GL_TEXTURE_2D; 537 glDisable GL_TEXTURE_2D;
477} 538}
478 539
479############################################################################# 540#############################################################################
480 541
542package CFClient::UI::ViewPort;
543
544our @ISA = CFClient::UI::Window::;
545
546sub new { die }
547
548sub size_request {
549 my ($self) = @_;
550
551 @$self{qw(child_w child_h)} = $self->child->size_request;
552 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
553
554 @$self{qw(child_w child_h)}
555}
556
557sub _draw {
558 my ($self) = @_;
559
560 $self->{children}[1]->draw;
561}
562
563
564#############################################################################
565
481package CFClient::UI::Frame; 566package CFClient::UI::Frame;
482 567
483our @ISA = CFClient::UI::Bin::; 568our @ISA = CFClient::UI::Bin::;
484 569
485use SDL::OpenGL; 570use SDL::OpenGL;
… …
495} 580}
496 581
497sub size_allocate { 582sub size_allocate {
498 my ($self, $x, $y, $w, $h) = @_; 583 my ($self, $x, $y, $w, $h) = @_;
499 584
500 $self->_size_allocate ($x, $y, $w, $h) or return;
501
502 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 585 $self->child->configure (2, 2, $w - 4, $h - 4);
503} 586}
504 587
505sub _draw { 588sub _draw {
506 my ($self) = @_; 589 my ($self) = @_;
507 590
… …
538 # TODO: user_x, user_y, overwrite moveto? 621 # TODO: user_x, user_y, overwrite moveto?
539 622
540 $class->SUPER::new ( 623 $class->SUPER::new (
541 bg => [1, 1, 1, 1], 624 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1], 625 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8, 626 border => 0.8,
544 @_ 627 @_
545 ) 628 )
546} 629}
547 630
631sub border {
632 int $_[0]{border} * $::FONTSIZE
633}
634
548sub size_request { 635sub size_request {
549 my ($self) = @_; 636 my ($self) = @_;
550 637
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 638 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552 639
553 my ($w, $h) = $self->SUPER::size_request; 640 my ($w, $h) = $self->SUPER::size_request;
554 641
555 ( 642 (
556 $w + $self->{border} * 2, 643 $w + $self->border * 2,
557 $h + $self->{border} * 2, 644 $h + $self->border * 2,
558 ) 645 )
559} 646}
560 647
561sub size_allocate { 648sub size_allocate {
562 my ($self, $x, $y, $w, $h) = @_; 649 my ($self, $w, $h) = @_;
563 650
564 $self->_size_allocate ($x, $y, $w, $h) or return;
565
566 $h -= List::Util::max 0, $self->{border} * 2; 651 $h -= List::Util::max 0, $self->border * 2;
567 $w -= List::Util::max 0, $self->{border} * 2; 652 $w -= List::Util::max 0, $self->border * 2;
568 653
569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 654 $self->child->configure ($self->border, $self->border, $w, $h);
570} 655}
571 656
572sub button_down { 657sub button_down {
573 my ($self, $ev, $x, $y) = @_; 658 my ($self, $ev, $x, $y) = @_;
574 659
660 my $border = $self->border;
661
575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 662 if ($x < $self->{w} && $x >= $self->{w} - $border
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 663 && $y < $self->{h} && $y >= $self->{h} - $border) {
577 664
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 665 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
579 my ($bw, $bh) = ($self->{w}, $self->{h}); 666 my ($bw, $bh) = ($self->{w}, $self->{h});
580 667
581 $self->{motion} = sub { 668 $self->{motion} = sub {
… …
583 670
584 ($x, $y) = ($ev->motion_x, $ev->motion_y); 671 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585 672
586 $self->{user_w} = $bw + $x - $ox; 673 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy; 674 $self->{user_h} = $bh + $y - $oy;
588 $self->update; 675 $self->check_size;
589 }; 676 };
590 677
591 } elsif ($x >= 0 && $x < $self->{w} 678 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) { 679 && $y >= 0 && $y < $border) {
593 680
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 681 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y}); 682 my ($bx, $by) = ($self->{x}, $self->{y});
596 683
597 $self->{motion} = sub { 684 $self->{motion} = sub {
… …
626 glEnable GL_BLEND; 713 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
628 glEnable GL_TEXTURE_2D; 715 glEnable GL_TEXTURE_2D;
629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
630 717
718 my $border = $self->border;
719
631 glColor @{ $self->{border_bg} }; 720 glColor @{ $self->{border_bg} };
632 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 721 $tex[1]->draw_quad (0, 0, $w, $border);
633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 722 $tex[3]->draw_quad (0, $border, $border, $ch);
634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 723 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 724 $tex[4]->draw_quad (0, $h - $border, $w, $border);
636 725
637 my $bg = $tex[0]; 726 my $bg = $tex[0];
638 727
639 # TODO: repeat texture not scale 728 # TODO: repeat texture not scale
640 my $rep_x = $cw / $bg->{w}; 729 my $rep_x = $cw / $bg->{w};
641 my $rep_y = $ch / $bg->{h}; 730 my $rep_y = $ch / $bg->{h};
642 731
643 glColor @{ $self->{bg} }; 732 glColor @{ $self->{bg} };
733
734 $bg->{s} = $rep_x;
735 $bg->{t} = $rep_y;
736 $bg->{wrap_mode} = 1;
644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 737 $bg->draw_quad ($border, $border, $cw, $ch);
645 738
646 glDisable GL_TEXTURE_2D; 739 glDisable GL_TEXTURE_2D;
647 glDisable GL_BLEND; 740 glDisable GL_BLEND;
648 741
649 $self->child->draw; 742 $self->child->draw;
… …
667 @_ 760 @_
668 ) 761 )
669} 762}
670 763
671sub add { 764sub add {
672 my ($self, $x, $y, $chld) = @_; 765 my ($self, $x, $y, $child) = @_;
673 766
767 $child->set_parent ($self);
674 $self->{children}[$y][$x] = $chld; 768 $self->{children}[$y][$x] = $child;
675 $chld->set_parent ($self);
676 769
677 $self->{w} = $self->{h} = -1; 770 $child->check_size;
771}
772
773# TODO: move to container class maybe? send childs a signal on removal?
774sub clear {
775 my ($self) = @_;
776
777 delete $self->{children};
678 $self->update; 778 $self->update;
679} 779}
680 780
681sub get_wh { 781sub get_wh {
682 my ($self) = @_; 782 my ($self) = @_;
… …
710 (sum @$hs), 810 (sum @$hs),
711 ) 811 )
712} 812}
713 813
714sub size_allocate { 814sub size_allocate {
715 my ($self, $x, $y, $w, $h) = @_; 815 my ($self, $w, $h) = @_;
716
717 $self->_size_allocate ($x, $y, $w, $h) or return;
718 816
719 my ($ws, $hs) = $self->get_wh; 817 my ($ws, $hs) = $self->get_wh;
720 818
721 my $req_w = sum @$ws; 819 my $req_w = sum @$ws;
722 my $req_h = sum @$hs; 820 my $req_h = sum @$hs;
… …
727 my $col_expand = (sum @col_expand) || 1; 825 my $col_expand = (sum @col_expand) || 1;
728 826
729 # linearly scale sizes 827 # linearly scale sizes
730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 828 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 829 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
830
831 CFClient::UI::harmonize $ws;
832 CFClient::UI::harmonize $hs;
732 833
733 my $y; 834 my $y;
734 835
735 for my $r (0 .. $#{$self->{children}}) { 836 for my $r (0 .. $#{$self->{children}}) {
736 my $row = $self->{children}[$r] 837 my $row = $self->{children}[$r]
… …
741 842
742 for my $c (0 .. $#$row) { 843 for my $c (0 .. $#$row) {
743 my $col_w = $ws->[$c]; 844 my $col_w = $ws->[$c];
744 845
745 if (my $widget = $row->[$c]) { 846 if (my $widget = $row->[$c]) {
746 $widget->size_allocate ($x, $y, $col_w, $row_h); 847 $widget->configure ($x, $y, $col_w, $row_h);
747 } 848 }
748 849
749 $x += $col_w; 850 $x += $col_w;
750 } 851 }
751 852
… …
796 (List::Util::max map $_->[1], @alloc), 897 (List::Util::max map $_->[1], @alloc),
797 ) 898 )
798} 899}
799 900
800sub size_allocate { 901sub size_allocate {
801 my ($self, $x, $y, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
802
803 $self->_size_allocate ($x, $y, $w, $h);
804 903
805 ($h, $w) = ($w, $h); 904 ($h, $w) = ($w, $h);
806 905
807 my $children = $self->{children}; 906 my $children = $self->{children};
808 907
… …
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 923 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h; 924 $h[$_] = $alloc_h;
826 } 925 }
827 } 926 }
828 927
928 CFClient::UI::harmonize \@h;
929
829 my $y = 0; 930 my $y = 0;
830 for (0 .. $#$children) { 931 for (0 .. $#$children) {
831 my $child = $children->[$_]; 932 my $child = $children->[$_];
832 my $h = $h[$_]; 933 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 934 $child->configure ($y, 0, $h, $w);
834 935
835 $y += $h; 936 $y += $h;
836 } 937 }
938
939 1
837} 940}
838 941
839############################################################################# 942#############################################################################
840 943
841package CFClient::UI::VBox; 944package CFClient::UI::VBox;
… …
854 (List::Util::sum map $_->[1], @alloc), 957 (List::Util::sum map $_->[1], @alloc),
855 ) 958 )
856} 959}
857 960
858sub size_allocate { 961sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 962 my ($self, $w, $h) = @_;
860
861 $self->_size_allocate ($x, $y, $w, $h);
862 963
863 my $children = $self->{children}; 964 my $children = $self->{children};
864 965
865 my @h = map +($_->size_request)[1], @$children; 966 my @h = map +($_->size_request)[1], @$children;
866 967
… …
878 979
879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 980 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
880 } 981 }
881 } 982 }
882 983
984 CFClient::UI::harmonize \@h;
985
883 my $y = 0; 986 my $y = 0;
884 for (0 .. $#$children) { 987 for (0 .. $#$children) {
885 my $child = $children->[$_]; 988 my $child = $children->[$_];
886 my $h = $h[$_]; 989 my $h = $h[$_];
887 $child->size_allocate (0, $y, $w, $h); 990 $child->configure (0, $y, $w, $h);
888 991
889 $y += $h; 992 $y += $h;
890 } 993 }
994
995 1
891} 996}
892 997
893############################################################################# 998#############################################################################
894 999
895package CFClient::UI::Label; 1000package CFClient::UI::Label;
… …
900 1005
901sub new { 1006sub new {
902 my ($class, %arg) = @_; 1007 my ($class, %arg) = @_;
903 1008
904 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
905 fg => [1, 1, 1], 1010 fg => [1, 1, 1],
906 height => $::FONTSIZE, 1011 fontsize => 1,
907 text => "", 1012 text => "",
908 align => -1, 1013 align => -1,
1014 valign => -1,
909 padding => 2, 1015 padding => 2,
910 layout => new CFClient::Layout, 1016 layout => new CFClient::Layout,
911 %arg 1017 %arg
912 ); 1018 );
913 1019
914 $self->set_text ($self->{text}); 1020 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1021
1022 $self->set_text (delete $self->{text}) if exists $self->{text};
1023 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
915 1024
916 $self 1025 $self
917} 1026}
918 1027
919sub escape_text { 1028sub escape_text {
… …
927} 1036}
928 1037
929sub set_text { 1038sub set_text {
930 my ($self, $text) = @_; 1039 my ($self, $text) = @_;
931 1040
932 $self->{text} = $text;
933 $self->{layout}->set_markup ($text); 1041 $self->{layout}->set_text ($text);
934 1042
935 delete $self->{texture}; 1043 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
937 $self->update; 1044 $self->update;
938} 1045}
939 1046
940sub get_text { 1047sub set_markup {
941 my ($self, $text) = @_; 1048 my ($self, $markup) = @_;
942 1049
943 $self->{text} 1050 $self->{layout}->set_markup ($markup);
1051
1052 delete $self->{texture};
1053 $self->update;
944} 1054}
945 1055
946sub size_request { 1056sub size_request {
947 my ($self) = @_; 1057 my ($self) = @_;
948 1058
949 $self->{layout}->set_width; 1059 $self->{layout}->set_width;
950 $self->{layout}->set_height ($self->{height}); 1060 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1061
951 my ($w, $h) = $self->{layout}->size; 1062 my ($w, $h) = $self->{layout}->size;
952 1063
953 ( 1064 (
954 $w + $self->{padding} * 2, 1065 $w + $self->{padding} * 2,
955 $h + $self->{padding} * 2, 1066 $h + $self->{padding} * 2,
956 ) 1067 )
957} 1068}
958 1069
959sub size_allocate { 1070sub size_allocate {
960 my ($self, $x, $y, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
961
962 $self->_size_allocate ($x, $y, $w, $h) or return;
963 1072
964 delete $self->{texture}; 1073 delete $self->{texture};
965}
966
967sub update {
968 my ($self) = @_;
969
970 delete $self->{texture};
971 $self->SUPER::update;
972} 1074}
973 1075
974sub _draw { 1076sub _draw {
975 my ($self) = @_; 1077 my ($self) = @_;
976 1078
977 my $tex = $self->{texture} ||= do { 1079 my $tex = $self->{texture} ||= do {
978 $self->{layout}->set_width ($self->{w}); 1080 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1081 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
980 new_from_layout CFClient::Texture $self->{layout} 1082 new_from_layout CFClient::Texture $self->{layout}
981 }; 1083 };
982 1084
983 glEnable GL_BLEND; 1085 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1086 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D; 1087 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1088 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987 1089
988 glColor @{$self->{fg}}; 1090 glColor @{$self->{fg}};
989 1091
990 my $x = 1092 $self->{ox} = int (
991 $self->{align} < 0 ? $self->{padding} 1093 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1094 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5; 1095 : ($self->{w} - $tex->{w}) * 0.5
1096 );
994 1097
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1098 $self->{oy} = int (
996 $tex->draw_quad (0, 0); 1099 $self->{valign} < 0 ? $self->{padding}
1100 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1101 : ($self->{h} - $tex->{h}) * 0.5
1102 );
1103
1104 $tex->draw_quad ($self->{ox}, $self->{oy});
997 1105
998 glDisable GL_TEXTURE_2D; 1106 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND; 1107 glDisable GL_BLEND;
1000} 1108}
1001 1109
1002############################################################################# 1110#############################################################################
1003 1111
1004package CFClient::UI::Entry; 1112package CFClient::UI::EntryBase;
1005 1113
1006our @ISA = CFClient::UI::Label::; 1114our @ISA = CFClient::UI::Label::;
1007 1115
1008use SDL;
1009use SDL::OpenGL; 1116use SDL::OpenGL;
1010 1117
1011sub new { 1118sub new {
1012 my $class = shift; 1119 my $class = shift;
1013 1120
… …
1016 bg => [0, 0, 0, 0.2], 1123 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1, 0.5], 1124 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0], 1125 active_fg => [0, 0, 0],
1019 can_hover => 1, 1126 can_hover => 1,
1020 can_focus => 1, 1127 can_focus => 1,
1128 valign => 0,
1021 @_ 1129 @_
1022 ) 1130 )
1023} 1131}
1024 1132
1025sub _set_text { 1133sub _set_text {
1026 my ($self, $text) = @_; 1134 my ($self, $text) = @_;
1027 1135
1136 delete $self->{cur_h};
1137
1138 return if $self->{text} eq $text;
1139
1140 delete $self->{texture};
1141
1028 $self->{last_activity} = $::NOW; 1142 $self->{last_activity} = $::NOW;
1029
1030 $self->{text} = $text; 1143 $self->{text} = $text;
1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1033 1144
1034 $text =~ s/./*/g if $self->{hidden}; 1145 $text =~ s/./*/g if $self->{hidden};
1146 $self->{layout}->set_text ("$text ");
1035 1147
1036 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1148 $self->emit (changed => $self->{text});
1149}
1037 1150
1038 $text = substr $text, 0, $self->{cursor}; 1151sub get_text {
1039 utf8::encode $text; 1152 $_[0]{text}
1040
1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1042} 1153}
1043 1154
1044sub size_request { 1155sub size_request {
1045 my ($self) = @_; 1156 my ($self) = @_;
1046 1157
… …
1048 1159
1049 ($w + 1, $h) # add 1 for cursor 1160 ($w + 1, $h) # add 1 for cursor
1050} 1161}
1051 1162
1052sub size_allocate { 1163sub size_allocate {
1053 my ($self, $x, $y, $w, $h) = @_; 1164 my ($self, $w, $h) = @_;
1054
1055 $self->SUPER::size_allocate ($x, $y, $w, $h);
1056 1165
1057 $self->_set_text ($self->{text}); 1166 $self->_set_text ($self->{text});
1058} 1167}
1059 1168
1060sub set_text { 1169sub set_text {
… …
1073 1182
1074 my $uni = $ev->key_unicode; 1183 my $uni = $ev->key_unicode;
1075 1184
1076 my $text = $self->get_text; 1185 my $text = $self->get_text;
1077 1186
1078 if ($sym == SDLK_BACKSPACE) { 1187 if ($sym == 8) {
1079 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1188 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1080 } elsif ($sym == SDLK_DELETE) { 1189 } elsif ($sym == 127) {
1081 substr $text, $self->{cursor}, 1, ""; 1190 substr $text, $self->{cursor}, 1, "";
1082 } elsif ($sym == SDLK_LEFT) { 1191 } elsif ($sym == CFClient::SDLK_LEFT) {
1083 --$self->{cursor} if $self->{cursor}; 1192 --$self->{cursor} if $self->{cursor};
1084 } elsif ($sym == SDLK_RIGHT) { 1193 } elsif ($sym == CFClient::SDLK_RIGHT) {
1085 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1194 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) { 1195 } elsif ($sym == CFClient::SDLK_HOME) {
1087 $self->{cursor} = 0; 1196 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) { 1197 } elsif ($sym == CFClient::SDLK_END) {
1089 $self->{cursor} = length $text; 1198 $self->{cursor} = length $text;
1199 } elsif ($sym == 27) {
1200 $self->emit ('escape');
1090 } elsif ($uni) { 1201 } elsif ($uni) {
1091 substr $text, $self->{cursor}++, 0, chr $uni; 1202 substr $text, $self->{cursor}++, 0, chr $uni;
1092 } 1203 }
1093 1204
1094 $self->_set_text ($text); 1205 $self->_set_text ($text);
… …
1148 1259
1149 $self->SUPER::_draw; 1260 $self->SUPER::_draw;
1150 1261
1151 #TODO: force update every cursor change :( 1262 #TODO: force update every cursor change :(
1152 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1263 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1264
1265 unless (exists $self->{cur_h}) {
1266 my $text = substr $self->{text}, 0, $self->{cursor};
1267 utf8::encode $text;
1268
1269 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1270 }
1271
1153 glColor @{$self->{fg}}; 1272 glColor @{$self->{fg}};
1154 glBegin GL_LINES; 1273 glBegin GL_LINES;
1155 glVertex $self->{cur_x}, $self->{cur_y};
1156 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1274 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1275 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1157 glEnd; 1276 glEnd;
1158 } 1277 }
1159} 1278}
1160 1279
1161package CFClient::UI::LineEntry; 1280package CFClient::UI::Entry;
1162 1281
1163our @ISA = CFClient::UI::Entry::; 1282our @ISA = CFClient::UI::EntryBase::;
1164 1283
1165use SDL;
1166use SDL::OpenGL; 1284use SDL::OpenGL;
1167 1285
1168sub key_down { 1286sub key_down {
1169 my ($self, $ev) = @_; 1287 my ($self, $ev) = @_;
1170 1288
1171 my $sym = $ev->key_sym; 1289 my $sym = $ev->key_sym;
1172 1290
1173 if ($sym == SDLK_RETURN) { 1291 if ($sym == 13) {
1174 $self->emit (activate => $self->get_text); 1292 $self->emit (activate => $self->get_text);
1175 $self->update; 1293 $self->update;
1176 1294
1177 } else { 1295 } else {
1178 $self->SUPER::key_down ($ev); 1296 $self->SUPER::key_down ($ev);
… …
1184 1302
1185package CFClient::UI::Button; 1303package CFClient::UI::Button;
1186 1304
1187our @ISA = CFClient::UI::Label::; 1305our @ISA = CFClient::UI::Label::;
1188 1306
1189use SDL;
1190use SDL::OpenGL; 1307use SDL::OpenGL;
1191 1308
1192my @tex = 1309my @tex =
1193 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1310 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1194 qw(b1_button_active.png); 1311 qw(b1_button_active.png);
… …
1198 1315
1199 $class->SUPER::new ( 1316 $class->SUPER::new (
1200 padding => 4, 1317 padding => 4,
1201 fg => [1, 1, 1], 1318 fg => [1, 1, 1],
1202 bg => [1, 1, 1, 0.2], 1319 bg => [1, 1, 1, 0.2],
1203 active_fg => [1, 1, 0], 1320 active_fg => [0, 0, 1],
1204 can_hover => 1, 1321 can_hover => 1,
1322 align => 0,
1323 valign => 0,
1205 @_ 1324 @_
1206 ) 1325 )
1207} 1326}
1208 1327
1209sub button_up { 1328sub button_up {
… …
1217 1336
1218sub _draw { 1337sub _draw {
1219 my ($self) = @_; 1338 my ($self) = @_;
1220 1339
1221 local $self->{fg} = $self->{fg}; 1340 local $self->{fg} = $self->{fg};
1222 my $tex = $tex[0];
1223
1224 glEnable GL_BLEND;
1225 glEnable GL_TEXTURE_2D;
1226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1227 1341
1228 if ($GRAB == $self) { 1342 if ($GRAB == $self) {
1229 $self->{fg} = $self->{active_fg}; 1343 $self->{fg} = $self->{active_fg};
1230 } 1344 }
1231 1345
1232 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1346 glEnable GL_BLEND;
1347 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1348 glEnable GL_TEXTURE_2D;
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1350 glColor 0, 0, 0, 1;
1234 1351
1235 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1352 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1236 1353
1237 glDisable GL_TEXTURE_2D; 1354 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND; 1355 glDisable GL_BLEND;
1239 1356
1240 $self->SUPER::_draw; 1357 $self->SUPER::_draw;
… …
1244 1361
1245package CFClient::UI::CheckBox; 1362package CFClient::UI::CheckBox;
1246 1363
1247our @ISA = CFClient::UI::DrawBG::; 1364our @ISA = CFClient::UI::DrawBG::;
1248 1365
1249use SDL; 1366my @tex =
1367 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1368 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1369
1250use SDL::OpenGL; 1370use SDL::OpenGL;
1251 1371
1252sub new { 1372sub new {
1253 my $class = shift; 1373 my $class = shift;
1254 1374
… …
1266 my ($self) = @_; 1386 my ($self) = @_;
1267 1387
1268 ($self->{padding} * 2 + 6) x 2 1388 ($self->{padding} * 2 + 6) x 2
1269} 1389}
1270 1390
1271sub size_allocate {
1272 my ($self, $x, $y, $w, $h) = @_;
1273
1274 $self->_size_allocate ($x, $y, $w, $h);
1275}
1276
1277sub button_down { 1391sub button_down {
1278 my ($self, $ev, $x, $y) = @_; 1392 my ($self, $ev, $x, $y) = @_;
1279 1393
1280 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1394 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1281 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1395 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1290 $self->SUPER::_draw; 1404 $self->SUPER::_draw;
1291 1405
1292 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1406 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1293 1407
1294 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1408 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1409
1410 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1411
1412 glEnable GL_BLEND;
1413 glEnable GL_TEXTURE_2D;
1414 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1415
1416 my $tex = $self->{state} ? $tex[1] : $tex[0];
1417
1418 $tex->draw_quad (0, 0, $s, $s);
1419
1420 glDisable GL_TEXTURE_2D;
1421 glDisable GL_BLEND;
1422}
1423
1424#############################################################################
1425
1426package CFClient::UI::VGauge;
1427
1428our @ISA = CFClient::UI::Base::;
1429
1430use SDL::OpenGL;
1431
1432my %tex = (
1433 food => [
1434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1435 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1436 ],
1437 grace => [
1438 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1439 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1440 ],
1441 hp => [
1442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1443 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1444 ],
1445 mana => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1447 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1448 ],
1449);
1450
1451# eg. VGauge->new (gauge => 'food'), default gauge: food
1452sub new {
1453 my $class = shift;
1454
1455 my $self = $class->SUPER::new (gauge => 'food', @_);
1456
1457 $self
1458}
1459
1460sub size_request {
1461 my ($self) = @_;
1462
1463 my $tex = $tex{$self->{gauge}}[0];
1295 1464
1296 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1465 @$tex{qw(w h)}
1466}
1297 1467
1298 glBegin GL_LINE_LOOP; 1468sub set_max {
1299 glVertex 0 , 0; 1469 my ($self, $max) = @_;
1300 glVertex 0 , $s; 1470
1301 glVertex $s, $s; 1471 $self->{max_val} = $max;
1302 glVertex $s, 0; 1472}
1473
1474sub set_value {
1475 my ($self, $val, $max) = @_;
1476
1477 $self->set_max ($max)
1478 if defined $max;
1479
1480 $max = $self->{max_val};
1481 $self->{val} = $val;
1482
1483 $self->update;
1484}
1485
1486sub _draw {
1487 my ($self) = @_;
1488
1489 my $tex = $tex{$self->{gauge}};
1490
1491 my ($w, $h) = ($self->{w}, $self->{h});
1492
1493 my $ycut = $self->{val} / ($self->{max_val} || 1);
1494 $ycut = 1 if $self->{val} > $self->{max_val};
1495
1496 my $t1 = $tex->[0];
1497 my $t2 = $tex->[1];
1498
1499 glEnable GL_BLEND;
1500 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1501 glEnable GL_TEXTURE_2D;
1502 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1503
1504 my $h1 = $self->{h} - $ycut * $self->{h};
1505 my $h2 = $ycut * $self->{h};
1506
1507 my $yp = 0;
1508
1509 glBindTexture GL_TEXTURE_2D, $t1->{name};
1510 glBegin GL_QUADS;
1511 glTexCoord 0 , 0; glVertex 0 , $yp;
1512 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;
1513 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
1514 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;
1303 glEnd; 1515 glEnd;
1304 1516
1305 if ($self->{state}) { 1517 $yp += $h1;
1306 glBegin GL_LINES; 1518
1307 glVertex 0 , 0; 1519 glBindTexture GL_TEXTURE_2D, $t2->{name};
1308 glVertex $s, $s; 1520 glBegin GL_QUADS;
1309 glVertex $s, 0; 1521 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
1310 glVertex 0 , $s; 1522 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;
1523 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1524 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
1311 glEnd; 1525 glEnd;
1312 } 1526
1527 glDisable GL_BLEND;
1528 glDisable GL_TEXTURE_2D;
1313} 1529}
1314 1530
1315############################################################################# 1531#############################################################################
1316 1532
1317package CFClient::UI::Slider; 1533package CFClient::UI::Slider;
… …
1336 # TODO: calculations are off 1552 # TODO: calculations are off
1337 my $self = $class->SUPER::new ( 1553 my $self = $class->SUPER::new (
1338 fg => [1, 1, 1], 1554 fg => [1, 1, 1],
1339 active_fg => [0, 0, 0], 1555 active_fg => [0, 0, 0],
1340 range => [0, 0, 100, 10], 1556 range => [0, 0, 100, 10],
1341 req_w => 40, 1557 req_w => 20,
1342 req_h => 13, 1558 req_h => 20,
1343 vertical => 0, 1559 vertical => 0,
1344 can_hover => 1, 1560 can_hover => 1,
1561 inner_pad => 5,
1345 @_ 1562 @_
1346 ); 1563 );
1347 1564
1348 $self 1565 $self
1349} 1566}
… …
1370 if ($GRAB == $self) { 1587 if ($GRAB == $self) {
1371 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1588 my ($value, $lo, $hi, $page) = @{$self->{range}};
1372 1589
1373 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1590 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1374 1591
1592 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1593 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1594
1595 $x -= $inner_pad_px; # substract the padding
1375 $x = $x * ($hi - $lo) / $w + $lo; 1596 $x = $x * ($hi - $lo) / $inner_w + $lo;
1376 $x = $lo if $x < $lo; 1597 $x = $lo if $x < $lo;
1377 $x = $hi - $page if $x > $hi - $page; 1598 $x = $hi - $page if $x > $hi - $page;
1378 $self->{range}[0] = $x; 1599 $self->{range}[0] = $x;
1379 1600
1380 $self->emit (changed => $x); 1601 $self->emit (changed => $x);
1381 $self->update; 1602 $self->update;
1382 } 1603 }
1604}
1605
1606# the inner_* stuff is for generating a padding for the slider handle,
1607# so that the handle doesn't leave the texture. This calculation isn't 100%
1608# correct propably, but it does the job for now
1609sub _calc_inner_pad_px {
1610 my ($self, $w) = @_;
1611 ($w / 100) * $self->{inner_pad} # % to pixels
1383} 1612}
1384 1613
1385sub _draw { 1614sub _draw {
1386 my ($self) = @_; 1615 my ($self) = @_;
1387 1616
… …
1401 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1630 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1402 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1631 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1403 1632
1404 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1633 my ($value, $lo, $hi, $page) = @{$self->{range}};
1405 1634
1406 # the inner_* stuff is for generating a padding for the slider handle, 1635 $hi = $value + 1 if $lo == $hi;
1407 # so that the handle doesn't leave the texture. This calculation isn't 100% 1636
1408 # correct propably, but it does the job for now 1637 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1409 my $inner_pad = 5; # 5% of width for slider bg texture border
1410 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1411 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1638 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1412 1639
1413 $page = int $page * $inner_w / ($hi - $lo); 1640 $page = int $page * $inner_w / ($hi - $lo);
1414 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1641 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1415 1642
1416 $w -= $page; 1643 $w -= $page;
… …
1446 1673
1447sub new { 1674sub new {
1448 my $class = shift; 1675 my $class = shift;
1449 1676
1450 my $self = $class->SUPER::new ( 1677 my $self = $class->SUPER::new (
1678 fontsize => 1,
1679 @_,
1680
1681 layout => (new CFClient::Layout),
1451 par => [], 1682 par => [],
1452 @_, 1683 height => 0,
1453 children => [ 1684 children => [
1454 (new CFClient::UI::Empty expand => 1), 1685 (new CFClient::UI::Empty expand => 1),
1455 (new CFClient::UI::Slider vertical => 1), 1686 (new CFClient::UI::Slider vertical => 1),
1456 ], 1687 ],
1457 ); 1688 );
1458 1689
1690 $self->{children}[1]->connect (changed => sub {
1691 $self->update;
1692 });
1693
1459 $self 1694 $self
1695}
1696
1697sub set_fontsize {
1698 my ($self, $fontsize) = @_;
1699
1700 $self->{fontsize} = $fontsize;
1701 $self->reflow;
1702}
1703
1704sub text_height {
1705 my ($self, $text) = @_;
1706
1707 my $layout = $self->{layout};
1708
1709 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1710 $layout->set_width ($self->{w});
1711 $layout->set_text ($text);
1712
1713 ($layout->size)[1]
1714}
1715
1716sub reflow {
1717 my ($self) = @_;
1718
1719 $self->{need_reflow}++;
1720 $self->update;
1721}
1722
1723sub size_allocate {
1724 my ($self, $w, $h) = @_;
1725
1726 $self->SUPER::size_allocate ($w, $h);
1727
1728 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1729 $self->{layout}->set_width ($self->{children}[0]{w});
1730
1731 $self->reflow;
1460} 1732}
1461 1733
1462sub add_paragraph { 1734sub add_paragraph {
1463 my ($self, $color, $text) = @_; 1735 my ($self, $color, $text) = @_;
1464 1736
1737 #TODO: intelligently "reformat" paragraph
1738
1739 my $height = $self->text_height ($text);
1740
1741 $self->{height} += $height;
1742
1465 push @{$self->{par}}, [$color, $text]; 1743 push @{$self->{par}}, [$height, $color, $text];
1466 my $count = scalar @{$self->{par}}; 1744
1467 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 1745 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1468 $self->{children}[1]->update; 1746 $self->{children}[1]->update;
1469} 1747}
1470 1748
1749sub update {
1750 my ($self) = @_;
1751
1752 $self->SUPER::update;
1753
1754 return unless $self->{h} > 0;
1755
1756 delete $self->{texture};
1757
1758 $ROOT->on_refresh ($self, sub {
1759 if (delete $self->{need_reflow}) {
1760 my $height = 0;
1761
1762 $height += $_->[0] = $self->text_height ($_->[2])
1763 for @{$self->{par}};
1764
1765 $self->{height} = $height;
1766
1767 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1768
1769 delete $self->{texture};
1770 }
1771
1772 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1773 glClearColor 0, 0, 0, 1;
1774 glClear GL_COLOR_BUFFER_BIT;
1775
1776 glEnable GL_BLEND;
1777 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1778 glEnable GL_TEXTURE_2D;
1779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1780
1781 my $top = int $self->{children}[1]{range}[0];
1782
1783 my $y0 = $top;
1784 my $y1 = $top + $self->{h};
1785
1786 my $y = 0;
1787
1788 my $layout = $self->{layout};
1789
1790 for my $par (@{$self->{par}}) {
1791 my $h = $par->[0];
1792
1793 if ($y0 < $y + $h && $y < $y1) {
1794 $layout->set_text ($par->[2]);
1795
1796 glColor @{ $par->[1] };
1797 my ($W, $H) = $layout->size;
1798 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1799 }
1800
1801 $y += $h;
1802 }
1803
1804 glDisable GL_TEXTURE_2D;
1805 glDisable GL_BLEND;
1806 };
1807 });
1808}
1809
1471sub _draw { 1810sub _draw {
1472 my ($self) = @_; 1811 my ($self) = @_;
1473 1812
1474 my $par = $self->{par}; 1813 if ($self->{texture}) {
1475
1476 my $bottom = (scalar @$par) - 1;
1477
1478 my $w = $self->{children}[0]{w};
1479 my $y = $self->{h};
1480
1481 glEnable GL_BLEND;
1482 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1483 glEnable GL_TEXTURE_2D; 1814 glEnable GL_TEXTURE_2D;
1484 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1485 1816 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1486 # TODO: everything!
1487 while ($y > 0 && $bottom >= 0) {
1488 my $par = $par->[$bottom--];
1489
1490 my $layout = new CFClient::Layout;
1491
1492 $layout->set_height ($::FONTSIZE);
1493 $layout->set_width ($w);
1494 $layout->set_text ($par->[1]);
1495 my $tex = new_from_layout CFClient::Texture $layout;
1496 $y -= $tex->{h};
1497
1498 glColor @{ $par->[0] };
1499 $tex->draw_quad (0, $y);
1500 }
1501
1502 glDisable GL_TEXTURE_2D; 1817 glDisable GL_TEXTURE_2D;
1503 glDisable GL_BLEND;
1504}
1505
1506#############################################################################
1507
1508package CFClient::UI::MapWidget;
1509
1510use strict;
1511
1512use List::Util qw(min max);
1513
1514use SDL;
1515use SDL::OpenGL;
1516
1517our @ISA = CFClient::UI::Base::;
1518
1519sub new {
1520 my $class = shift;
1521
1522 $class->SUPER::new (
1523 z => -1,
1524 can_focus => 1,
1525 list => (glGenLists 1),
1526 @_
1527 ) 1818 }
1528}
1529 1819
1530sub key_down { 1820 $self->{children}[1]->draw;
1531 print "MAPKEYDOWN\n";
1532}
1533 1821
1534sub key_up {
1535}
1536
1537sub size_request {
1538 (
1539 1 + 32 * int $::WIDTH / 32,
1540 1 + 32 * int $::HEIGHT / 32,
1541 )
1542}
1543
1544sub update {
1545 my ($self) = @_;
1546
1547 $self->{need_update} = 1;
1548 $self->SUPER::update;
1549}
1550
1551sub draw {
1552 my ($self) = @_;
1553
1554 $self->{need_update}++;#d#
1555 if (delete $self->{need_update}) {
1556 glNewList $self->{list}, GL_COMPILE;
1557
1558 my $sw = int $::WIDTH / 32;
1559 my $sh = int $::HEIGHT / 32;
1560
1561 if ($::MAP) {
1562 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1563
1564 if ($::CFG->{fow_enable}) {
1565 if ($::CFG->{fow_smooth}) { # smooth fog of war
1566 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1567 glConvolutionFilter2D
1568 GL_CONVOLUTION_2D,
1569 GL_ALPHA,
1570 3, 3,
1571 GL_ALPHA, GL_FLOAT,
1572 pack "f*",
1573 0.1, 0.1, 0.1,
1574 0.1, 0.2, 0.1,
1575 0.1, 0.1, 0.1,
1576 ;
1577 glEnable GL_CONVOLUTION_2D;
1578 }
1579
1580 my $tex = new CFClient::Texture
1581 w => $w,
1582 h => $h,
1583 data => $data,
1584 internalformat => GL_ALPHA,
1585 format => GL_ALPHA;
1586
1587 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1588
1589 glEnable GL_BLEND;
1590 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1592
1593 glColor +($::CFG->{fow_intensity}) x 3, 1;
1594 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1595
1596 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND;
1598 }
1599 }
1600
1601 glEndList;
1602 }
1603
1604 glCallList $self->{list};
1605
1606 if ($FOCUS != $self) {
1607 glColor 64/255, 64/255, 64/255;
1608 glLogicOp GL_AND;
1609 glEnable GL_COLOR_LOGIC_OP;
1610 glBegin GL_QUADS;
1611 glVertex 0, 0;
1612 glVertex 0, $::HEIGHT;
1613 glVertex $::WIDTH, $::HEIGHT;
1614 glVertex $::WIDTH, 0;
1615 glEnd;
1616 glDisable GL_COLOR_LOGIC_OP;
1617 }
1618}
1619
1620my %DIR = (
1621 SDLK_KP8, [1, "north"],
1622 SDLK_KP9, [2, "northeast"],
1623 SDLK_KP6, [3, "east"],
1624 SDLK_KP3, [4, "southeast"],
1625 SDLK_KP2, [5, "south"],
1626 SDLK_KP1, [6, "southwest"],
1627 SDLK_KP4, [7, "west"],
1628 SDLK_KP7, [8, "northwest"],
1629
1630 SDLK_UP, [1, "north"],
1631 SDLK_RIGHT, [3, "east"],
1632 SDLK_DOWN, [5, "south"],
1633 SDLK_LEFT, [7, "west"],
1634);
1635
1636sub key_down {
1637 my ($self, $ev) = @_;
1638
1639 my $mod = $ev->key_mod;
1640 my $sym = $ev->key_sym;
1641
1642 if ($sym == SDLK_KP5) {
1643 $::CONN->user_send ("command stay fire");
1644 } elsif ($sym == SDLK_a) {
1645 $::CONN->user_send ("command apply");
1646 } elsif (exists $DIR{$sym}) {
1647 if ($mod & KMOD_SHIFT) {
1648 $self->{shft}++;
1649 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1650 } elsif ($mod & KMOD_CTRL) {
1651 $self->{ctrl}++;
1652 $::CONN->user_send ("command run $DIR{$sym}[0]");
1653 } else {
1654 $::CONN->user_send ("command $DIR{$sym}[1]");
1655 }
1656 }
1657}
1658
1659sub key_up {
1660 my ($self, $ev) = @_;
1661
1662 my $mod = $ev->key_mod;
1663 my $sym = $ev->key_sym;
1664
1665 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1666 $::CONN->user_send ("command fire_stop");
1667 }
1668 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1669 $::CONN->user_send ("command run_stop");
1670 }
1671} 1822}
1672 1823
1673############################################################################# 1824#############################################################################
1674 1825
1675package CFClient::UI::Animator; 1826package CFClient::UI::Animator;
… …
1738sub toggle_flopper { 1889sub toggle_flopper {
1739 my ($self) = @_; 1890 my ($self) = @_;
1740 1891
1741 # TODO: use animation 1892 # TODO: use animation
1742 if ($self->{state} = !$self->{state}) { 1893 if ($self->{state} = !$self->{state}) {
1743 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1894 $CFClient::UI::ROOT->add ($self->{other});
1744 $self->{other}->move ( 1895 $self->{other}->move ($self->coord2global (0, $self->{h}));
1745 ($::WIDTH - $self->{other}{w}) * 0.5, 1896 $self->emit ("open");
1746 ($::HEIGHT - $self->{other}{h}) * 0.5,
1747 );
1748 } else { 1897 } else {
1749 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1898 $CFClient::UI::ROOT->remove ($self->{other});
1899 $self->emit ("close");
1750 } 1900 }
1751}
1752 1901
1753############################################################################# 1902 $self->emit (changed => $self->{state});
1903}
1754 1904
1905#############################################################################
1906
1755package CFClient::UI::Toplevel; 1907package CFClient::UI::Root;
1756 1908
1757our @ISA = CFClient::UI::Container::; 1909our @ISA = CFClient::UI::Container::;
1910
1911use SDL::OpenGL;
1912
1913sub check_size {
1914 my ($self) = @_;
1915
1916 $self->configure (0, 0, $::WITH, $::HEIGHT);
1917}
1758 1918
1759sub size_request { 1919sub size_request {
1760 ($::WIDTH, $::HEIGHT) 1920 ($::WIDTH, $::HEIGHT)
1761} 1921}
1762 1922
1763sub size_allocate { 1923sub configure {
1764 my ($self, $x, $y, $w, $h) = @_; 1924 my ($self, $x, $y, $w, $h) = @_;
1765 1925
1766 $self->_size_allocate ($x, $y, $w, $h); 1926 $self->SUPER::configure ($x, $y, $w, $h);
1767 1927
1768 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1928 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1769 for @{$self->{children}}; 1929 for @{$self->{children}};
1770} 1930}
1771 1931
1772sub translate { 1932sub _topleft {
1773 my ($self, $x, $y) = @_; 1933 my ($self, $x, $y) = @_;
1774 1934
1775 ($x, $y) 1935 ($x, $y)
1776} 1936}
1777 1937
1778sub update { 1938sub update {
1779 my ($self) = @_; 1939 my ($self) = @_;
1780 1940
1781 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 1941 $self->check_size;
1782 ::refresh (); 1942 ::refresh ();
1783} 1943}
1784 1944
1785sub add { 1945sub add {
1786 my ($self, $widget) = @_; 1946 my ($self, $child) = @_;
1787 1947
1788 $self->SUPER::add ($widget); 1948 $self->SUPER::add ($child);
1949}
1789 1950
1790 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 1951sub on_refresh {
1952 my ($self, $id, $cb) = @_;
1953
1954 $self->{refresh_hook}{$id} = $cb;
1791} 1955}
1792 1956
1793sub draw { 1957sub draw {
1794 my ($self) = @_; 1958 my ($self) = @_;
1795 1959
1960 while (my $rcb = delete $self->{refresh_hook}) {
1961 $_->() for values %$rcb;
1962 }
1963
1964 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1965 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1966 glClear GL_COLOR_BUFFER_BIT;
1967
1968 glMatrixMode GL_PROJECTION;
1969 glLoadIdentity;
1970 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
1971 glMatrixMode GL_MODELVIEW;
1972 glLoadIdentity;
1973
1796 $self->_draw; 1974 $self->_draw;
1797} 1975}
1798 1976
1799############################################################################# 1977#############################################################################
1800 1978
1801package CFClient::UI; 1979package CFClient::UI;
1802 1980
1803$TOPLEVEL = new CFClient::UI::Toplevel; 1981$ROOT = new CFClient::UI::Root;
1804 1982
18051 19831
1806 1984

Diff Legend

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