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.73 by root, Tue Apr 11 18:06:53 2006 UTC vs.
Revision 1.97 by root, Fri Apr 14 02:03:11 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
6 7
7use CFClient; 8use CFClient;
8 9
9our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
10 11
… …
42 43
43 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
44 45
45 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
46 47
47 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
48 49
49 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
50 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
51 $grab->update if $grab; 52 $grab->update if $grab;
52 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
78use SDL::OpenGL; 79use SDL::OpenGL;
79 80
80sub new { 81sub new {
81 my $class = shift; 82 my $class = shift;
82 83
83 bless { 84 my $self = bless {
84 x => 0, 85 x => 0,
85 y => 0, 86 y => 0,
86 z => 0, 87 z => 0,
88 w => -1,
89 h => -1,
87 @_ 90 @_
88 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
89} 100}
90 101
91sub move { 102sub move {
92 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
93 $self->{x} = $x; 104 $self->{x} = $x;
… …
102sub size_request { 113sub size_request {
103 require Carp; 114 require Carp;
104 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
105} 116}
106 117
118sub _size_allocate {
119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = int $x;
122 $self->{y} = int $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
125
126 $self->{w} = int $w;
127 $self->{h} = int $h;
128
129 1
130}
131
107sub size_allocate { 132sub size_allocate {
108 my ($self, $w, $h) = @_; 133 my ($self, $x, $y, $w, $h) = @_;
109 134
110 $self->{w} = $w; 135 $self->_size_allocate ($x, $y, $w, $h);
111 $self->{h} = $h;
112} 136}
113 137
114# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
115sub translate { 139sub translate {
116 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
117 141
118 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
119} 143}
120 144
121sub focus_in { 145sub focus_in {
122 my ($self) = @_; 146 my ($self) = @_;
123 147
124 return if $FOCUS == $self; 148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
125 150
126 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
127 $focus->update if $focus; 152 $focus->update if $focus;
128 $FOCUS->update; 153 $FOCUS->update;
129} 154}
… …
162 glPushMatrix; 187 glPushMatrix;
163 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
164 $self->_draw; 189 $self->_draw;
165 glPopMatrix; 190 glPopMatrix;
166 191
167 if ($self == $HOVER) { 192 if ($self == $HOVER && $self->{can_hover}) {
168 my ($x, $y) = @$self{qw(x y)}; 193 my ($x, $y) = @$self{qw(x y)};
169 194
170 glColor 1, 1, 1, 0.1; 195 glColor 0, 0, 1, 0.2;
171 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
172 glBegin GL_QUADS; 198 glBegin GL_QUADS;
173 glVertex $x , $y; 199 glVertex $x , $y;
174 glVertex $x + $self->{w}, $y; 200 glVertex $x + $self->{w}, $y;
175 glVertex $x + $self->{w}, $y + $self->{h}; 201 glVertex $x + $self->{w}, $y + $self->{h};
176 glVertex $x , $y + $self->{h}; 202 glVertex $x , $y + $self->{h};
… …
183 my ($self) = @_; 209 my ($self) = @_;
184 210
185 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
186} 212}
187 213
188sub bbox {
189 my ($self) = @_;
190 my ($w, $h) = $self->size_request;
191 (
192 $self->{x},
193 $self->{y},
194 $self->{x} = $w,
195 $self->{y} = $h
196 )
197}
198
199sub find_widget { 214sub find_widget {
200 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
201 216
202 return $self 217 return $self
203 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 218 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
204 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
205 220
206 () 221 ()
207} 222}
208 223
209sub del_parent { $_[0]->{parent} = undef }
210
211sub set_parent { 224sub set_parent {
212 my ($self, $par) = @_; 225 my ($self, $par) = @_;
213 226
214 $self->{parent} = $par; 227 $self->{parent} = $par;
215 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
258 my $class = shift; 271 my $class = shift;
259 272
260 # range [value, low, high, page] 273 # range [value, low, high, page]
261 274
262 $class->SUPER::new ( 275 $class->SUPER::new (
263 bg => [0, 0, 0, 0.4], 276 bg => [0, 0, 0, 0.2],
264 active_bg => [1, 1, 1], 277 active_bg => [1, 1, 1, 0.5],
265 @_ 278 @_
266 ) 279 )
267} 280}
268 281
269sub _draw { 282sub _draw {
270 my ($self) = @_; 283 my ($self) = @_;
271 284
272 my ($w, $h) = @$self{qw(w h)}; 285 my ($w, $h) = @$self{qw(w h)};
273 286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
274 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
275 glBegin GL_QUADS; 291 glBegin GL_QUADS;
276 glVertex 0 , 0; 292 glVertex 0 , 0;
277 glVertex 0 , $h; 293 glVertex 0 , $h;
278 glVertex $w, $h; 294 glVertex $w, $h;
279 glVertex $w, 0; 295 glVertex $w, 0;
280 glEnd; 296 glEnd;
297
298 glDisable GL_BLEND;
281} 299}
282 300
283############################################################################# 301#############################################################################
284 302
285package CFClient::UI::Empty; 303package CFClient::UI::Empty;
… …
308 326
309 $self 327 $self
310} 328}
311 329
312sub add { 330sub add {
313 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
314 332
315 $chld->{expand} = $expand;
316 $chld->set_parent ($self); 333 $chld->set_parent ($self);
317 334
318 $self->{children} = [ 335 $self->{children} = [
319 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
320 @{$self->{children}}, $chld 337 @{$self->{children}}, $chld
321 ]; 338 ];
322 339
323 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
324 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
325} 342}
326 343
327sub remove { 344sub remove {
328 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
329 346
330 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
331 348
332 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
333} 350}
334 351
335sub find_widget { 352sub find_widget {
336 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
337 354
… …
390sub size_request { 407sub size_request {
391 $_[0]{children}[0]->size_request 408 $_[0]{children}[0]->size_request
392} 409}
393 410
394sub size_allocate { 411sub size_allocate {
395 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
396 413
397 return unless $self->{w} != $w || $self->{h} != $h; 414 $self->_size_allocate ($x, $y, $w, $h) or return;
398 415
399 $self->SUPER::size_allocate ($w, $h);
400 $self->{children}[0]->size_allocate ($w, $h); 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
401} 417}
402 418
403############################################################################# 419#############################################################################
404 420
405package CFClient::UI::Window; 421package CFClient::UI::Window;
… …
430 $self->{w}, $self->{h}, sub { $self->child->draw } 446 $self->{w}, $self->{h}, sub { $self->child->draw }
431 ); 447 );
432} 448}
433 449
434sub size_allocate { 450sub size_allocate {
435 my ($self, $w, $h) = @_; 451 my ($self, $x, $y, $w, $h) = @_;
436 452
437 return unless $self->{w} != $w || $self->{h} != $h; 453 $self->_size_allocate ($x, $y, $w, $h) or return;
438 454
439 $self->{w} = $w;
440 $self->{h} = $h;
441
442 $self->child->size_allocate ($w, $h); 455 $self->child->size_allocate (0, 0, $w, $h);
443 456
444 $self->render_chld; 457 $self->render_chld;
445} 458}
446 459
447sub _draw { 460sub _draw {
… …
451 464
452 my $tex = $self->{texture} 465 my $tex = $self->{texture}
453 or return; 466 or return;
454 467
455 glEnable GL_BLEND; 468 glEnable GL_BLEND;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
456 glEnable GL_TEXTURE_2D; 470 glEnable GL_TEXTURE_2D;
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
458 472
459 $tex->draw_quad (0, 0, $w, $h); 473 $tex->draw_quad (0, 0, $w, $h);
460 474
… …
479 493
480 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
481} 495}
482 496
483sub size_allocate { 497sub size_allocate {
484 my ($self, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
485 499
486 return unless $self->{w} != $w || $self->{h} != $h; 500 $self->_size_allocate ($x, $y, $w, $h) or return;
487 501
488 $self->{w} = $w;
489 $self->{h} = $h;
490
491 $self->child->size_allocate ($w - 4, $h - 4); 502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
492 $self->child->move (2, 2);
493} 503}
494 504
495sub _draw { 505sub _draw {
496 my ($self) = @_; 506 my ($self) = @_;
497 507
… …
520 530
521my @tex = 531my @tex =
522 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
523 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
524 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
525sub size_request { 548sub size_request {
526 my ($self) = @_; 549 my ($self) = @_;
527 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
528 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
529 554
530 $h += $tex[1]->{h}; 555 (
531 $h += $tex[4]->{h}; 556 $w + $self->{border} * 2,
532 $w += $tex[2]->{w}; 557 $h + $self->{border} * 2,
533 $w += $tex[3]->{w}; 558 )
534
535 ($w, $h)
536} 559}
537 560
538sub size_allocate { 561sub size_allocate {
539 my ($self, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
540 563
541 return unless $self->{w} != $w || $self->{h} != $h; 564 $self->_size_allocate ($x, $y, $w, $h) or return;
542 565
543 $self->SUPER::size_allocate ($w, $h); 566 $h -= List::Util::max 0, $self->{border} * 2;
567 $w -= List::Util::max 0, $self->{border} * 2;
544 568
545 $h -= $tex[1]->{h}; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
546 $h -= $tex[4]->{h}; 570}
547 $w -= $tex[2]->{w};
548 $w -= $tex[3]->{w};
549 571
550 $h = $h < 0 ? 0 : $h; 572sub button_down {
551 $w = $w < 0 ? 0 : $w; 573 my ($self, $ev, $x, $y) = @_;
552 574
553 my $child = $self->child; 575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
554 577
555 $child->size_allocate ($w, $h); 578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
556 $child->move ($tex[3]->{w}, $tex[1]->{h}); 579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
557} 618}
558 619
559sub _draw { 620sub _draw {
560 my ($self) = @_; 621 my ($self) = @_;
561 622
562 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
563 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
564 625
565 glEnable GL_BLEND; 626 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
566 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
567 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
568 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
569 630
570 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
571 $top->draw_quad (0, 0, $w, $top->{h}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
572 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
573 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
574 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
575
576 my $right = $tex[2];
577 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
578
579 my $bottom = $tex[4];
580 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
581 636
582 my $bg = $tex[0]; 637 my $bg = $tex[0];
583 glBindTexture GL_TEXTURE_2D, $bg->{name};
584 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
585 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
586 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
587 638
639 # TODO: repeat texture not scale
588 my $rep_x = $cw / $bg->{w}; 640 my $rep_x = $cw / $bg->{w};
589 my $rep_y = $ch / $bg->{h}; 641 my $rep_y = $ch / $bg->{h};
590 642
643 glColor @{ $self->{bg} };
591 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
592 645
646 glDisable GL_TEXTURE_2D;
593 glDisable GL_BLEND; 647 glDisable GL_BLEND;
594 glDisable GL_TEXTURE_2D;
595 648
596 $self->child->draw; 649 $self->child->draw;
597
598} 650}
599 651
600############################################################################# 652#############################################################################
601 653
602package CFClient::UI::Table; 654package CFClient::UI::Table;
603 655
604our @ISA = CFClient::UI::Base::; 656our @ISA = CFClient::UI::Base::;
605 657
658use List::Util qw(max sum);
659
606use SDL::OpenGL; 660use SDL::OpenGL;
661
662sub new {
663 my $class = shift;
664
665 $class->SUPER::new (
666 col_expand => [],
667 @_
668 )
669}
607 670
608sub add { 671sub add {
609 my ($self, $x, $y, $chld) = @_; 672 my ($self, $x, $y, $chld) = @_;
610 my $old_chld = $self->{children}[$y][$x];
611 673
612 $self->{children}[$y][$x] = $chld; 674 $self->{children}[$y][$x] = $chld;
613 $chld->set_parent ($self); 675 $chld->set_parent ($self);
676
677 $self->{w} = $self->{h} = -1;
614 $self->update; 678 $self->update;
615} 679}
616 680
617sub max_row_height { 681sub get_wh {
618 my ($self, $row) = @_; 682 my ($self) = @_;
619 683
620 my $hs = 0; 684 my (@w, @h);
621 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 685
686 for my $y (0 .. $#{$self->{children}}) {
622 my $c = $self->{children}->[$row]->[$xi]; 687 my $row = $self->{children}[$y]
623 if ($c) { 688 or next;
689
690 for my $x (0 .. $#$row) {
691 my $widget = $row->[$x]
692 or next;
624 my ($w, $h) = $c->size_request; 693 my ($w, $h) = $widget->size_request;
625 if ($hs < $h) { $hs = $h } 694
695 $w[$x] = max $w[$x], $w;
696 $h[$y] = max $h[$y], $h;
626 } 697 }
627 } 698 }
628 return $hs;
629}
630 699
631sub max_col_width { 700 (\@w, \@h)
701}
702
703sub size_request {
632 my ($self, $col) = @_; 704 my ($self) = @_;
633 705
706 my ($ws, $hs) = $self->get_wh;
707
708 (
709 (sum @$ws),
710 (sum @$hs),
711 )
712}
713
714sub size_allocate {
715 my ($self, $x, $y, $w, $h) = @_;
716
717 $self->_size_allocate ($x, $y, $w, $h) or return;
718
719 my ($ws, $hs) = $self->get_wh;
720
721 my $req_w = sum @$ws;
722 my $req_h = sum @$hs;
723
724 # TODO: nicer code && do row_expand
725 my @col_expand = @{$self->{col_expand}};
726 @col_expand = (1) x @$ws unless @col_expand;
727 my $col_expand = (sum @col_expand) || 1;
728
729 # linearly scale sizes
730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
732
733 my $y;
734
735 for my $r (0 .. $#{$self->{children}}) {
736 my $row = $self->{children}[$r]
737 or next;
738
634 my $ws = 0; 739 my $x = 0;
635 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 740 my $row_h = $hs->[$r];
636 my $c = ($self->{children}->[$yi] || [])->[$col]; 741
637 if ($c) { 742 for my $c (0 .. $#$row) {
638 my ($w, $h) = $c->size_request; 743 my $col_w = $ws->[$c];
639 if ($ws < $w) { $ws = $w } 744
745 if (my $widget = $row->[$c]) {
746 $widget->size_allocate ($x, $y, $col_w, $row_h);
747 }
748
749 $x += $col_w;
640 } 750 }
751
752 $y += $row_h;
641 } 753 }
642 return $ws; 754
643} 755}
756
757sub find_widget {
758 my ($self, $x, $y) = @_;
759
760 $x -= $self->{x};
761 $y -= $self->{y};
762
763 my $res;
764
765 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
766 $res = $_->find_widget ($x, $y)
767 and return $res;
768 }
769
770 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
771}
772
773sub _draw {
774 my ($self) = @_;
775
776 for (grep $_, @{$self->{children}}) {
777 $_->draw for grep $_, @$_;
778 }
779}
780
781#############################################################################
782
783package CFClient::UI::HBox;
784
785# TODO: wrap into common Box base class
786
787our @ISA = CFClient::UI::Container::;
644 788
645sub size_request { 789sub size_request {
646 my ($self) = @_; 790 my ($self) = @_;
647 791
792 my @alloc = map [$_->size_request], @{$self->{children}};
793
794 (
795 (List::Util::sum map $_->[0], @alloc),
796 (List::Util::max map $_->[1], @alloc),
797 )
798}
799
800sub size_allocate {
801 my ($self, $x, $y, $w, $h) = @_;
802
803 $self->_size_allocate ($x, $y, $w, $h);
804
648 my ($hs, $ws) = (0, 0); 805 ($h, $w) = ($w, $h);
649 806
650 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 807 my $children = $self->{children};
651 $hs += $self->max_row_height ($yi);
652 }
653 808
654 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 809 my @h = map +($_->size_request)[0], @$children;
655 my $wm = 0; 810
656 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 811 my $req_h = List::Util::sum @h;
657 $wm += $self->max_col_width ($xi) 812
813 if ($req_h > $h) {
814 # ah well, not enough space
815 $_ *= $h / $req_h for @h;
816 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1;
819
820 for (0 .. $#$children) {
821 my $child = $children->[$_];
822
823 my $alloc_h = $h[$_];
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h;
658 } 826 }
659 if ($ws < $wm) { $ws = $wm }
660 } 827 }
661
662 return ($ws, $hs);
663}
664
665sub _draw {
666 my ($self) = @_;
667 828
668 my $y = 0; 829 my $y = 0;
669 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 830 for (0 .. $#$children) {
831 my $child = $children->[$_];
670 my $x = 0; 832 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w);
671 834
672 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 835 $y += $h;
673
674 my $c = $self->{children}->[$yi]->[$xi];
675 if ($c) {
676 $c->move ($x, $y, 0); #TODO: Move to size_request
677 $c->draw if $c;
678 }
679
680 $x += $self->max_col_width ($xi);
681 }
682
683 $y += $self->max_row_height ($yi);
684 } 836 }
685} 837}
686 838
687############################################################################# 839#############################################################################
688 840
689package CFClient::UI::VBox; 841package CFClient::UI::VBox;
690 842
843# TODO: wrap into common Box base class
844
691our @ISA = CFClient::UI::Container::; 845our @ISA = CFClient::UI::Container::;
692
693use SDL::OpenGL;
694 846
695sub size_request { 847sub size_request {
696 my ($self) = @_; 848 my ($self) = @_;
697 849
698 my @alloc = map [$_->size_request], @{$self->{children}}; 850 my @alloc = map [$_->size_request], @{$self->{children}};
… …
702 (List::Util::sum map $_->[1], @alloc), 854 (List::Util::sum map $_->[1], @alloc),
703 ) 855 )
704} 856}
705 857
706sub size_allocate { 858sub size_allocate {
707 my ($self, $w, $h) = @_; 859 my ($self, $x, $y, $w, $h) = @_;
708 860
709 return unless $self->{w} != $w || $self->{h} != $h; 861 $self->_size_allocate ($x, $y, $w, $h);
710
711 $self->{w} = $w;
712 $self->{h} = $h;
713
714 return unless $self->{h};
715 862
716 my $children = $self->{children}; 863 my $children = $self->{children};
717 864
718 my @h = map +($_->size_request)[1], @$children; 865 my @h = map +($_->size_request)[1], @$children;
719 866
720 my $req_h = List::Util::sum @h; 867 my $req_h = List::Util::sum @h;
721 868
722 if ($req_h > $h) { 869 if ($req_h > $h) {
723 # ah well, not enough space 870 # ah well, not enough space
724 $_ = $h[$_] * $h / $req_h for @h; 871 $_ *= $h / $req_h for @h;
725 } else { 872 } else {
726 my @exp = grep $_->{expand}, @$children; 873 my $exp = List::Util::sum map $_->{expand}, @$children;
727 @exp = @$children unless @exp; 874 $exp ||= 1;
728 875
729 my %exp = map +($_ => 1), @exp;
730
731 for (0 .. $#$children) { 876 for (0 .. $#$children) {
732 my $child = $children->[$_]; 877 my $child = $children->[$_];
733 878
734 my $alloc_h = $h[$_]; 879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
735 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
736 $h[$_] = $alloc_h;
737 } 880 }
738 } 881 }
739 882
740 my $y = 0; 883 my $y = 0;
741 for (0 .. $#$children) { 884 for (0 .. $#$children) {
742 my $child = $children->[$_]; 885 my $child = $children->[$_];
743 my $h = $h[$_]; 886 my $h = $h[$_];
744 $child->move (0, $y);
745 $child->size_allocate ($w, $h); 887 $child->size_allocate (0, $y, $w, $h);
746 888
747 $y += $h; 889 $y += $h;
748 } 890 }
749} 891}
750 892
… …
758 900
759sub new { 901sub new {
760 my ($class, %arg) = @_; 902 my ($class, %arg) = @_;
761 903
762 my $self = $class->SUPER::new ( 904 my $self = $class->SUPER::new (
763 fg => [1, 1, 1], 905 fg => [1, 1, 1],
764 height => $::FONTSIZE, 906 height => $::FONTSIZE,
765 text => "", 907 text => "",
766 align => -1, 908 align => -1,
909 padding => 2,
767 layout => new CFClient::Layout, 910 layout => new CFClient::Layout,
768 %arg 911 %arg
769 ); 912 );
770 913
771 $self->set_text ($self->{text}); 914 $self->set_text ($self->{text});
772 915
… …
788 931
789 $self->{text} = $text; 932 $self->{text} = $text;
790 $self->{layout}->set_markup ($text); 933 $self->{layout}->set_markup ($text);
791 934
792 delete $self->{texture}; 935 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
793 $self->update; 937 $self->update;
794} 938}
795 939
796sub get_text { 940sub get_text {
797 my ($self, $text) = @_; 941 my ($self, $text) = @_;
… …
802sub size_request { 946sub size_request {
803 my ($self) = @_; 947 my ($self) = @_;
804 948
805 $self->{layout}->set_width; 949 $self->{layout}->set_width;
806 $self->{layout}->set_height ($self->{height}); 950 $self->{layout}->set_height ($self->{height});
807 $self->{layout}->size 951 my ($w, $h) = $self->{layout}->size;
808# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack 952
809# ( 953 (
810# $self->{texture}{w}, 954 $w + $self->{padding} * 2,
811# $self->{texture}{h}, 955 $h + $self->{padding} * 2,
812# ) 956 )
813# } else {
814# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
815#
816# ($w, $h)
817# }
818} 957}
819 958
820sub size_allocate { 959sub size_allocate {
821 my ($self, $w, $h) = @_; 960 my ($self, $x, $y, $w, $h) = @_;
822 961
823 return unless $self->{w} != $w || $self->{h} != $h; 962 $self->_size_allocate ($x, $y, $w, $h) or return;
824 963
825 $self->SUPER::size_allocate ($w, $h);
826 delete $self->{texture}; 964 delete $self->{texture};
827} 965}
828 966
829sub update { 967sub update {
830 my ($self) = @_; 968 my ($self) = @_;
… …
836sub _draw { 974sub _draw {
837 my ($self) = @_; 975 my ($self) = @_;
838 976
839 my $tex = $self->{texture} ||= do { 977 my $tex = $self->{texture} ||= do {
840 $self->{layout}->set_width ($self->{w}); 978 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
841 new_from_layout CFClient::Texture $self->{layout}; 980 new_from_layout CFClient::Texture $self->{layout}
842 }; 981 };
843 982
844 glEnable GL_BLEND; 983 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
845 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
846 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
848 987
849 glColor @{$self->{fg}}; 988 glColor @{$self->{fg}};
850 989
851 my $x = 990 my $x =
852 $self->{align} < 0 ? 0 991 $self->{align} < 0 ? $self->{padding}
853 : $self->{align} > 0 ? $self->{w} - $self->{texture}{w} 992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
854 : ($self->{w} + $self->{texture}{w}) * 0.5; 993 : ($self->{w} - $tex->{w}) * 0.5;
855 994
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
856 $tex->draw_quad ($x, 0); 996 $tex->draw_quad (0, 0);
857 997
998 glDisable GL_TEXTURE_2D;
858 glDisable GL_BLEND; 999 glDisable GL_BLEND;
859 glDisable GL_TEXTURE_2D;
860} 1000}
861 1001
862############################################################################# 1002#############################################################################
863 1003
864package CFClient::UI::Entry; 1004package CFClient::UI::Entry;
… …
871sub new { 1011sub new {
872 my $class = shift; 1012 my $class = shift;
873 1013
874 $class->SUPER::new ( 1014 $class->SUPER::new (
875 fg => [1, 1, 1], 1015 fg => [1, 1, 1],
876 bg => [0, 0, 0, 0.4], 1016 bg => [0, 0, 0, 0.2],
877 active_bg => [1, 1, 1], 1017 active_bg => [1, 1, 1, 0.5],
878 active_fg => [0, 0, 0], 1018 active_fg => [0, 0, 0],
1019 can_hover => 1,
1020 can_focus => 1,
879 @_ 1021 @_
880 ) 1022 )
881} 1023}
882 1024
883sub _set_text { 1025sub _set_text {
… …
885 1027
886 $self->{last_activity} = $::NOW; 1028 $self->{last_activity} = $::NOW;
887 1029
888 $self->{text} = $text; 1030 $self->{text} = $text;
889 $self->{layout}->set_width ($self->{w}); 1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
890 1033
891 $text =~ s/./*/g if $self->{hidden}; 1034 $text =~ s/./*/g if $self->{hidden};
892 1035
893
894 $self->{layout}->set_markup ($self->escape_text ($text)); 1036 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
895 1037
896 $text = substr $text, 0, $self->{cursor}; 1038 $text = substr $text, 0, $self->{cursor};
897 utf8::encode $text; 1039 utf8::encode $text;
898 1040
899 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
… …
906 1048
907 ($w + 1, $h) # add 1 for cursor 1049 ($w + 1, $h) # add 1 for cursor
908} 1050}
909 1051
910sub size_allocate { 1052sub size_allocate {
911 my ($self, $w, $h) = @_; 1053 my ($self, $x, $y, $w, $h) = @_;
912 1054
913 return unless $self->{w} != $w || $self->{h} != $h;
914
915 $self->SUPER::size_allocate ($w, $h); 1055 $self->SUPER::size_allocate ($x, $y, $w, $h);
916 1056
917 $self->_set_text ($self->{text}); 1057 $self->_set_text ($self->{text});
918} 1058}
919 1059
920sub set_text { 1060sub set_text {
… …
941 substr $text, $self->{cursor}, 1, ""; 1081 substr $text, $self->{cursor}, 1, "";
942 } elsif ($sym == SDLK_LEFT) { 1082 } elsif ($sym == SDLK_LEFT) {
943 --$self->{cursor} if $self->{cursor}; 1083 --$self->{cursor} if $self->{cursor};
944 } elsif ($sym == SDLK_RIGHT) { 1084 } elsif ($sym == SDLK_RIGHT) {
945 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1085 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) {
1087 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) {
1089 $self->{cursor} = length $text;
946 } elsif ($uni) { 1090 } elsif ($uni) {
947 substr $text, $self->{cursor}++, 0, chr $uni; 1091 substr $text, $self->{cursor}++, 0, chr $uni;
948 } 1092 }
949 1093
950 $self->_set_text ($text); 1094 $self->_set_text ($text);
… …
965 $self->SUPER::button_down ($ev, $x, $y); 1109 $self->SUPER::button_down ($ev, $x, $y);
966 1110
967 my $idx = $self->{layout}->xy_to_index ($x, $y); 1111 my $idx = $self->{layout}->xy_to_index ($x, $y);
968 1112
969 # byte-index to char-index 1113 # byte-index to char-index
970 my $text = $self->{layout}; 1114 my $text = $self->{text};
971 utf8::encode $text; 1115 utf8::encode $text;
972 $self->{cursor} = length substr $text, 0, $idx; 1116 $self->{cursor} = length substr $text, 0, $idx;
973 1117
974 $self->_set_text ($self->{text}); 1118 $self->_set_text ($self->{text});
975 $self->update; 1119 $self->update;
… …
990 $self->{fg} = $self->{active_fg}; 1134 $self->{fg} = $self->{active_fg};
991 } else { 1135 } else {
992 glColor @{$self->{bg}}; 1136 glColor @{$self->{bg}};
993 } 1137 }
994 1138
1139 glEnable GL_BLEND;
1140 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
995 glBegin GL_QUADS; 1141 glBegin GL_QUADS;
996 glVertex 0 , 0; 1142 glVertex 0 , 0;
997 glVertex 0 , $self->{h}; 1143 glVertex 0 , $self->{h};
998 glVertex $self->{w}, $self->{h}; 1144 glVertex $self->{w}, $self->{h};
999 glVertex $self->{w}, 0; 1145 glVertex $self->{w}, 0;
1000 glEnd; 1146 glEnd;
1147 glDisable GL_BLEND;
1001 1148
1002 $self->SUPER::_draw; 1149 $self->SUPER::_draw;
1003 1150
1004 #TODO: force update every cursor change :( 1151 #TODO: force update every cursor change :(
1005 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1152 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
… …
1011 } 1158 }
1012} 1159}
1013 1160
1014############################################################################# 1161#############################################################################
1015 1162
1016package CFClient::UI::Slider; 1163package CFClient::UI::Button;
1017 1164
1018use strict; 1165our @ISA = CFClient::UI::Label::;
1019 1166
1167use SDL;
1020use SDL::OpenGL; 1168use SDL::OpenGL;
1021use SDL::OpenGL::Constants;
1022 1169
1023our @ISA = CFClient::UI::DrawBG::; 1170my @tex =
1024 1171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1025sub size_request { 1172 qw(b1_button_active.png);
1026 my ($self) = @_;
1027
1028 my $w = 50;
1029 my $h = 10;
1030
1031 $self->{vertical} ? ($h, $w) : ($w, $h)
1032}
1033 1173
1034sub new { 1174sub new {
1035 my $class = shift; 1175 my $class = shift;
1036 1176
1177 $class->SUPER::new (
1178 padding => 4,
1179 fg => [1, 1, 1],
1180 bg => [1, 1, 1, 0.2],
1181 active_fg => [1, 1, 0],
1182 can_hover => 1,
1183 @_
1184 )
1185}
1186
1187sub button_up {
1188 my ($self, $ev, $x, $y) = @_;
1189
1190 if ($x >= 0 && $x < $self->{w}
1191 && $y >= 0 && $y < $self->{h}) {
1192 $self->emit ("activate");
1193 }
1194}
1195
1196sub _draw {
1197 my ($self) = @_;
1198
1199 local $self->{fg} = $self->{fg};
1200 my $tex = $tex[0];
1201
1202 glEnable GL_BLEND;
1203 glEnable GL_TEXTURE_2D;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205
1206 if ($GRAB == $self) {
1207 $self->{fg} = $self->{active_fg};
1208 }
1209
1210 glBindTexture GL_TEXTURE_2D, $tex->{name};
1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1212
1213 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1214
1215 glDisable GL_TEXTURE_2D;
1216 glDisable GL_BLEND;
1217
1218 $self->SUPER::_draw;
1219}
1220
1221#############################################################################
1222
1223package CFClient::UI::CheckBox;
1224
1225our @ISA = CFClient::UI::DrawBG::;
1226
1227use SDL;
1228use SDL::OpenGL;
1229
1230sub new {
1231 my $class = shift;
1232
1233 $class->SUPER::new (
1234 padding => 2,
1235 fg => [1, 1, 1],
1236 active_fg => [1, 1, 0],
1237 state => 0,
1238 can_hover => 1,
1239 @_
1240 )
1241}
1242
1243sub size_request {
1244 my ($self) = @_;
1245
1246 ($self->{padding} * 2 + 6) x 2
1247}
1248
1249sub size_allocate {
1250 my ($self, $x, $y, $w, $h) = @_;
1251
1252 $self->_size_allocate ($x, $y, $w, $h);
1253}
1254
1255sub button_down {
1256 my ($self, $ev, $x, $y) = @_;
1257
1258 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1259 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1260 $self->{state} = !$self->{state};
1261 $self->emit (changed => $self->{state});
1262 }
1263}
1264
1265sub _draw {
1266 my ($self) = @_;
1267
1268 $self->SUPER::_draw;
1269
1270 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1271
1272 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1273
1274 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1275
1276 glBegin GL_LINE_LOOP;
1277 glVertex 0 , 0;
1278 glVertex 0 , $s;
1279 glVertex $s, $s;
1280 glVertex $s, 0;
1281 glEnd;
1282
1283 if ($self->{state}) {
1284 glBegin GL_LINES;
1285 glVertex 0 , 0;
1286 glVertex $s, $s;
1287 glVertex $s, 0;
1288 glVertex 0 , $s;
1289 glEnd;
1290 }
1291}
1292
1293#############################################################################
1294
1295package CFClient::UI::Slider;
1296
1297use strict;
1298
1299use SDL::OpenGL;
1300
1301our @ISA = CFClient::UI::DrawBG::;
1302
1303sub new {
1304 my $class = shift;
1305
1037 # range [value, low, high, page] 1306 # range [value, low, high, page]
1038 1307
1308 # TODO: 0-width page
1309 # TODO: req_w/h are wrong with vertical
1310 # TODO: calculations are off
1039 $class->SUPER::new ( 1311 my $self = $class->SUPER::new (
1040 fg => [1, 1, 1], 1312 fg => [1, 1, 1],
1041 active_fg => [0, 0, 0], 1313 active_fg => [0, 0, 0],
1042 range => [0, 0, 100, 10], 1314 range => [0, 0, 100, 10],
1315 req_w => 40,
1316 req_h => 13,
1043 vertical => 1, 1317 vertical => 0,
1318 can_hover => 1,
1044 @_ 1319 @_
1045 ) 1320 );
1321
1322 $self
1323}
1324
1325sub size_request {
1326 my ($self) = @_;
1327
1328 my $w = $self->{req_w};
1329 my $h = $self->{req_h};
1330
1331 $self->{vertical} ? ($h, $w) : ($w, $h)
1046} 1332}
1047 1333
1048sub button_down { 1334sub button_down {
1049 my ($self, $ev, $x, $y) = @_; 1335 my ($self, $ev, $x, $y) = @_;
1050 1336
… …
1095 $value = int +($value - $lo) * $w / ($hi - $lo); 1381 $value = int +($value - $lo) * $w / ($hi - $lo);
1096 1382
1097 $w -= $page; 1383 $w -= $page;
1098 $page &= ~1; 1384 $page &= ~1;
1099 glTranslate $page * 0.5, 0, 0; 1385 glTranslate $page * 0.5, 0, 0;
1386 $page ||= 2;
1100 1387
1101 glColor @$fg; 1388 glColor @$fg;
1102 glBegin GL_LINES; 1389 glBegin GL_LINES;
1103 glVertex 0, 0; glVertex 0, $h; 1390 glVertex 0, 0; glVertex 0, $h;
1104 glVertex $w - 1, 0; glVertex $w - 1, $h; 1391 glVertex $w - 1, 0; glVertex $w - 1, $h;
… …
1125 glEnd; 1412 glEnd;
1126} 1413}
1127 1414
1128############################################################################# 1415#############################################################################
1129 1416
1417package CFClient::UI::TextView;
1418
1419our @ISA = CFClient::UI::HBox::;
1420
1421use SDL::OpenGL;
1422
1423sub new {
1424 my $class = shift;
1425
1426 my $self = $class->SUPER::new (
1427 par => [],
1428 @_,
1429 children => [
1430 (new CFClient::UI::Empty expand => 1),
1431 (new CFClient::UI::Slider vertical => 1),
1432 ],
1433 );
1434
1435 $self
1436}
1437
1438sub add_paragraph {
1439 my ($self, $color, $text) = @_;
1440
1441 push @{$self->{par}}, [$color, $text];
1442 my $count = scalar @{$self->{par}};
1443 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1444 $self->{children}[1]->update;
1445}
1446
1447sub _draw {
1448 my ($self) = @_;
1449
1450 my $par = $self->{par};
1451
1452 my $bottom = (scalar @$par) - 1;
1453
1454 my $w = $self->{children}[0]{w};
1455 my $y = $self->{h};
1456
1457 glEnable GL_BLEND;
1458 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1459 glEnable GL_TEXTURE_2D;
1460 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1461
1462 # TODO: everything!
1463 while ($y > 0 && $bottom >= 0) {
1464 my $par = $par->[$bottom--];
1465
1466 my $layout = new CFClient::Layout;
1467
1468 $layout->set_height ($::FONTSIZE);
1469 $layout->set_width ($w);
1470 $layout->set_text ($par->[1]);
1471 my $tex = new_from_layout CFClient::Texture $layout;
1472 $y -= $tex->{h};
1473
1474 glColor @{ $par->[0] };
1475 $tex->draw_quad (0, $y);
1476 }
1477
1478 glDisable GL_TEXTURE_2D;
1479 glDisable GL_BLEND;
1480}
1481
1482#############################################################################
1483
1130package CFClient::UI::MapWidget; 1484package CFClient::UI::MapWidget;
1131 1485
1132use strict; 1486use strict;
1133 1487
1134use List::Util qw(min max); 1488use List::Util qw(min max);
1135 1489
1136use SDL; 1490use SDL;
1137use SDL::OpenGL; 1491use SDL::OpenGL;
1138use SDL::OpenGL::Constants;
1139 1492
1140our @ISA = CFClient::UI::Base::; 1493our @ISA = CFClient::UI::Base::;
1141 1494
1142sub new { 1495sub new {
1143 my $class = shift; 1496 my $class = shift;
1144 1497
1145 $class->SUPER::new ( 1498 $class->SUPER::new (
1146 z => -1, 1499 z => -1,
1500 can_focus => 1,
1147 list => (glGenLists 1), 1501 list => (glGenLists 1),
1148 @_ 1502 @_
1149 ) 1503 )
1150} 1504}
1151 1505
1152sub key_down { 1506sub key_down {
… …
1156sub key_up { 1510sub key_up {
1157} 1511}
1158 1512
1159sub size_request { 1513sub size_request {
1160 ( 1514 (
1161 1 + int $::WIDTH / 32, 1515 1 + 32 * int $::WIDTH / 32,
1162 1 + int $::HEIGHT / 32, 1516 1 + 32 * int $::HEIGHT / 32,
1163 ) 1517 )
1164} 1518}
1165 1519
1166sub update { 1520sub update {
1167 my ($self) = @_; 1521 my ($self) = @_;
1168 1522
1169 $self->{need_update} = 1; 1523 $self->{need_update} = 1;
1524 $self->SUPER::update;
1170} 1525}
1171 1526
1172sub _draw { 1527sub draw {
1173 my ($self) = @_; 1528 my ($self) = @_;
1174 1529
1530 $self->{need_update}++;#d#
1175 if (delete $self->{need_update}) { 1531 if (delete $self->{need_update}) {
1176 glNewList $self->{list}, GL_COMPILE; 1532 glNewList $self->{list}, GL_COMPILE;
1177 1533
1178 my $mx = $::CONN->{mapx};
1179 my $my = $::CONN->{mapy};
1180
1181 my $map = $::CONN->{map};
1182
1183 my ($xofs, $yofs);
1184
1185 my $sw = 1 + int $::WIDTH / 32; 1534 my $sw = int $::WIDTH / 32;
1186 my $sh = 1 + int $::HEIGHT / 32; 1535 my $sh = int $::HEIGHT / 32;
1187 1536
1188 if ($::CONN->{mapw} > $sw) { 1537 if ($::MAP) {
1189 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1538 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1190 } else {
1191 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1192 }
1193 1539
1194 if ($::CONN->{maph} > $sh) { 1540 if ($::CFG->{fow_enable}) {
1195 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1541 if ($::CFG->{fow_smooth}) { # smooth fog of war
1196 } else { 1542 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1197 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1543 glConvolutionFilter2D
1198 } 1544 GL_CONVOLUTION_2D,
1199 1545 GL_ALPHA,
1200 glEnable GL_TEXTURE_2D; 1546 3, 3,
1201 glEnable GL_BLEND; 1547 GL_ALPHA, GL_FLOAT,
1202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1548 pack "f*",
1203 1549 0.1, 0.1, 0.1,
1204 my $sw4 = ($sw + 3) & ~3; 1550 0.1, 0.2, 0.1,
1205 my $darkness = "\x00" x ($sw4 * $sh); 1551 0.1, 0.1, 0.1,
1206
1207 for my $x (0 .. $sw - 1) {
1208 my $row = $map->[$x + $xofs];
1209 for my $y (0 .. $sh - 1) {
1210
1211 my $cell = $row->[$y + $yofs]
1212 or next; 1552 ;
1213 1553 glEnable GL_CONVOLUTION_2D;
1214 my $dark = $cell->[0];
1215 if ($dark < 0) {
1216 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1217 } else {
1218 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1219 } 1554 }
1220 1555
1221 for my $num (grep $_, @$cell[1,2,3]) { 1556 my $tex = new CFClient::Texture
1222 my $tex = $::CONN->{face}[$num]{texture} || next; 1557 w => $w,
1223 1558 h => $h,
1224 my ($w, $h) = @$tex{qw(w h)}; 1559 data => $data,
1560 internalformat => GL_ALPHA,
1561 format => GL_ALPHA;
1225 1562
1226 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1563 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1227 } 1564
1565 glEnable GL_BLEND;
1566 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1568
1569 glColor +($::CFG->{fow_intensity}) x 3, 1;
1570 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1571
1572 glDisable GL_TEXTURE_2D;
1573 glDisable GL_BLEND;
1228 } 1574 }
1229 } 1575 }
1230 1576
1231# if (1) { # higher quality darkness
1232# $lighting =~ s/(.)/$1$1$1/gs;
1233# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1234#
1235# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1236#
1237# $lighting = $pb->get_pixels;
1238# $lighting =~ s/(.)../$1/gs;
1239# }
1240
1241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1243
1244 $darkness = new CFClient::Texture
1245 width => $sw4,
1246 height => $sh,
1247 data => $darkness,
1248 internalformat => GL_ALPHA,
1249 format => GL_ALPHA;
1250
1251 glColor 0.45, 0.45, 0.45, 1;
1252 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1253
1254 glDisable GL_TEXTURE_2D;
1255 glDisable GL_BLEND;
1256
1257 glEndList; 1577 glEndList;
1258 } 1578 }
1259 1579
1260 glCallList $self->{list}; 1580 glCallList $self->{list};
1581
1582 if ($FOCUS != $self) {
1583 glColor 64/255, 64/255, 64/255;
1584 glLogicOp GL_AND;
1585 glEnable GL_COLOR_LOGIC_OP;
1586 glBegin GL_QUADS;
1587 glVertex 0, 0;
1588 glVertex 0, $::HEIGHT;
1589 glVertex $::WIDTH, $::HEIGHT;
1590 glVertex $::WIDTH, 0;
1591 glEnd;
1592 glDisable GL_COLOR_LOGIC_OP;
1593 }
1261} 1594}
1262 1595
1263my %DIR = ( 1596my %DIR = (
1264 SDLK_KP8, [1, "north"], 1597 SDLK_KP8, [1, "north"],
1265 SDLK_KP9, [2, "northeast"], 1598 SDLK_KP9, [2, "northeast"],
… …
1281 1614
1282 my $mod = $ev->key_mod; 1615 my $mod = $ev->key_mod;
1283 my $sym = $ev->key_sym; 1616 my $sym = $ev->key_sym;
1284 1617
1285 if ($sym == SDLK_KP5) { 1618 if ($sym == SDLK_KP5) {
1286 $::CONN->send ("command stay fire"); 1619 $::CONN->user_send ("command stay fire");
1620 } elsif ($sym == SDLK_a) {
1621 $::CONN->user_send ("command apply");
1287 } elsif (exists $DIR{$sym}) { 1622 } elsif (exists $DIR{$sym}) {
1288 if ($mod & KMOD_SHIFT) { 1623 if ($mod & KMOD_SHIFT) {
1289 $self->{shft}++; 1624 $self->{shft}++;
1290 $::CONN->send ("command fire $DIR{$sym}[0]"); 1625 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1291 } elsif ($mod & KMOD_CTRL) { 1626 } elsif ($mod & KMOD_CTRL) {
1292 $self->{ctrl}++; 1627 $self->{ctrl}++;
1293 $::CONN->send ("command run $DIR{$sym}[0]"); 1628 $::CONN->user_send ("command run $DIR{$sym}[0]");
1294 } else { 1629 } else {
1295 $::CONN->send ("command $DIR{$sym}[1]"); 1630 $::CONN->user_send ("command $DIR{$sym}[1]");
1296 } 1631 }
1297 } 1632 }
1298} 1633}
1299 1634
1300sub key_up { 1635sub key_up {
… …
1302 1637
1303 my $mod = $ev->key_mod; 1638 my $mod = $ev->key_mod;
1304 my $sym = $ev->key_sym; 1639 my $sym = $ev->key_sym;
1305 1640
1306 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1641 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1307 $::CONN->send ("command fire_stop"); 1642 $::CONN->user_send ("command fire_stop");
1308 } 1643 }
1309 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1644 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1310 $::CONN->send ("command run_stop"); 1645 $::CONN->user_send ("command run_stop");
1311 } 1646 }
1312} 1647}
1313 1648
1314############################################################################# 1649#############################################################################
1315 1650
… …
1353 glPopMatrix; 1688 glPopMatrix;
1354} 1689}
1355 1690
1356############################################################################# 1691#############################################################################
1357 1692
1693package CFClient::UI::Flopper;
1694
1695our @ISA = CFClient::UI::Button::;
1696
1697sub new {
1698 my $class = shift;
1699
1700 my $self = $class->SUPER::new (
1701 state => 0,
1702 connect_activate => \&toggle_flopper,
1703 @_
1704 );
1705
1706 if ($self->{state}) {
1707 $self->{state} = 0;
1708 $self->toggle_flopper;
1709 }
1710
1711 $self
1712}
1713
1714sub toggle_flopper {
1715 my ($self) = @_;
1716
1717 # TODO: use animation
1718 if ($self->{state} = !$self->{state}) {
1719 $CFClient::UI::TOPLEVEL->add ($self->{other});
1720 $self->{other}->move (
1721 ($::WIDTH - $self->{other}{w}) * 0.5,
1722 ($::HEIGHT - $self->{other}{h}) * 0.5,
1723 );
1724 } else {
1725 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1726 }
1727}
1728
1729#############################################################################
1730
1358package CFClient::UI::Toplevel; 1731package CFClient::UI::Toplevel;
1359 1732
1360our @ISA = CFClient::UI::Container::; 1733our @ISA = CFClient::UI::Container::;
1361 1734
1362sub size_request { 1735sub size_request {
1363 ($::WIDTH, $::HEIGHT) 1736 ($::WIDTH, $::HEIGHT)
1364} 1737}
1365 1738
1366sub size_allocate { 1739sub size_allocate {
1367 my ($self, $w, $h) = @_; 1740 my ($self, $x, $y, $w, $h) = @_;
1368 1741
1369 $self->SUPER::size_allocate ($w, $h); 1742 $self->_size_allocate ($x, $y, $w, $h);
1370 1743
1371 $_->size_allocate ($_->size_request) 1744 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1372 for @{$self->{children}}; 1745 for @{$self->{children}};
1373} 1746}
1374 1747
1375sub translate { 1748sub translate {
1376 my ($self, $x, $y) = @_; 1749 my ($self, $x, $y) = @_;
… …
1379} 1752}
1380 1753
1381sub update { 1754sub update {
1382 my ($self) = @_; 1755 my ($self) = @_;
1383 1756
1384 $self->size_allocate ($self->size_request); 1757 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1385 ::refresh (); 1758 ::refresh ();
1386} 1759}
1387 1760
1388sub add { 1761sub add {
1389 my ($self, $widget) = @_; 1762 my ($self, $widget) = @_;
1390 1763
1391 $self->SUPER::add ($widget); 1764 $self->SUPER::add ($widget);
1392 1765
1393 $widget->size_allocate ($widget->size_request); 1766 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1394} 1767}
1395 1768
1396sub draw { 1769sub draw {
1397 my ($self) = @_; 1770 my ($self) = @_;
1398 1771

Diff Legend

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