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.125 by root, Mon Apr 17 20:52:15 2006 UTC vs.
Revision 1.143 by root, Thu Apr 20 21:28:51 2006 UTC

… …
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 = $ROOT->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->coord2local ($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 || $ROOT->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->coord2local ($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;
… …
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 || $ROOT->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;
… …
87 87
88package CFClient::UI::Base; 88package CFClient::UI::Base;
89 89
90use strict; 90use strict;
91 91
92use SDL::OpenGL; 92use CFClient::OpenGL;
93 93
94sub new { 94sub new {
95 my $class = shift; 95 my $class = shift;
96 96
97 my $self = bless { 97 my $self = bless {
98 x => 0, 98 x => 0,
99 y => 0, 99 y => 0,
100 z => 0, 100 z => 0,
101 w => -1,
102 h => -1,
103 @_ 101 @_
104 }, $class; 102 }, $class;
105 103
106 for (keys %$self) { 104 for (keys %$self) {
107 if (/^connect_(.*)$/) { 105 if (/^connect_(.*)$/) {
… …
110 } 108 }
111 109
112 $self 110 $self
113} 111}
114 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
115sub move { 129sub move {
116 my ($self, $x, $y, $z) = @_; 130 my ($self, $x, $y, $z) = @_;
131
117 $self->{x} = int $x; 132 $self->{x} = int $x;
118 $self->{y} = int $y; 133 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 134 $self->{z} = $z if defined $z;
135
136 $self->update;
120} 137}
121 138
122sub needs_redraw { 139sub needs_redraw {
123 0 140 0
124} 141}
… …
126sub size_request { 143sub size_request {
127 require Carp; 144 require Carp;
128 Carp::confess "size_request is abtract"; 145 Carp::confess "size_request is abtract";
129} 146}
130 147
131sub _size_allocate { 148sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 149 my ($self, $x, $y, $w, $h) = @_;
133 150
151 if ($self->{aspect}) {
152 my $w2 = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect};
154
155 # use alignment to adjust x, y
156
157 $x += ($w - $w2) * 0.5;
158 $y += ($h - $h2) * 0.5;
159
160 ($w, $h) = ($w2, $h2);
161 }
162
163 if ($self->{x} != $x || $self->{y} != $y) {
134 $self->{x} = $x; 164 $self->{x} = $x;
135 $self->{y} = $y; 165 $self->{y} = $y;
166 $self->update;
167 }
136 168
137 return unless $self->{w} != $w || $self->{h} != $h; 169 if ($self->{w} != $w || $self->{h} != $h) {
138
139 $self->{w} = $w; 170 $self->{w} = $w;
140 $self->{h} = $h; 171 $self->{h} = $h;
141 172
173 $self->size_allocate ($w, $h);
174 $self->update;
142 1 175 }
143} 176}
144 177
145sub size_allocate { 178sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_; 179 # nothing to be done
147
148 $self->_size_allocate ($x, $y, $w, $h);
149} 180}
150 181
151# return top left coordinates 182# return top left coordinates
152sub _topleft { 183sub _topleft {
153 my ($self, $x, $y) = @_; 184 my ($self, $x, $y) = @_;
… …
284} 315}
285 316
286sub connect { 317sub connect {
287 my ($self, $signal, $cb) = @_; 318 my ($self, $signal, $cb) = @_;
288 319
289 push @{ $self->{cb}{$signal} }, $cb; 320 push @{ $self->{signal_cb}{$signal} }, $cb;
290} 321}
291 322
292sub emit { 323sub emit {
293 my ($self, $signal, @args) = @_; 324 my ($self, $signal, @args) = @_;
294 325
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
295 $_->($self, @args) 327 $cb->($self, @args);
296 for @{$self->{cb}{$signal} || []}; 328 }
297} 329}
298 330
299sub DESTROY { 331sub DESTROY {
300 my ($self) = @_; 332 my ($self) = @_;
301 333
… …
307package CFClient::UI::DrawBG; 339package CFClient::UI::DrawBG;
308 340
309our @ISA = CFClient::UI::Base::; 341our @ISA = CFClient::UI::Base::;
310 342
311use strict; 343use strict;
312use SDL::OpenGL; 344use CFClient::OpenGL;
313 345
314sub new { 346sub new {
315 my $class = shift; 347 my $class = shift;
316 348
317 # range [value, low, high, page] 349 # range [value, low, high, page]
… …
381 $self->{children} = [ 413 $self->{children} = [
382 sort { $a->{z} <=> $b->{z} } 414 sort { $a->{z} <=> $b->{z} }
383 @{$self->{children}}, $child 415 @{$self->{children}}, $child
384 ]; 416 ];
385 417
386 $self->{w} = $self->{h} = -1; 418 $child->check_size;
387 $self->update;
388} 419}
389 420
390sub remove { 421sub remove {
391 my ($self, $widget) = @_; 422 my ($self, $child) = @_;
392 423
424 delete $child->{parent};
425
393 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
394 427
395 $self->check_size; 428 $self->check_size;
396} 429}
397 430
398sub find_widget { 431sub find_widget {
… …
430 463
431 $class->SUPER::new (children => [$child], %arg) 464 $class->SUPER::new (children => [$child], %arg)
432} 465}
433 466
434sub add { 467sub add {
435 my ($self, $widget) = @_; 468 my ($self, $child) = @_;
436 469
437 $self->{children} = []; 470 $self->{children} = [];
438 471
439 $self->SUPER::add ($widget); 472 $self->SUPER::add ($child);
440} 473}
441 474
442sub remove { 475sub remove {
443 my ($self, $widget) = @_; 476 my ($self, $widget) = @_;
444 477
… …
453sub size_request { 486sub size_request {
454 $_[0]{children}[0]->size_request 487 $_[0]{children}[0]->size_request
455} 488}
456 489
457sub size_allocate { 490sub size_allocate {
458 my ($self, $x, $y, $w, $h) = @_; 491 my ($self, $w, $h) = @_;
459 492
460 $self->_size_allocate ($x, $y, $w, $h) or return;
461
462 $self->{children}[0]->size_allocate (0, 0, $w, $h); 493 $self->{children}[0]->configure (0, 0, $w, $h);
463} 494}
464 495
465############################################################################# 496#############################################################################
466 497
467package CFClient::UI::Window; 498package CFClient::UI::Window;
468 499
469our @ISA = CFClient::UI::Bin::; 500our @ISA = CFClient::UI::Bin::;
470 501
471use SDL::OpenGL; 502use CFClient::OpenGL;
472 503
473sub new { 504sub new {
474 my ($class, %arg) = @_; 505 my ($class, %arg) = @_;
475 506
476 my $self = $class->SUPER::new (%arg); 507 my $self = $class->SUPER::new (%arg);
… …
493 $self->child->draw; 524 $self->child->draw;
494 }; 525 };
495} 526}
496 527
497sub size_allocate { 528sub size_allocate {
498 my ($self, $x, $y, $w, $h) = @_; 529 my ($self, $w, $h) = @_;
499 530
500 $self->_size_allocate ($x, $y, $w, $h) or return;
501
502 $self->child->size_allocate (0, 0, $w, $h); 531 $self->child->configure (0, 0, $w, $h);
503 532
504 $self->render_chld; 533 $self->render_chld;
505} 534}
506 535
507sub _draw { 536sub _draw {
… …
538 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
539 568
540 @$self{qw(child_w child_h)} 569 @$self{qw(child_w child_h)}
541} 570}
542 571
543sub size_allocate {
544 my ($self, $x, $y, $w, $h) = @_;
545
546 $self->_size_allocate ($x, $y, $w, $h) or return;
547}
548
549sub _draw { 572sub _draw {
550 my ($self) = @_; 573 my ($self) = @_;
551 574
552 $self->{children}[1]->draw; 575 $self->{children}[1]->draw;
553} 576}
… …
557 580
558package CFClient::UI::Frame; 581package CFClient::UI::Frame;
559 582
560our @ISA = CFClient::UI::Bin::; 583our @ISA = CFClient::UI::Bin::;
561 584
562use SDL::OpenGL; 585use CFClient::OpenGL;
563 586
564sub size_request { 587sub size_request {
565 my ($self) = @_; 588 my ($self) = @_;
566 my $chld = $self->child 589 my $chld = $self->child
567 or return (0, 0); 590 or return (0, 0);
… …
572} 595}
573 596
574sub size_allocate { 597sub size_allocate {
575 my ($self, $x, $y, $w, $h) = @_; 598 my ($self, $x, $y, $w, $h) = @_;
576 599
577 $self->_size_allocate ($x, $y, $w, $h) or return;
578
579 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 600 $self->child->configure (2, 2, $w - 4, $h - 4);
580} 601}
581 602
582sub _draw { 603sub _draw {
583 my ($self) = @_; 604 my ($self) = @_;
584 605
… …
601 622
602package CFClient::UI::FancyFrame; 623package CFClient::UI::FancyFrame;
603 624
604our @ISA = CFClient::UI::Bin::; 625our @ISA = CFClient::UI::Bin::;
605 626
606use SDL::OpenGL; 627use CFClient::OpenGL;
607 628
608my @tex = 629my @tex =
609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
610 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 631 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
611 632
612sub new { 633sub new {
613 my $class = shift; 634 my $class = shift;
614 635
615 # TODO: user_x, user_y, overwrite moveto? 636 # TODO: user_x, user_y, overwrite moveto?
616 637
617 $class->SUPER::new ( 638 my $self = $class->SUPER::new (
618 bg => [1, 1, 1, 1], 639 bg => [1, 1, 1, 1],
619 border_bg => [1, 1, 1, 1], 640 border_bg => [1, 1, 1, 1],
620 border => int $::FONTSIZE * 0.8, 641 border => 0.8,
621 @_ 642 @_
643 );
644
645 $self->{title} &&= new CFClient::UI::Label
646 align => 0,
647 valign => 1,
648 text => $self->{title},
649 fontsize => 1;
650
651 $self
652}
653
654sub border {
655 int $_[0]{border} * $::FONTSIZE
656}
657
658sub size_request {
659 my ($self) = @_;
660
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662
663 my ($w, $h) = $self->SUPER::size_request;
664
665 (
666 $w + $self->border * 2,
667 $h + $self->border * 2,
622 ) 668 )
623} 669}
624 670
625sub size_request {
626 my ($self) = @_;
627
628 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
629
630 my ($w, $h) = $self->SUPER::size_request;
631
632 (
633 $w + $self->{border} * 2,
634 $h + $self->{border} * 2,
635 )
636}
637
638sub size_allocate { 671sub size_allocate {
639 my ($self, $x, $y, $w, $h) = @_; 672 my ($self, $w, $h) = @_;
640 673
641 $self->_size_allocate ($x, $y, $w, $h) or return;
642
643 $h -= List::Util::max 0, $self->{border} * 2; 674 $h -= List::Util::max 0, $self->border * 2;
644 $w -= List::Util::max 0, $self->{border} * 2; 675 $w -= List::Util::max 0, $self->border * 2;
645 676
677 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
678 if $self->{title};
679
646 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 680 $self->child->configure ($self->border, $self->border, $w, $h);
647} 681}
648 682
649sub button_down { 683sub button_down {
650 my ($self, $ev, $x, $y) = @_; 684 my ($self, $ev, $x, $y) = @_;
651 685
686 my $border = $self->border;
687
652 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 688 if ($x < $self->{w} && $x >= $self->{w} - $border
653 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 689 && $y < $self->{h} && $y >= $self->{h} - $border) {
654 690
655 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 691 my ($ox, $oy) = ($ev->{x}, $ev->{y});
656 my ($bw, $bh) = ($self->{w}, $self->{h}); 692 my ($bw, $bh) = ($self->{w}, $self->{h});
657 693
658 $self->{motion} = sub { 694 $self->{motion} = sub {
659 my ($ev, $x, $y) = @_; 695 my ($ev, $x, $y) = @_;
660 696
661 ($x, $y) = ($ev->motion_x, $ev->motion_y); 697 ($x, $y) = ($ev->{x}, $ev->{y});
662 698
663 $self->{user_w} = $bw + $x - $ox; 699 $self->{user_w} = $bw + $x - $ox;
664 $self->{user_h} = $bh + $y - $oy; 700 $self->{user_h} = $bh + $y - $oy;
665 $self->update; 701 $self->check_size;
666 }; 702 };
667 703
668 } elsif ($x >= 0 && $x < $self->{w} 704 } elsif ($x >= 0 && $x < $self->{w}
669 && $y >= 0 && $y < $self->{border}) { 705 && $y >= 0 && $y < $border) {
670 706
671 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 707 my ($ox, $oy) = ($ev->{x}, $ev->{y});
672 my ($bx, $by) = ($self->{x}, $self->{y}); 708 my ($bx, $by) = ($self->{x}, $self->{y});
673 709
674 $self->{motion} = sub { 710 $self->{motion} = sub {
675 my ($ev, $x, $y) = @_; 711 my ($ev, $x, $y) = @_;
676 712
677 ($x, $y) = ($ev->motion_x, $ev->motion_y); 713 ($x, $y) = ($ev->{x}, $ev->{y});
678 714
679 $self->move ($bx + $x - $ox, $by + $y - $oy); 715 $self->move ($bx + $x - $ox, $by + $y - $oy);
680 $self->update; 716 $self->update;
681 }; 717 };
682 } 718 }
… …
703 glEnable GL_BLEND; 739 glEnable GL_BLEND;
704 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
705 glEnable GL_TEXTURE_2D; 741 glEnable GL_TEXTURE_2D;
706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
707 743
744 my $border = $self->border;
745
708 glColor @{ $self->{border_bg} }; 746 glColor @{ $self->{border_bg} };
709 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 747 $tex[1]->draw_quad (0, 0, $w, $border);
710 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 748 $tex[3]->draw_quad (0, $border, $border, $ch);
711 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
712 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 750 $tex[4]->draw_quad (0, $h - $border, $w, $border);
713 751
714 my $bg = $tex[0]; 752 my $bg = $tex[0];
715 753
716 # TODO: repeat texture not scale 754 # TODO: repeat texture not scale
717 my $rep_x = $cw / $bg->{w}; 755 my $rep_x = $cw / $bg->{w};
… …
720 glColor @{ $self->{bg} }; 758 glColor @{ $self->{bg} };
721 759
722 $bg->{s} = $rep_x; 760 $bg->{s} = $rep_x;
723 $bg->{t} = $rep_y; 761 $bg->{t} = $rep_y;
724 $bg->{wrap_mode} = 1; 762 $bg->{wrap_mode} = 1;
725 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 763 $bg->draw_quad ($border, $border, $cw, $ch);
726 764
727 glDisable GL_TEXTURE_2D; 765 glDisable GL_TEXTURE_2D;
728 glDisable GL_BLEND; 766 glDisable GL_BLEND;
729 767
768 $self->{title}->draw if $self->{title};
730 $self->child->draw; 769 $self->child->draw;
731} 770}
732 771
733############################################################################# 772#############################################################################
734 773
… …
736 775
737our @ISA = CFClient::UI::Base::; 776our @ISA = CFClient::UI::Base::;
738 777
739use List::Util qw(max sum); 778use List::Util qw(max sum);
740 779
741use SDL::OpenGL; 780use CFClient::OpenGL;
742 781
743sub new { 782sub new {
744 my $class = shift; 783 my $class = shift;
745 784
746 $class->SUPER::new ( 785 $class->SUPER::new (
… …
753 my ($self, $x, $y, $child) = @_; 792 my ($self, $x, $y, $child) = @_;
754 793
755 $child->set_parent ($self); 794 $child->set_parent ($self);
756 $self->{children}[$y][$x] = $child; 795 $self->{children}[$y][$x] = $child;
757 796
758 $self->{w} = $self->{h} = -1; 797 $child->check_size;
759 $self->update;
760} 798}
761 799
762# TODO: move to container class maybe? send childs a signal on removal? 800# TODO: move to container class maybe? send childs a signal on removal?
763sub clear { 801sub clear {
764 my ($self) = @_; 802 my ($self) = @_;
… …
799 (sum @$hs), 837 (sum @$hs),
800 ) 838 )
801} 839}
802 840
803sub size_allocate { 841sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_; 842 my ($self, $w, $h) = @_;
805
806 $self->_size_allocate ($x, $y, $w, $h) or return;
807 843
808 my ($ws, $hs) = $self->get_wh; 844 my ($ws, $hs) = $self->get_wh;
809 845
810 my $req_w = sum @$ws; 846 my $req_w = sum @$ws;
811 my $req_h = sum @$hs; 847 my $req_h = sum @$hs;
… …
833 869
834 for my $c (0 .. $#$row) { 870 for my $c (0 .. $#$row) {
835 my $col_w = $ws->[$c]; 871 my $col_w = $ws->[$c];
836 872
837 if (my $widget = $row->[$c]) { 873 if (my $widget = $row->[$c]) {
838 $widget->size_allocate ($x, $y, $col_w, $row_h); 874 $widget->configure ($x, $y, $col_w, $row_h);
839 } 875 }
840 876
841 $x += $col_w; 877 $x += $col_w;
842 } 878 }
843 879
… …
888 (List::Util::max map $_->[1], @alloc), 924 (List::Util::max map $_->[1], @alloc),
889 ) 925 )
890} 926}
891 927
892sub size_allocate { 928sub size_allocate {
893 my ($self, $x, $y, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
894
895 $self->_size_allocate ($x, $y, $w, $h) or return;
896 930
897 ($h, $w) = ($w, $h); 931 ($h, $w) = ($w, $h);
898 932
899 my $children = $self->{children}; 933 my $children = $self->{children};
900 934
… …
922 956
923 my $y = 0; 957 my $y = 0;
924 for (0 .. $#$children) { 958 for (0 .. $#$children) {
925 my $child = $children->[$_]; 959 my $child = $children->[$_];
926 my $h = $h[$_]; 960 my $h = $h[$_];
927 $child->size_allocate ($y, 0, $h, $w); 961 $child->configure ($y, 0, $h, $w);
928 962
929 $y += $h; 963 $y += $h;
930 } 964 }
931 965
932 1 966 1
… …
950 (List::Util::sum map $_->[1], @alloc), 984 (List::Util::sum map $_->[1], @alloc),
951 ) 985 )
952} 986}
953 987
954sub size_allocate { 988sub size_allocate {
955 my ($self, $x, $y, $w, $h) = @_; 989 my ($self, $w, $h) = @_;
956
957 $self->_size_allocate ($x, $y, $w, $h) or return;
958 990
959 my $children = $self->{children}; 991 my $children = $self->{children};
960 992
961 my @h = map +($_->size_request)[1], @$children; 993 my @h = map +($_->size_request)[1], @$children;
962 994
… …
980 1012
981 my $y = 0; 1013 my $y = 0;
982 for (0 .. $#$children) { 1014 for (0 .. $#$children) {
983 my $child = $children->[$_]; 1015 my $child = $children->[$_];
984 my $h = $h[$_]; 1016 my $h = $h[$_];
985 $child->size_allocate (0, $y, $w, $h); 1017 $child->configure (0, $y, $w, $h);
986 1018
987 $y += $h; 1019 $y += $h;
988 } 1020 }
989 1021
990 1 1022 1
… …
994 1026
995package CFClient::UI::Label; 1027package CFClient::UI::Label;
996 1028
997our @ISA = CFClient::UI::Base::; 1029our @ISA = CFClient::UI::Base::;
998 1030
999use SDL::OpenGL; 1031use CFClient::OpenGL;
1000 1032
1001sub new { 1033sub new {
1002 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
1003 1035
1004 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
1005 fg => [1, 1, 1], 1037 fg => [1, 1, 1],
1006 fontsize => $::FONTSIZE, 1038 fontsize => 1,
1007 text => "", 1039 text => "",
1008 align => -1, 1040 align => -1,
1009 valign => -1, 1041 valign => -1,
1010 padding => 2, 1042 padding => 2,
1011 layout => new CFClient::Layout, 1043 layout => new CFClient::Layout,
1012 %arg 1044 %arg
1013 ); 1045 );
1014 1046
1015 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1047 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout;
1049 $layout->set_text (delete $self->{template});
1050 $self->{template} = $layout;
1051 }
1016 1052
1017 $self->set_text (delete $self->{text}) if exists $self->{text}; 1053 $self->set_text (delete $self->{text}) if exists $self->{text};
1018 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1019 1055
1020 $self 1056 $self
… …
1050 1086
1051sub size_request { 1087sub size_request {
1052 my ($self) = @_; 1088 my ($self) = @_;
1053 1089
1054 $self->{layout}->set_width; 1090 $self->{layout}->set_width;
1055 $self->{layout}->set_height ($self->{fontsize}); 1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1056 1092
1057 my ($w, $h) = $self->{layout}->size; 1093 my ($w, $h) = $self->{layout}->size;
1094
1095 if (exists $self->{template}) {
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097
1098 my ($w2, $h2) = $self->{template}->size;
1099
1100 $w = List::Util::max $w, $w2;
1101 $h = List::Util::max $h, $h2;
1102 }
1058 1103
1059 ( 1104 (
1060 $w + $self->{padding} * 2, 1105 $w + $self->{padding} * 2,
1061 $h + $self->{padding} * 2, 1106 $h + $self->{padding} * 2,
1062 ) 1107 )
1063} 1108}
1064 1109
1065sub size_allocate { 1110sub size_allocate {
1066 my ($self, $x, $y, $w, $h) = @_; 1111 my ($self, $w, $h) = @_;
1067
1068 $self->_size_allocate ($x, $y, $w, $h) or return;
1069 1112
1070 delete $self->{texture}; 1113 delete $self->{texture};
1071}
1072
1073sub update {
1074 my ($self) = @_;
1075
1076 delete $self->{texture};
1077 $self->SUPER::update;
1078} 1114}
1079 1115
1080sub _draw { 1116sub _draw {
1081 my ($self) = @_; 1117 my ($self) = @_;
1082 1118
1083 my $tex = $self->{texture} ||= do { 1119 my $tex = $self->{texture} ||= do {
1084 $self->{layout}->set_width ($self->{w}); 1120 $self->{layout}->set_width ($self->{w});
1085 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1121 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1086 new_from_layout CFClient::Texture $self->{layout} 1122 new_from_layout CFClient::Texture $self->{layout}
1087 }; 1123 };
1088 1124
1089 glEnable GL_BLEND; 1125 glEnable GL_BLEND;
1090 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1126 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1115 1151
1116package CFClient::UI::EntryBase; 1152package CFClient::UI::EntryBase;
1117 1153
1118our @ISA = CFClient::UI::Label::; 1154our @ISA = CFClient::UI::Label::;
1119 1155
1120use SDL; 1156use CFClient::OpenGL;
1121use SDL::OpenGL;
1122 1157
1123sub new { 1158sub new {
1124 my $class = shift; 1159 my $class = shift;
1125 1160
1126 $class->SUPER::new ( 1161 $class->SUPER::new (
… …
1140 1175
1141 delete $self->{cur_h}; 1176 delete $self->{cur_h};
1142 1177
1143 return if $self->{text} eq $text; 1178 return if $self->{text} eq $text;
1144 1179
1180 delete $self->{texture};
1181
1145 $self->{last_activity} = $::NOW; 1182 $self->{last_activity} = $::NOW;
1146 $self->{text} = $text; 1183 $self->{text} = $text;
1147 1184
1148 $text =~ s/./*/g if $self->{hidden}; 1185 $text =~ s/./*/g if $self->{hidden};
1149 $self->{layout}->set_text ("$text "); 1186 $self->{layout}->set_text ("$text ");
… …
1162 1199
1163 ($w + 1, $h) # add 1 for cursor 1200 ($w + 1, $h) # add 1 for cursor
1164} 1201}
1165 1202
1166sub size_allocate { 1203sub size_allocate {
1167 my ($self, $x, $y, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
1168
1169 $self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1170 1205
1171 $self->_set_text ($self->{text}); 1206 $self->_set_text ($self->{text});
1172} 1207}
1173 1208
1174sub set_text { 1209sub set_text {
… …
1180} 1215}
1181 1216
1182sub key_down { 1217sub key_down {
1183 my ($self, $ev) = @_; 1218 my ($self, $ev) = @_;
1184 1219
1185 my $mod = $ev->key_mod; 1220 my $mod = $ev->{mod};
1186 my $sym = $ev->key_sym; 1221 my $sym = $ev->{sym};
1187
1188 my $uni = $ev->key_unicode; 1222 my $uni = $ev->{unicode};
1189 1223
1190 my $text = $self->get_text; 1224 my $text = $self->get_text;
1191 1225
1192 if ($sym == SDLK_BACKSPACE) { 1226 if ($sym == 8) {
1193 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1227 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1194 } elsif ($sym == SDLK_DELETE) { 1228 } elsif ($sym == 127) {
1195 substr $text, $self->{cursor}, 1, ""; 1229 substr $text, $self->{cursor}, 1, "";
1196 } elsif ($sym == SDLK_LEFT) { 1230 } elsif ($sym == CFClient::SDLK_LEFT) {
1197 --$self->{cursor} if $self->{cursor}; 1231 --$self->{cursor} if $self->{cursor};
1198 } elsif ($sym == SDLK_RIGHT) { 1232 } elsif ($sym == CFClient::SDLK_RIGHT) {
1199 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1233 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1200 } elsif ($sym == SDLK_HOME) { 1234 } elsif ($sym == CFClient::SDLK_HOME) {
1201 $self->{cursor} = 0; 1235 $self->{cursor} = 0;
1202 } elsif ($sym == SDLK_END) { 1236 } elsif ($sym == CFClient::SDLK_END) {
1203 $self->{cursor} = length $text; 1237 $self->{cursor} = length $text;
1204 } elsif ($sym == SDLK_ESCAPE) { 1238 } elsif ($sym == 27) {
1205 $self->emit ('escape'); 1239 $self->emit ('escape');
1206 } elsif ($uni) { 1240 } elsif ($uni) {
1207 substr $text, $self->{cursor}++, 0, chr $uni; 1241 substr $text, $self->{cursor}++, 0, chr $uni;
1208 } 1242 }
1209 1243
… …
1284 1318
1285package CFClient::UI::Entry; 1319package CFClient::UI::Entry;
1286 1320
1287our @ISA = CFClient::UI::EntryBase::; 1321our @ISA = CFClient::UI::EntryBase::;
1288 1322
1289use SDL; 1323use CFClient::OpenGL;
1290use SDL::OpenGL;
1291 1324
1292sub key_down { 1325sub key_down {
1293 my ($self, $ev) = @_; 1326 my ($self, $ev) = @_;
1294 1327
1295 my $sym = $ev->key_sym; 1328 my $sym = $ev->{sym};
1296 1329
1297 if ($sym == SDLK_RETURN) { 1330 if ($sym == 13) {
1298 $self->emit (activate => $self->get_text); 1331 $self->emit (activate => $self->get_text);
1299 $self->update; 1332 $self->update;
1300 1333
1301 } else { 1334 } else {
1302 $self->SUPER::key_down ($ev); 1335 $self->SUPER::key_down ($ev);
… …
1308 1341
1309package CFClient::UI::Button; 1342package CFClient::UI::Button;
1310 1343
1311our @ISA = CFClient::UI::Label::; 1344our @ISA = CFClient::UI::Label::;
1312 1345
1313use SDL; 1346use CFClient::OpenGL;
1314use SDL::OpenGL;
1315 1347
1316my @tex = 1348my @tex =
1317 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1349 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1318 qw(b1_button_active.png); 1350 qw(b1_button_active.png);
1319 1351
… …
1324 padding => 4, 1356 padding => 4,
1325 fg => [1, 1, 1], 1357 fg => [1, 1, 1],
1326 bg => [1, 1, 1, 0.2], 1358 bg => [1, 1, 1, 0.2],
1327 active_fg => [0, 0, 1], 1359 active_fg => [0, 0, 1],
1328 can_hover => 1, 1360 can_hover => 1,
1361 align => 0,
1362 valign => 0,
1329 @_ 1363 @_
1330 ) 1364 )
1331} 1365}
1332 1366
1333sub button_up { 1367sub button_up {
… …
1370 1404
1371my @tex = 1405my @tex =
1372 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1373 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1407 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1374 1408
1375use SDL; 1409use CFClient::OpenGL;
1376use SDL::OpenGL;
1377 1410
1378sub new { 1411sub new {
1379 my $class = shift; 1412 my $class = shift;
1380 1413
1381 $class->SUPER::new ( 1414 $class->SUPER::new (
… …
1392 my ($self) = @_; 1425 my ($self) = @_;
1393 1426
1394 ($self->{padding} * 2 + 6) x 2 1427 ($self->{padding} * 2 + 6) x 2
1395} 1428}
1396 1429
1397sub size_allocate {
1398 my ($self, $x, $y, $w, $h) = @_;
1399
1400 $self->_size_allocate ($x, $y, $w, $h) or return;
1401}
1402
1403sub button_down { 1430sub button_down {
1404 my ($self, $ev, $x, $y) = @_; 1431 my ($self, $ev, $x, $y) = @_;
1405 1432
1406 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1433 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1407 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1434 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1437 1464
1438package CFClient::UI::VGauge; 1465package CFClient::UI::VGauge;
1439 1466
1440our @ISA = CFClient::UI::Base::; 1467our @ISA = CFClient::UI::Base::;
1441 1468
1442use SDL::OpenGL; 1469use CFClient::OpenGL;
1443 1470
1444my %tex = ( 1471my %tex = (
1445 food => [ 1472 food => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1473 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1447 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1474 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
… …
1462 1489
1463# eg. VGauge->new (gauge => 'food'), default gauge: food 1490# eg. VGauge->new (gauge => 'food'), default gauge: food
1464sub new { 1491sub new {
1465 my $class = shift; 1492 my $class = shift;
1466 1493
1467 my $self = $class->SUPER::new (gauge => 'food', @_); 1494 my $self = $class->SUPER::new (
1495 type => 'food',
1496 @_
1497 );
1498
1499 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1468 1500
1469 $self 1501 $self
1470} 1502}
1471 1503
1472sub size_request { 1504sub size_request {
1473 my ($self) = @_; 1505 my ($self) = @_;
1474 1506
1475 ($self->{w}, $self->{h}) 1507 #my $tex = $tex{$self->{type}}[0];
1508 #@$tex{qw(w h)}
1509 (0, 0)
1476} 1510}
1477 1511
1478sub set_max { 1512sub set_max {
1479 my ($self, $max) = @_; 1513 my ($self, $max) = @_;
1514
1480 $self->{max_val} = $max; 1515 $self->{max_val} = $max;
1481} 1516}
1482 1517
1483sub set_value { 1518sub set_value {
1484 my ($self, $val, $max) = @_; 1519 my ($self, $val, $max) = @_;
… …
1493} 1528}
1494 1529
1495sub _draw { 1530sub _draw {
1496 my ($self) = @_; 1531 my ($self) = @_;
1497 1532
1498 my $tex = $tex{$self->{gauge}}; 1533 my $tex = $tex{$self->{type}};
1499 1534
1500 my ($w, $h) = ($self->{w}, $self->{h}); 1535 my ($w, $h) = ($self->{w}, $self->{h});
1536
1537 if ($self->{vertical}) {
1538 glRotate 90, 0, 0, 1;
1539 glTranslate 0, -$self->{w}, 0;
1540
1541 ($w, $h) = ($h, $w);
1542 }
1501 1543
1502 my $ycut = $self->{val} / ($self->{max_val} || 1); 1544 my $ycut = $self->{val} / ($self->{max_val} || 1);
1503 $ycut = 1 if $self->{val} > $self->{max_val}; 1545 $ycut = 1 if $self->{val} > $self->{max_val};
1504 1546
1505 my $t1 = $tex->[0]; 1547 my $t1 = $tex->[0];
… …
1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512 1554
1513 my $h1 = $self->{h} - $ycut * $self->{h}; 1555 my $h1 = $self->{h} - $ycut * $self->{h};
1514 my $h2 = $ycut * $self->{h}; 1556 my $h2 = $ycut * $self->{h};
1515 1557
1516 my $yp = 0;
1517
1518 glBindTexture (GL_TEXTURE_2D, $t1->{name}); 1558 glBindTexture GL_TEXTURE_2D, $t1->{name};
1519 glBegin (GL_QUADS); 1559 glBegin GL_QUADS;
1520 glTexCoord (0, 0); glVertex (0 , $yp); 1560 glTexCoord 0 , 0; glVertex 0 , 0;
1521 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1); 1561 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1522 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1); 1562 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1523 glTexCoord (1, 0); glVertex (0 + $w, $yp); 1563 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1524 glEnd (); 1564 glEnd;
1525 1565
1526 $yp += $h1;
1527
1528 glBindTexture (GL_TEXTURE_2D, $t2->{name}); 1566 glBindTexture GL_TEXTURE_2D, $t2->{name};
1529 glBegin (GL_QUADS); 1567 glBegin GL_QUADS;
1530 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp); 1568 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1531 glTexCoord (0, 1); glVertex (0 , $yp + $h2); 1569 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1532 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2); 1570 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1533 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp); 1571 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1534 glEnd (); 1572 glEnd;
1535 1573
1536 glDisable GL_BLEND; 1574 glDisable GL_BLEND;
1537 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1538} 1576}
1539 1577
1540############################################################################# 1578#############################################################################
1541 1579
1580package CFClient::UI::Gauge;
1581
1582our @ISA = CFClient::UI::VBox::;
1583
1584sub new {
1585 my ($class, %arg) = shift;
1586
1587 my $self = $class->SUPER::new (
1588 @_,
1589 );
1590
1591 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
1592 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1593 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
1594
1595 $self
1596}
1597
1598sub set_value {
1599 my ($self, $val, $max) = @_;
1600
1601 $self->set_max ($max)
1602 if defined $max;
1603
1604 $self->{gauge}->set_value ($val, $max);
1605 $self->{value}->set_text ($val);
1606}
1607
1608sub set_max {
1609 my ($self, $max) = @_;
1610
1611 $self->{gauge}->set_max ($max);
1612 $self->{max}->set_text ($max);
1613}
1614
1615#############################################################################
1616
1542package CFClient::UI::Slider; 1617package CFClient::UI::Slider;
1543 1618
1544use strict; 1619use strict;
1545 1620
1546use SDL::OpenGL; 1621use CFClient::OpenGL;
1547 1622
1548our @ISA = CFClient::UI::DrawBG::; 1623our @ISA = CFClient::UI::DrawBG::;
1549 1624
1550my @tex = 1625my @tex =
1551 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1561 # TODO: calculations are off 1636 # TODO: calculations are off
1562 my $self = $class->SUPER::new ( 1637 my $self = $class->SUPER::new (
1563 fg => [1, 1, 1], 1638 fg => [1, 1, 1],
1564 active_fg => [0, 0, 0], 1639 active_fg => [0, 0, 0],
1565 range => [0, 0, 100, 10], 1640 range => [0, 0, 100, 10],
1566 req_w => 40, 1641 req_w => 20,
1567 req_h => 13, 1642 req_h => 20,
1568 vertical => 0, 1643 vertical => 0,
1569 can_hover => 1, 1644 can_hover => 1,
1570 inner_pad => 5, 1645 inner_pad => 5,
1571 @_ 1646 @_
1572 ); 1647 );
… …
1676 1751
1677package CFClient::UI::TextView; 1752package CFClient::UI::TextView;
1678 1753
1679our @ISA = CFClient::UI::HBox::; 1754our @ISA = CFClient::UI::HBox::;
1680 1755
1681use SDL::OpenGL; 1756use CFClient::OpenGL;
1682 1757
1683sub new { 1758sub new {
1684 my $class = shift; 1759 my $class = shift;
1685 1760
1686 my $self = $class->SUPER::new ( 1761 my $self = $class->SUPER::new (
1687 req_w => $::WIDTH / 6,
1688 req_h => $::HEIGHT / 6,
1689 fontsize => $::FONTSIZE, 1762 fontsize => 1,
1690 @_, 1763 @_,
1691 1764
1692 layout => (new CFClient::Layout), 1765 layout => (new CFClient::Layout),
1693 par => [], 1766 par => [],
1694 height => 0, 1767 height => 0,
… …
1715sub text_height { 1788sub text_height {
1716 my ($self, $text) = @_; 1789 my ($self, $text) = @_;
1717 1790
1718 my $layout = $self->{layout}; 1791 my $layout = $self->{layout};
1719 1792
1720 $layout->set_height ($self->{fontsize}); 1793 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1721 $layout->set_width ($self->{w}); 1794 $layout->set_width ($self->{w});
1722 $layout->set_text ($text); 1795 $layout->set_text ($text);
1723 1796
1724 ($layout->size)[1] 1797 ($layout->size)[1]
1725} 1798}
… …
1729 1802
1730 $self->{need_reflow}++; 1803 $self->{need_reflow}++;
1731 $self->update; 1804 $self->update;
1732} 1805}
1733 1806
1734sub size_request {
1735 my ($self) = @_;
1736
1737 ($self->{req_w}, $self->{req_h})
1738}
1739
1740sub size_allocate { 1807sub size_allocate {
1741 my ($self, $x, $y, $w, $h) = @_; 1808 my ($self, $w, $h) = @_;
1742 1809
1743 $self->SUPER::size_allocate ($x, $y, $w, $h) or return; 1810 $self->SUPER::size_allocate ($w, $h);
1744 1811
1745 $self->{layout}->set_height ($self->{fontsize}); 1812 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1746 $self->{layout}->set_width ($self->{w}); 1813 $self->{layout}->set_width ($self->{children}[0]{w});
1747 1814
1748 $self->reflow; 1815 $self->reflow;
1749 $self->update;
1750} 1816}
1751 1817
1752sub add_paragraph { 1818sub add_paragraph {
1753 my ($self, $color, $text) = @_; 1819 my ($self, $color, $text) = @_;
1754 1820
… …
1839 1905
1840} 1906}
1841 1907
1842############################################################################# 1908#############################################################################
1843 1909
1844package CFClient::UI::MapWidget;
1845
1846use strict;
1847
1848use List::Util qw(min max);
1849
1850use SDL;
1851use SDL::OpenGL;
1852
1853our @ISA = CFClient::UI::Base::;
1854
1855sub new {
1856 my $class = shift;
1857
1858 $class->SUPER::new (
1859 z => -1,
1860 can_focus => 1,
1861 list => (glGenLists 1),
1862 @_
1863 )
1864}
1865
1866sub key_down {
1867 print "MAPKEYDOWN\n";
1868}
1869
1870sub key_up {
1871}
1872
1873sub button_down {
1874 my ($self, $ev, $x, $y) = @_;
1875
1876 $self->focus_in;
1877
1878 if ($ev->button == 2) {
1879 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1880 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1881
1882 $self->{motion} = sub {
1883 my ($ev, $x, $y) = @_;
1884
1885 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1886
1887 $::CFG->{map_shift_x} = $bw + $x - $ox;
1888 $::CFG->{map_shift_y} = $bh + $y - $oy;
1889
1890 $self->update;
1891 };
1892 }
1893}
1894
1895sub button_up {
1896 my ($self, $ev, $x, $y) = @_;
1897
1898 delete $self->{motion};
1899}
1900
1901sub mouse_motion {
1902 my ($self, $ev, $x, $y) = @_;
1903
1904 $self->{motion}->($ev, $x, $y) if $self->{motion};
1905}
1906
1907sub size_request {
1908 (
1909 1 + 32 * int $::WIDTH / 32,
1910 1 + 32 * int $::HEIGHT / 32,
1911 )
1912}
1913
1914sub update {
1915 my ($self) = @_;
1916
1917 $self->{need_update} = 1;
1918 $self->SUPER::update;
1919}
1920
1921sub draw {
1922 my ($self) = @_;
1923
1924 if (delete $self->{need_update}) {
1925 glNewList $self->{list}, GL_COMPILE;
1926
1927 if ($::MAP) {
1928 my $sw = int $::WIDTH / 32;
1929 my $sh = int $::HEIGHT / 32;
1930
1931 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1932 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1933
1934 glTranslate $sx0 - 32, $sy0 - 32, 0;
1935
1936 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1937
1938 if ($::CFG->{fow_enable}) {
1939 if ($::CFG->{fow_smooth}) { # smooth fog of war
1940 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1941 glConvolutionFilter2D
1942 GL_CONVOLUTION_2D,
1943 GL_ALPHA,
1944 3, 3,
1945 GL_ALPHA, GL_FLOAT,
1946 pack "f*",
1947 0.1, 0.1, 0.1,
1948 0.1, 0.2, 0.1,
1949 0.1, 0.1, 0.1,
1950 ;
1951 glEnable GL_CONVOLUTION_2D;
1952 }
1953
1954 $self->{fow_texture} = new CFClient::Texture
1955 w => $w,
1956 h => $h,
1957 data => $data,
1958 internalformat => GL_ALPHA,
1959 format => GL_ALPHA;
1960
1961 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1962
1963 glEnable GL_BLEND;
1964 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1965 glEnable GL_TEXTURE_2D;
1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1967
1968 glColor +($::CFG->{fow_intensity}) x 3, 1;
1969 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1970
1971 glDisable GL_TEXTURE_2D;
1972 glDisable GL_BLEND;
1973 }
1974
1975 # HACK BEGIN
1976 {
1977 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1978 my ($w, $h) = (250, 250);
1979
1980 glEnable GL_BLEND;
1981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1982 glEnable GL_TEXTURE_2D;
1983 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1984
1985 $self->{mapmap_texture} =
1986 new CFClient::Texture
1987 w => $w,
1988 h => $h,
1989 data => $::MAP->mapmap ($w, $h),
1990 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1991
1992 $self->{mapmap_texture}->draw_quad (100, 100);
1993
1994 glDisable GL_TEXTURE_2D;
1995 glDisable GL_BLEND;
1996 }
1997 # HACK END
1998 }
1999
2000 glEndList;
2001 }
2002
2003 glPushMatrix;
2004 glCallList $self->{list};
2005 glPopMatrix;
2006
2007 if ($FOCUS != $self) {
2008 glColor 64/255, 64/255, 64/255;
2009 glLogicOp GL_AND;
2010 glEnable GL_COLOR_LOGIC_OP;
2011 glBegin GL_QUADS;
2012 glVertex 0, 0;
2013 glVertex 0, $::HEIGHT;
2014 glVertex $::WIDTH, $::HEIGHT;
2015 glVertex $::WIDTH, 0;
2016 glEnd;
2017 glDisable GL_COLOR_LOGIC_OP;
2018 }
2019}
2020
2021my %DIR = (
2022 SDLK_KP8, [1, "north"],
2023 SDLK_KP9, [2, "northeast"],
2024 SDLK_KP6, [3, "east"],
2025 SDLK_KP3, [4, "southeast"],
2026 SDLK_KP2, [5, "south"],
2027 SDLK_KP1, [6, "southwest"],
2028 SDLK_KP4, [7, "west"],
2029 SDLK_KP7, [8, "northwest"],
2030
2031 SDLK_UP, [1, "north"],
2032 SDLK_RIGHT, [3, "east"],
2033 SDLK_DOWN, [5, "south"],
2034 SDLK_LEFT, [7, "west"],
2035);
2036
2037sub key_down {
2038 my ($self, $ev) = @_;
2039
2040 my $mod = $ev->key_mod;
2041 my $sym = $ev->key_sym;
2042
2043 if ($sym == SDLK_KP5) {
2044 $::CONN->user_send ("stay fire");
2045 } elsif ($sym == SDLK_a) {
2046 $::CONN->user_send ("apply");
2047 } elsif ($sym == SDLK_QUOTE) {
2048 $self->emit ('activate_console');
2049 } elsif ($sym == SDLK_SLASH) {
2050 $self->emit ('activate_console' => '/');
2051 } elsif (exists $DIR{$sym}) {
2052 if ($mod & KMOD_SHIFT) {
2053 $self->{shft}++;
2054 $::CONN->user_send ("fire $DIR{$sym}[0]");
2055 } elsif ($mod & KMOD_CTRL) {
2056 $self->{ctrl}++;
2057 $::CONN->user_send ("run $DIR{$sym}[0]");
2058 } else {
2059 $::CONN->user_send ("$DIR{$sym}[1]");
2060 }
2061 }
2062}
2063
2064sub key_up {
2065 my ($self, $ev) = @_;
2066
2067 my $mod = $ev->key_mod;
2068 my $sym = $ev->key_sym;
2069
2070 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2071 $::CONN->user_send ("fire_stop");
2072 }
2073 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2074 $::CONN->user_send ("run_stop");
2075 }
2076}
2077
2078#############################################################################
2079
2080package CFClient::UI::Animator; 1910package CFClient::UI::Animator;
2081 1911
2082use SDL::OpenGL; 1912use CFClient::OpenGL;
2083 1913
2084our @ISA = CFClient::UI::Bin::; 1914our @ISA = CFClient::UI::Bin::;
2085 1915
2086sub moveto { 1916sub moveto {
2087 my ($self, $x, $y) = @_; 1917 my ($self, $x, $y) = @_;
… …
2160 1990
2161package CFClient::UI::Root; 1991package CFClient::UI::Root;
2162 1992
2163our @ISA = CFClient::UI::Container::; 1993our @ISA = CFClient::UI::Container::;
2164 1994
2165use SDL::OpenGL; 1995use CFClient::OpenGL;
2166 1996
2167sub check_size { 1997sub check_size {
2168 my ($self) = @_; 1998 my ($self) = @_;
2169 1999
2170 $self->size_allocate (0, 0, $::WITH, $::HEIGHT); 2000 $self->configure (0, 0, $::WITH, $::HEIGHT);
2171} 2001}
2172 2002
2173sub size_request { 2003sub size_request {
2174 ($::WIDTH, $::HEIGHT) 2004 ($::WIDTH, $::HEIGHT)
2175} 2005}
2176 2006
2177sub size_allocate { 2007sub configure {
2178 my ($self, $x, $y, $w, $h) = @_; 2008 my ($self, $x, $y, $w, $h) = @_;
2179 2009
2180 $self->_size_allocate ($x, $y, $w, $h); 2010 $self->SUPER::configure ($x, $y, $w, $h);
2181 2011
2182 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2012 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2183 for @{$self->{children}}; 2013 for @{$self->{children}};
2184} 2014}
2185 2015
2186sub _topleft { 2016sub _topleft {
2187 my ($self, $x, $y) = @_; 2017 my ($self, $x, $y) = @_;
… …
2195 $self->check_size; 2025 $self->check_size;
2196 ::refresh (); 2026 ::refresh ();
2197} 2027}
2198 2028
2199sub add { 2029sub add {
2200 my ($self, $widget) = @_; 2030 my ($self, $child) = @_;
2201 2031
2202 $self->SUPER::add ($widget); 2032 $self->SUPER::add ($child);
2203
2204 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2205} 2033}
2206 2034
2207sub on_refresh { 2035sub on_refresh {
2208 my ($self, $id, $cb) = @_; 2036 my ($self, $id, $cb) = @_;
2209 2037

Diff Legend

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