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.100 by elmex, Fri Apr 14 11:32:22 2006 UTC vs.
Revision 1.137 by root, Wed Apr 19 21:38:05 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;
… …
21 $FOCUS->key_up ($_[0]) if $FOCUS; 21 $FOCUS->key_up ($_[0]) if $FOCUS;
22} 22}
23 23
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->{x}, $ev->{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->{x}, $ev->{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;
54 } 54 }
55} 55}
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->{x}, $ev->{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};
… …
643 glColor @{ $self->{bg} }; 732 glColor @{ $self->{bg} };
644 733
645 $bg->{s} = $rep_x; 734 $bg->{s} = $rep_x;
646 $bg->{t} = $rep_y; 735 $bg->{t} = $rep_y;
647 $bg->{wrap_mode} = 1; 736 $bg->{wrap_mode} = 1;
648 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 737 $bg->draw_quad ($border, $border, $cw, $ch);
649 738
650 glDisable GL_TEXTURE_2D; 739 glDisable GL_TEXTURE_2D;
651 glDisable GL_BLEND; 740 glDisable GL_BLEND;
652 741
653 $self->child->draw; 742 $self->child->draw;
… …
671 @_ 760 @_
672 ) 761 )
673} 762}
674 763
675sub add { 764sub add {
676 my ($self, $x, $y, $chld) = @_; 765 my ($self, $x, $y, $child) = @_;
677 766
767 $child->set_parent ($self);
678 $self->{children}[$y][$x] = $chld; 768 $self->{children}[$y][$x] = $child;
679 $chld->set_parent ($self);
680 769
681 $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};
682 $self->update; 778 $self->update;
683} 779}
684 780
685sub get_wh { 781sub get_wh {
686 my ($self) = @_; 782 my ($self) = @_;
… …
714 (sum @$hs), 810 (sum @$hs),
715 ) 811 )
716} 812}
717 813
718sub size_allocate { 814sub size_allocate {
719 my ($self, $x, $y, $w, $h) = @_; 815 my ($self, $w, $h) = @_;
720
721 $self->_size_allocate ($x, $y, $w, $h) or return;
722 816
723 my ($ws, $hs) = $self->get_wh; 817 my ($ws, $hs) = $self->get_wh;
724 818
725 my $req_w = sum @$ws; 819 my $req_w = sum @$ws;
726 my $req_h = sum @$hs; 820 my $req_h = sum @$hs;
… …
731 my $col_expand = (sum @col_expand) || 1; 825 my $col_expand = (sum @col_expand) || 1;
732 826
733 # linearly scale sizes 827 # linearly scale sizes
734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 828 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735 $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;
736 833
737 my $y; 834 my $y;
738 835
739 for my $r (0 .. $#{$self->{children}}) { 836 for my $r (0 .. $#{$self->{children}}) {
740 my $row = $self->{children}[$r] 837 my $row = $self->{children}[$r]
… …
745 842
746 for my $c (0 .. $#$row) { 843 for my $c (0 .. $#$row) {
747 my $col_w = $ws->[$c]; 844 my $col_w = $ws->[$c];
748 845
749 if (my $widget = $row->[$c]) { 846 if (my $widget = $row->[$c]) {
750 $widget->size_allocate ($x, $y, $col_w, $row_h); 847 $widget->configure ($x, $y, $col_w, $row_h);
751 } 848 }
752 849
753 $x += $col_w; 850 $x += $col_w;
754 } 851 }
755 852
… …
800 (List::Util::max map $_->[1], @alloc), 897 (List::Util::max map $_->[1], @alloc),
801 ) 898 )
802} 899}
803 900
804sub size_allocate { 901sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
806
807 $self->_size_allocate ($x, $y, $w, $h);
808 903
809 ($h, $w) = ($w, $h); 904 ($h, $w) = ($w, $h);
810 905
811 my $children = $self->{children}; 906 my $children = $self->{children};
812 907
… …
828 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 923 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829 $h[$_] = $alloc_h; 924 $h[$_] = $alloc_h;
830 } 925 }
831 } 926 }
832 927
928 CFClient::UI::harmonize \@h;
929
833 my $y = 0; 930 my $y = 0;
834 for (0 .. $#$children) { 931 for (0 .. $#$children) {
835 my $child = $children->[$_]; 932 my $child = $children->[$_];
836 my $h = $h[$_]; 933 my $h = $h[$_];
837 $child->size_allocate ($y, 0, $h, $w); 934 $child->configure ($y, 0, $h, $w);
838 935
839 $y += $h; 936 $y += $h;
840 } 937 }
938
939 1
841} 940}
842 941
843############################################################################# 942#############################################################################
844 943
845package CFClient::UI::VBox; 944package CFClient::UI::VBox;
… …
858 (List::Util::sum map $_->[1], @alloc), 957 (List::Util::sum map $_->[1], @alloc),
859 ) 958 )
860} 959}
861 960
862sub size_allocate { 961sub size_allocate {
863 my ($self, $x, $y, $w, $h) = @_; 962 my ($self, $w, $h) = @_;
864
865 $self->_size_allocate ($x, $y, $w, $h);
866 963
867 my $children = $self->{children}; 964 my $children = $self->{children};
868 965
869 my @h = map +($_->size_request)[1], @$children; 966 my @h = map +($_->size_request)[1], @$children;
870 967
… …
882 979
883 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 980 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
884 } 981 }
885 } 982 }
886 983
984 CFClient::UI::harmonize \@h;
985
887 my $y = 0; 986 my $y = 0;
888 for (0 .. $#$children) { 987 for (0 .. $#$children) {
889 my $child = $children->[$_]; 988 my $child = $children->[$_];
890 my $h = $h[$_]; 989 my $h = $h[$_];
891 $child->size_allocate (0, $y, $w, $h); 990 $child->configure (0, $y, $w, $h);
892 991
893 $y += $h; 992 $y += $h;
894 } 993 }
994
995 1
895} 996}
896 997
897############################################################################# 998#############################################################################
898 999
899package CFClient::UI::Label; 1000package CFClient::UI::Label;
… …
904 1005
905sub new { 1006sub new {
906 my ($class, %arg) = @_; 1007 my ($class, %arg) = @_;
907 1008
908 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
909 fg => [1, 1, 1], 1010 fg => [1, 1, 1],
910 height => $::FONTSIZE, 1011 fontsize => 1,
911 text => "", 1012 text => "",
912 align => -1, 1013 align => -1,
1014 valign => -1,
913 padding => 2, 1015 padding => 2,
914 layout => new CFClient::Layout, 1016 layout => new CFClient::Layout,
915 %arg 1017 %arg
916 ); 1018 );
917 1019
918 $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};
919 1024
920 $self 1025 $self
921} 1026}
922 1027
923sub escape_text { 1028sub escape_text {
… …
931} 1036}
932 1037
933sub set_text { 1038sub set_text {
934 my ($self, $text) = @_; 1039 my ($self, $text) = @_;
935 1040
936 $self->{text} = $text;
937 $self->{layout}->set_markup ($text); 1041 $self->{layout}->set_text ($text);
938 1042
939 delete $self->{texture}; 1043 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
941 $self->update; 1044 $self->update;
942} 1045}
943 1046
944sub get_text { 1047sub set_markup {
945 my ($self, $text) = @_; 1048 my ($self, $markup) = @_;
946 1049
947 $self->{text} 1050 $self->{layout}->set_markup ($markup);
1051
1052 delete $self->{texture};
1053 $self->update;
948} 1054}
949 1055
950sub size_request { 1056sub size_request {
951 my ($self) = @_; 1057 my ($self) = @_;
952 1058
953 $self->{layout}->set_width; 1059 $self->{layout}->set_width;
954 $self->{layout}->set_height ($self->{height}); 1060 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1061
955 my ($w, $h) = $self->{layout}->size; 1062 my ($w, $h) = $self->{layout}->size;
956 1063
957 ( 1064 (
958 $w + $self->{padding} * 2, 1065 $w + $self->{padding} * 2,
959 $h + $self->{padding} * 2, 1066 $h + $self->{padding} * 2,
960 ) 1067 )
961} 1068}
962 1069
963sub size_allocate { 1070sub size_allocate {
964 my ($self, $x, $y, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
965
966 $self->_size_allocate ($x, $y, $w, $h) or return;
967 1072
968 delete $self->{texture}; 1073 delete $self->{texture};
969}
970
971sub update {
972 my ($self) = @_;
973
974 delete $self->{texture};
975 $self->SUPER::update;
976} 1074}
977 1075
978sub _draw { 1076sub _draw {
979 my ($self) = @_; 1077 my ($self) = @_;
980 1078
981 my $tex = $self->{texture} ||= do { 1079 my $tex = $self->{texture} ||= do {
982 $self->{layout}->set_width ($self->{w}); 1080 $self->{layout}->set_width ($self->{w});
983 $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);
984 new_from_layout CFClient::Texture $self->{layout} 1082 new_from_layout CFClient::Texture $self->{layout}
985 }; 1083 };
986 1084
987 glEnable GL_BLEND; 1085 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1086 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989 glEnable GL_TEXTURE_2D; 1087 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1088 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991 1089
992 glColor @{$self->{fg}}; 1090 glColor @{$self->{fg}};
993 1091
994 my $x = 1092 $self->{ox} = int (
995 $self->{align} < 0 ? $self->{padding} 1093 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1094 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5; 1095 : ($self->{w} - $tex->{w}) * 0.5
1096 );
998 1097
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1098 $self->{oy} = int (
1000 $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});
1001 1105
1002 glDisable GL_TEXTURE_2D; 1106 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND; 1107 glDisable GL_BLEND;
1004} 1108}
1005 1109
1006############################################################################# 1110#############################################################################
1007 1111
1008package CFClient::UI::Entry; 1112package CFClient::UI::EntryBase;
1009 1113
1010our @ISA = CFClient::UI::Label::; 1114our @ISA = CFClient::UI::Label::;
1011 1115
1012use SDL;
1013use SDL::OpenGL; 1116use SDL::OpenGL;
1014 1117
1015sub new { 1118sub new {
1016 my $class = shift; 1119 my $class = shift;
1017 1120
… …
1020 bg => [0, 0, 0, 0.2], 1123 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5], 1124 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0], 1125 active_fg => [0, 0, 0],
1023 can_hover => 1, 1126 can_hover => 1,
1024 can_focus => 1, 1127 can_focus => 1,
1128 valign => 0,
1025 @_ 1129 @_
1026 ) 1130 )
1027} 1131}
1028 1132
1029sub _set_text { 1133sub _set_text {
1030 my ($self, $text) = @_; 1134 my ($self, $text) = @_;
1031 1135
1032 my $old_text = $self->{text}; 1136 delete $self->{cur_h};
1137
1138 return if $self->{text} eq $text;
1139
1140 delete $self->{texture};
1033 1141
1034 $self->{last_activity} = $::NOW; 1142 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text; 1143 $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 1144
1040 $text =~ s/./*/g if $self->{hidden}; 1145 $text =~ s/./*/g if $self->{hidden};
1146 $self->{layout}->set_text ("$text ");
1041 1147
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1148 $self->emit (changed => $self->{text});
1149}
1043 1150
1044 $text = substr $text, 0, $self->{cursor}; 1151sub get_text {
1045 utf8::encode $text; 1152 $_[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} 1153}
1052 1154
1053sub size_request { 1155sub size_request {
1054 my ($self) = @_; 1156 my ($self) = @_;
1055 1157
… …
1057 1159
1058 ($w + 1, $h) # add 1 for cursor 1160 ($w + 1, $h) # add 1 for cursor
1059} 1161}
1060 1162
1061sub size_allocate { 1163sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_; 1164 my ($self, $w, $h) = @_;
1063
1064 $self->SUPER::size_allocate ($x, $y, $w, $h);
1065 1165
1066 $self->_set_text ($self->{text}); 1166 $self->_set_text ($self->{text});
1067} 1167}
1068 1168
1069sub set_text { 1169sub set_text {
… …
1075} 1175}
1076 1176
1077sub key_down { 1177sub key_down {
1078 my ($self, $ev) = @_; 1178 my ($self, $ev) = @_;
1079 1179
1080 my $mod = $ev->key_mod; 1180 my $mod = $ev->{mod};
1081 my $sym = $ev->key_sym; 1181 my $sym = $ev->{sym};
1082
1083 my $uni = $ev->key_unicode; 1182 my $uni = $ev->{unicode};
1084 1183
1085 my $text = $self->get_text; 1184 my $text = $self->get_text;
1086 1185
1087 if ($sym == SDLK_BACKSPACE) { 1186 if ($sym == 8) {
1088 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1187 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089 } elsif ($sym == SDLK_DELETE) { 1188 } elsif ($sym == 127) {
1090 substr $text, $self->{cursor}, 1, ""; 1189 substr $text, $self->{cursor}, 1, "";
1091 } elsif ($sym == SDLK_LEFT) { 1190 } elsif ($sym == CFClient::SDLK_LEFT) {
1092 --$self->{cursor} if $self->{cursor}; 1191 --$self->{cursor} if $self->{cursor};
1093 } elsif ($sym == SDLK_RIGHT) { 1192 } elsif ($sym == CFClient::SDLK_RIGHT) {
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1193 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) { 1194 } elsif ($sym == CFClient::SDLK_HOME) {
1096 $self->{cursor} = 0; 1195 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) { 1196 } elsif ($sym == CFClient::SDLK_END) {
1098 $self->{cursor} = length $text; 1197 $self->{cursor} = length $text;
1198 } elsif ($sym == 27) {
1199 $self->emit ('escape');
1099 } elsif ($uni) { 1200 } elsif ($uni) {
1100 substr $text, $self->{cursor}++, 0, chr $uni; 1201 substr $text, $self->{cursor}++, 0, chr $uni;
1101 } 1202 }
1102 1203
1103 $self->_set_text ($text); 1204 $self->_set_text ($text);
… …
1157 1258
1158 $self->SUPER::_draw; 1259 $self->SUPER::_draw;
1159 1260
1160 #TODO: force update every cursor change :( 1261 #TODO: force update every cursor change :(
1161 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1262 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1263
1264 unless (exists $self->{cur_h}) {
1265 my $text = substr $self->{text}, 0, $self->{cursor};
1266 utf8::encode $text;
1267
1268 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1269 }
1270
1162 glColor @{$self->{fg}}; 1271 glColor @{$self->{fg}};
1163 glBegin GL_LINES; 1272 glBegin GL_LINES;
1164 glVertex $self->{cur_x}, $self->{cur_y};
1165 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1273 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1274 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1166 glEnd; 1275 glEnd;
1167 } 1276 }
1168} 1277}
1169 1278
1170package CFClient::UI::LineEntry; 1279package CFClient::UI::Entry;
1171 1280
1172our @ISA = CFClient::UI::Entry::; 1281our @ISA = CFClient::UI::EntryBase::;
1173 1282
1174use SDL;
1175use SDL::OpenGL; 1283use SDL::OpenGL;
1176 1284
1177sub key_down { 1285sub key_down {
1178 my ($self, $ev) = @_; 1286 my ($self, $ev) = @_;
1179 1287
1180 my $sym = $ev->key_sym; 1288 my $sym = $ev->{sym};
1181 1289
1182 if ($sym == SDLK_RETURN) { 1290 if ($sym == 13) {
1183 $self->emit (activate => $self->get_text); 1291 $self->emit (activate => $self->get_text);
1184 $self->update; 1292 $self->update;
1185 1293
1186 } else { 1294 } else {
1187 $self->SUPER::key_down ($ev); 1295 $self->SUPER::key_down ($ev);
… …
1193 1301
1194package CFClient::UI::Button; 1302package CFClient::UI::Button;
1195 1303
1196our @ISA = CFClient::UI::Label::; 1304our @ISA = CFClient::UI::Label::;
1197 1305
1198use SDL;
1199use SDL::OpenGL; 1306use SDL::OpenGL;
1200 1307
1201my @tex = 1308my @tex =
1202 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1309 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1203 qw(b1_button_active.png); 1310 qw(b1_button_active.png);
… …
1207 1314
1208 $class->SUPER::new ( 1315 $class->SUPER::new (
1209 padding => 4, 1316 padding => 4,
1210 fg => [1, 1, 1], 1317 fg => [1, 1, 1],
1211 bg => [1, 1, 1, 0.2], 1318 bg => [1, 1, 1, 0.2],
1212 active_fg => [1, 1, 0], 1319 active_fg => [0, 0, 1],
1213 can_hover => 1, 1320 can_hover => 1,
1321 align => 0,
1322 valign => 0,
1214 @_ 1323 @_
1215 ) 1324 )
1216} 1325}
1217 1326
1218sub button_up { 1327sub button_up {
… …
1226 1335
1227sub _draw { 1336sub _draw {
1228 my ($self) = @_; 1337 my ($self) = @_;
1229 1338
1230 local $self->{fg} = $self->{fg}; 1339 local $self->{fg} = $self->{fg};
1231 my $tex = $tex[0];
1232
1233 glEnable GL_BLEND;
1234 glEnable GL_TEXTURE_2D;
1235 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1236 1340
1237 if ($GRAB == $self) { 1341 if ($GRAB == $self) {
1238 $self->{fg} = $self->{active_fg}; 1342 $self->{fg} = $self->{active_fg};
1239 } 1343 }
1240 1344
1241 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1345 glEnable GL_BLEND;
1346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1347 glEnable GL_TEXTURE_2D;
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1349 glColor 0, 0, 0, 1;
1243 1350
1244 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1351 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1245 1352
1246 glDisable GL_TEXTURE_2D; 1353 glDisable GL_TEXTURE_2D;
1247 glDisable GL_BLEND; 1354 glDisable GL_BLEND;
1248 1355
1249 $self->SUPER::_draw; 1356 $self->SUPER::_draw;
… …
1253 1360
1254package CFClient::UI::CheckBox; 1361package CFClient::UI::CheckBox;
1255 1362
1256our @ISA = CFClient::UI::DrawBG::; 1363our @ISA = CFClient::UI::DrawBG::;
1257 1364
1258use SDL; 1365my @tex =
1366 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1367 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1368
1259use SDL::OpenGL; 1369use SDL::OpenGL;
1260 1370
1261sub new { 1371sub new {
1262 my $class = shift; 1372 my $class = shift;
1263 1373
… …
1275 my ($self) = @_; 1385 my ($self) = @_;
1276 1386
1277 ($self->{padding} * 2 + 6) x 2 1387 ($self->{padding} * 2 + 6) x 2
1278} 1388}
1279 1389
1280sub size_allocate {
1281 my ($self, $x, $y, $w, $h) = @_;
1282
1283 $self->_size_allocate ($x, $y, $w, $h);
1284}
1285
1286sub button_down { 1390sub button_down {
1287 my ($self, $ev, $x, $y) = @_; 1391 my ($self, $ev, $x, $y) = @_;
1288 1392
1289 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1393 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1290 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1394 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1299 $self->SUPER::_draw; 1403 $self->SUPER::_draw;
1300 1404
1301 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1405 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1302 1406
1303 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1407 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1408
1409 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1410
1411 glEnable GL_BLEND;
1412 glEnable GL_TEXTURE_2D;
1413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1414
1415 my $tex = $self->{state} ? $tex[1] : $tex[0];
1416
1417 $tex->draw_quad (0, 0, $s, $s);
1418
1419 glDisable GL_TEXTURE_2D;
1420 glDisable GL_BLEND;
1421}
1422
1423#############################################################################
1424
1425package CFClient::UI::VGauge;
1426
1427our @ISA = CFClient::UI::Base::;
1428
1429use SDL::OpenGL;
1430
1431my %tex = (
1432 food => [
1433 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1434 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1435 ],
1436 grace => [
1437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1438 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1439 ],
1440 hp => [
1441 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1442 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1443 ],
1444 mana => [
1445 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1446 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1447 ],
1448);
1449
1450# eg. VGauge->new (gauge => 'food'), default gauge: food
1451sub new {
1452 my $class = shift;
1453
1454 my $self = $class->SUPER::new (gauge => 'food', @_);
1455
1456 $self
1457}
1458
1459sub size_request {
1460 my ($self) = @_;
1461
1462 my $tex = $tex{$self->{gauge}}[0];
1304 1463
1305 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1464 @$tex{qw(w h)}
1465}
1306 1466
1307 glBegin GL_LINE_LOOP; 1467sub set_max {
1308 glVertex 0 , 0; 1468 my ($self, $max) = @_;
1309 glVertex 0 , $s; 1469
1310 glVertex $s, $s; 1470 $self->{max_val} = $max;
1311 glVertex $s, 0; 1471}
1472
1473sub set_value {
1474 my ($self, $val, $max) = @_;
1475
1476 $self->set_max ($max)
1477 if defined $max;
1478
1479 $max = $self->{max_val};
1480 $self->{val} = $val;
1481
1482 $self->update;
1483}
1484
1485sub _draw {
1486 my ($self) = @_;
1487
1488 my $tex = $tex{$self->{gauge}};
1489
1490 my ($w, $h) = ($self->{w}, $self->{h});
1491
1492 my $ycut = $self->{val} / ($self->{max_val} || 1);
1493 $ycut = 1 if $self->{val} > $self->{max_val};
1494
1495 my $t1 = $tex->[0];
1496 my $t2 = $tex->[1];
1497
1498 glEnable GL_BLEND;
1499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1500 glEnable GL_TEXTURE_2D;
1501 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1502
1503 my $h1 = $self->{h} - $ycut * $self->{h};
1504 my $h2 = $ycut * $self->{h};
1505
1506 my $yp = 0;
1507
1508 glBindTexture GL_TEXTURE_2D, $t1->{name};
1509 glBegin GL_QUADS;
1510 glTexCoord 0 , 0; glVertex 0 , $yp;
1511 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;
1512 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
1513 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;
1312 glEnd; 1514 glEnd;
1313 1515
1314 if ($self->{state}) { 1516 $yp += $h1;
1315 glBegin GL_LINES; 1517
1316 glVertex 0 , 0; 1518 glBindTexture GL_TEXTURE_2D, $t2->{name};
1317 glVertex $s, $s; 1519 glBegin GL_QUADS;
1318 glVertex $s, 0; 1520 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
1319 glVertex 0 , $s; 1521 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;
1522 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1523 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
1320 glEnd; 1524 glEnd;
1321 } 1525
1526 glDisable GL_BLEND;
1527 glDisable GL_TEXTURE_2D;
1322} 1528}
1323 1529
1324############################################################################# 1530#############################################################################
1325 1531
1326package CFClient::UI::Slider; 1532package CFClient::UI::Slider;
… …
1345 # TODO: calculations are off 1551 # TODO: calculations are off
1346 my $self = $class->SUPER::new ( 1552 my $self = $class->SUPER::new (
1347 fg => [1, 1, 1], 1553 fg => [1, 1, 1],
1348 active_fg => [0, 0, 0], 1554 active_fg => [0, 0, 0],
1349 range => [0, 0, 100, 10], 1555 range => [0, 0, 100, 10],
1350 req_w => 40, 1556 req_w => 20,
1351 req_h => 13, 1557 req_h => 20,
1352 vertical => 0, 1558 vertical => 0,
1353 can_hover => 1, 1559 can_hover => 1,
1560 inner_pad => 5,
1354 @_ 1561 @_
1355 ); 1562 );
1356 1563
1357 $self 1564 $self
1358} 1565}
… …
1379 if ($GRAB == $self) { 1586 if ($GRAB == $self) {
1380 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1587 my ($value, $lo, $hi, $page) = @{$self->{range}};
1381 1588
1382 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1589 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1383 1590
1591 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1592 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1593
1594 $x -= $inner_pad_px; # substract the padding
1384 $x = $x * ($hi - $lo) / $w + $lo; 1595 $x = $x * ($hi - $lo) / $inner_w + $lo;
1385 $x = $lo if $x < $lo; 1596 $x = $lo if $x < $lo;
1386 $x = $hi - $page if $x > $hi - $page; 1597 $x = $hi - $page if $x > $hi - $page;
1387 $self->{range}[0] = $x; 1598 $self->{range}[0] = $x;
1388 1599
1389 $self->emit (changed => $x); 1600 $self->emit (changed => $x);
1390 $self->update; 1601 $self->update;
1391 } 1602 }
1603}
1604
1605# the inner_* stuff is for generating a padding for the slider handle,
1606# so that the handle doesn't leave the texture. This calculation isn't 100%
1607# correct propably, but it does the job for now
1608sub _calc_inner_pad_px {
1609 my ($self, $w) = @_;
1610 ($w / 100) * $self->{inner_pad} # % to pixels
1392} 1611}
1393 1612
1394sub _draw { 1613sub _draw {
1395 my ($self) = @_; 1614 my ($self) = @_;
1396 1615
… …
1410 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1629 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1411 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1630 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1412 1631
1413 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1632 my ($value, $lo, $hi, $page) = @{$self->{range}};
1414 1633
1415 # the inner_* stuff is for generating a padding for the slider handle, 1634 $hi = $value + 1 if $lo == $hi;
1416 # so that the handle doesn't leave the texture. This calculation isn't 100% 1635
1417 # correct propably, but it does the job for now 1636 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1418 my $inner_pad = 5; # 5% of width for slider bg texture border
1419 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1420 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1637 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1421 1638
1422 $page = int $page * $inner_w / ($hi - $lo); 1639 $page = int $page * $inner_w / ($hi - $lo);
1423 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1640 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1424 1641
1425 $w -= $page; 1642 $w -= $page;
… …
1455 1672
1456sub new { 1673sub new {
1457 my $class = shift; 1674 my $class = shift;
1458 1675
1459 my $self = $class->SUPER::new ( 1676 my $self = $class->SUPER::new (
1677 fontsize => 1,
1678 @_,
1679
1680 layout => (new CFClient::Layout),
1460 par => [], 1681 par => [],
1461 @_, 1682 height => 0,
1462 children => [ 1683 children => [
1463 (new CFClient::UI::Empty expand => 1), 1684 (new CFClient::UI::Empty expand => 1),
1464 (new CFClient::UI::Slider vertical => 1), 1685 (new CFClient::UI::Slider vertical => 1),
1465 ], 1686 ],
1466 ); 1687 );
1467 1688
1689 $self->{children}[1]->connect (changed => sub {
1690 $self->update;
1691 });
1692
1468 $self 1693 $self
1694}
1695
1696sub set_fontsize {
1697 my ($self, $fontsize) = @_;
1698
1699 $self->{fontsize} = $fontsize;
1700 $self->reflow;
1701}
1702
1703sub text_height {
1704 my ($self, $text) = @_;
1705
1706 my $layout = $self->{layout};
1707
1708 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1709 $layout->set_width ($self->{w});
1710 $layout->set_text ($text);
1711
1712 ($layout->size)[1]
1713}
1714
1715sub reflow {
1716 my ($self) = @_;
1717
1718 $self->{need_reflow}++;
1719 $self->update;
1720}
1721
1722sub size_allocate {
1723 my ($self, $w, $h) = @_;
1724
1725 $self->SUPER::size_allocate ($w, $h);
1726
1727 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1728 $self->{layout}->set_width ($self->{children}[0]{w});
1729
1730 $self->reflow;
1469} 1731}
1470 1732
1471sub add_paragraph { 1733sub add_paragraph {
1472 my ($self, $color, $text) = @_; 1734 my ($self, $color, $text) = @_;
1473 1735
1736 #TODO: intelligently "reformat" paragraph
1737
1738 my $height = $self->text_height ($text);
1739
1740 $self->{height} += $height;
1741
1474 push @{$self->{par}}, [$color, $text]; 1742 push @{$self->{par}}, [$height, $color, $text];
1475 my $count = scalar @{$self->{par}}; 1743
1476 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 1744 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1477 $self->{children}[1]->update; 1745 $self->{children}[1]->update;
1478} 1746}
1479 1747
1748sub update {
1749 my ($self) = @_;
1750
1751 $self->SUPER::update;
1752
1753 return unless $self->{h} > 0;
1754
1755 delete $self->{texture};
1756
1757 $ROOT->on_refresh ($self, sub {
1758 if (delete $self->{need_reflow}) {
1759 my $height = 0;
1760
1761 $height += $_->[0] = $self->text_height ($_->[2])
1762 for @{$self->{par}};
1763
1764 $self->{height} = $height;
1765
1766 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1767
1768 delete $self->{texture};
1769 }
1770
1771 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1772 glClearColor 0, 0, 0, 1;
1773 glClear GL_COLOR_BUFFER_BIT;
1774
1775 glEnable GL_BLEND;
1776 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1777 glEnable GL_TEXTURE_2D;
1778 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1779
1780 my $top = int $self->{children}[1]{range}[0];
1781
1782 my $y0 = $top;
1783 my $y1 = $top + $self->{h};
1784
1785 my $y = 0;
1786
1787 my $layout = $self->{layout};
1788
1789 for my $par (@{$self->{par}}) {
1790 my $h = $par->[0];
1791
1792 if ($y0 < $y + $h && $y < $y1) {
1793 $layout->set_text ($par->[2]);
1794
1795 glColor @{ $par->[1] };
1796 my ($W, $H) = $layout->size;
1797 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1798 }
1799
1800 $y += $h;
1801 }
1802
1803 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805 };
1806 });
1807}
1808
1480sub _draw { 1809sub _draw {
1481 my ($self) = @_; 1810 my ($self) = @_;
1482 1811
1483 my $par = $self->{par}; 1812 if ($self->{texture}) {
1484
1485 my $bottom = (scalar @$par) - 1;
1486
1487 my $w = $self->{children}[0]{w};
1488 my $y = $self->{h};
1489
1490 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1813 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1815 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1495 # TODO: everything!
1496 while ($y > 0 && $bottom >= 0) {
1497 my $par = $par->[$bottom--];
1498
1499 my $layout = new CFClient::Layout;
1500
1501 $layout->set_height ($::FONTSIZE);
1502 $layout->set_width ($w);
1503 $layout->set_text ($par->[1]);
1504 my $tex = new_from_layout CFClient::Texture $layout;
1505 $y -= $tex->{h};
1506
1507 glColor @{ $par->[0] };
1508 $tex->draw_quad (0, $y);
1509 }
1510
1511 glDisable GL_TEXTURE_2D; 1816 glDisable GL_TEXTURE_2D;
1512 glDisable GL_BLEND;
1513}
1514
1515#############################################################################
1516
1517package CFClient::UI::MapWidget;
1518
1519use strict;
1520
1521use List::Util qw(min max);
1522
1523use SDL;
1524use SDL::OpenGL;
1525
1526our @ISA = CFClient::UI::Base::;
1527
1528sub new {
1529 my $class = shift;
1530
1531 $class->SUPER::new (
1532 z => -1,
1533 can_focus => 1,
1534 list => (glGenLists 1),
1535 @_
1536 ) 1817 }
1537}
1538 1818
1539sub key_down { 1819 $self->{children}[1]->draw;
1540 print "MAPKEYDOWN\n";
1541}
1542 1820
1543sub key_up {
1544}
1545
1546sub size_request {
1547 (
1548 1 + 32 * int $::WIDTH / 32,
1549 1 + 32 * int $::HEIGHT / 32,
1550 )
1551}
1552
1553sub update {
1554 my ($self) = @_;
1555
1556 $self->{need_update} = 1;
1557 $self->SUPER::update;
1558}
1559
1560sub draw {
1561 my ($self) = @_;
1562
1563 $self->{need_update}++;#d#
1564 if (delete $self->{need_update}) {
1565 glNewList $self->{list}, GL_COMPILE;
1566
1567 my $sw = int $::WIDTH / 32;
1568 my $sh = int $::HEIGHT / 32;
1569
1570 if ($::MAP) {
1571 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1572
1573 if ($::CFG->{fow_enable}) {
1574 if ($::CFG->{fow_smooth}) { # smooth fog of war
1575 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1576 glConvolutionFilter2D
1577 GL_CONVOLUTION_2D,
1578 GL_ALPHA,
1579 3, 3,
1580 GL_ALPHA, GL_FLOAT,
1581 pack "f*",
1582 0.1, 0.1, 0.1,
1583 0.1, 0.2, 0.1,
1584 0.1, 0.1, 0.1,
1585 ;
1586 glEnable GL_CONVOLUTION_2D;
1587 }
1588
1589 my $tex = new CFClient::Texture
1590 w => $w,
1591 h => $h,
1592 data => $data,
1593 internalformat => GL_ALPHA,
1594 format => GL_ALPHA;
1595
1596 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1597
1598 glEnable GL_BLEND;
1599 glEnable GL_TEXTURE_2D;
1600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1601
1602 glColor +($::CFG->{fow_intensity}) x 3, 1;
1603 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1604
1605 glDisable GL_TEXTURE_2D;
1606 glDisable GL_BLEND;
1607 }
1608 }
1609
1610 glEndList;
1611 }
1612
1613 glCallList $self->{list};
1614
1615 if ($FOCUS != $self) {
1616 glColor 64/255, 64/255, 64/255;
1617 glLogicOp GL_AND;
1618 glEnable GL_COLOR_LOGIC_OP;
1619 glBegin GL_QUADS;
1620 glVertex 0, 0;
1621 glVertex 0, $::HEIGHT;
1622 glVertex $::WIDTH, $::HEIGHT;
1623 glVertex $::WIDTH, 0;
1624 glEnd;
1625 glDisable GL_COLOR_LOGIC_OP;
1626 }
1627}
1628
1629my %DIR = (
1630 SDLK_KP8, [1, "north"],
1631 SDLK_KP9, [2, "northeast"],
1632 SDLK_KP6, [3, "east"],
1633 SDLK_KP3, [4, "southeast"],
1634 SDLK_KP2, [5, "south"],
1635 SDLK_KP1, [6, "southwest"],
1636 SDLK_KP4, [7, "west"],
1637 SDLK_KP7, [8, "northwest"],
1638
1639 SDLK_UP, [1, "north"],
1640 SDLK_RIGHT, [3, "east"],
1641 SDLK_DOWN, [5, "south"],
1642 SDLK_LEFT, [7, "west"],
1643);
1644
1645sub key_down {
1646 my ($self, $ev) = @_;
1647
1648 my $mod = $ev->key_mod;
1649 my $sym = $ev->key_sym;
1650
1651 if ($sym == SDLK_KP5) {
1652 $::CONN->user_send ("command stay fire");
1653 } elsif ($sym == SDLK_a) {
1654 $::CONN->user_send ("command apply");
1655 } elsif (exists $DIR{$sym}) {
1656 if ($mod & KMOD_SHIFT) {
1657 $self->{shft}++;
1658 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1659 } elsif ($mod & KMOD_CTRL) {
1660 $self->{ctrl}++;
1661 $::CONN->user_send ("command run $DIR{$sym}[0]");
1662 } else {
1663 $::CONN->user_send ("command $DIR{$sym}[1]");
1664 }
1665 }
1666}
1667
1668sub key_up {
1669 my ($self, $ev) = @_;
1670
1671 my $mod = $ev->key_mod;
1672 my $sym = $ev->key_sym;
1673
1674 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1675 $::CONN->user_send ("command fire_stop");
1676 }
1677 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1678 $::CONN->user_send ("command run_stop");
1679 }
1680} 1821}
1681 1822
1682############################################################################# 1823#############################################################################
1683 1824
1684package CFClient::UI::Animator; 1825package CFClient::UI::Animator;
… …
1747sub toggle_flopper { 1888sub toggle_flopper {
1748 my ($self) = @_; 1889 my ($self) = @_;
1749 1890
1750 # TODO: use animation 1891 # TODO: use animation
1751 if ($self->{state} = !$self->{state}) { 1892 if ($self->{state} = !$self->{state}) {
1752 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1893 $CFClient::UI::ROOT->add ($self->{other});
1753 $self->{other}->move ( 1894 $self->{other}->move ($self->coord2global (0, $self->{h}));
1754 ($::WIDTH - $self->{other}{w}) * 0.5, 1895 $self->emit ("open");
1755 ($::HEIGHT - $self->{other}{h}) * 0.5,
1756 );
1757 } else { 1896 } else {
1758 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1897 $CFClient::UI::ROOT->remove ($self->{other});
1898 $self->emit ("close");
1759 } 1899 }
1760}
1761 1900
1762############################################################################# 1901 $self->emit (changed => $self->{state});
1902}
1763 1903
1904#############################################################################
1905
1764package CFClient::UI::Toplevel; 1906package CFClient::UI::Root;
1765 1907
1766our @ISA = CFClient::UI::Container::; 1908our @ISA = CFClient::UI::Container::;
1909
1910use SDL::OpenGL;
1911
1912sub check_size {
1913 my ($self) = @_;
1914
1915 $self->configure (0, 0, $::WITH, $::HEIGHT);
1916}
1767 1917
1768sub size_request { 1918sub size_request {
1769 ($::WIDTH, $::HEIGHT) 1919 ($::WIDTH, $::HEIGHT)
1770} 1920}
1771 1921
1772sub size_allocate { 1922sub configure {
1773 my ($self, $x, $y, $w, $h) = @_; 1923 my ($self, $x, $y, $w, $h) = @_;
1774 1924
1775 $self->_size_allocate ($x, $y, $w, $h); 1925 $self->SUPER::configure ($x, $y, $w, $h);
1776 1926
1777 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1927 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1778 for @{$self->{children}}; 1928 for @{$self->{children}};
1779} 1929}
1780 1930
1781sub translate { 1931sub _topleft {
1782 my ($self, $x, $y) = @_; 1932 my ($self, $x, $y) = @_;
1783 1933
1784 ($x, $y) 1934 ($x, $y)
1785} 1935}
1786 1936
1787sub update { 1937sub update {
1788 my ($self) = @_; 1938 my ($self) = @_;
1789 1939
1790 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 1940 $self->check_size;
1791 ::refresh (); 1941 ::refresh ();
1792} 1942}
1793 1943
1794sub add { 1944sub add {
1795 my ($self, $widget) = @_; 1945 my ($self, $child) = @_;
1796 1946
1797 $self->SUPER::add ($widget); 1947 $self->SUPER::add ($child);
1948}
1798 1949
1799 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 1950sub on_refresh {
1951 my ($self, $id, $cb) = @_;
1952
1953 $self->{refresh_hook}{$id} = $cb;
1800} 1954}
1801 1955
1802sub draw { 1956sub draw {
1803 my ($self) = @_; 1957 my ($self) = @_;
1804 1958
1959 while (my $rcb = delete $self->{refresh_hook}) {
1960 $_->() for values %$rcb;
1961 }
1962
1963 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1964 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1965 glClear GL_COLOR_BUFFER_BIT;
1966
1967 glMatrixMode GL_PROJECTION;
1968 glLoadIdentity;
1969 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
1970 glMatrixMode GL_MODELVIEW;
1971 glLoadIdentity;
1972
1805 $self->_draw; 1973 $self->_draw;
1806} 1974}
1807 1975
1808############################################################################# 1976#############################################################################
1809 1977
1810package CFClient::UI; 1978package CFClient::UI;
1811 1979
1812$TOPLEVEL = new CFClient::UI::Toplevel; 1980$ROOT = new CFClient::UI::Root;
1813 1981
18141 19821
1815 1983

Diff Legend

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