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.133 by root, Tue Apr 18 21:39:31 2006 UTC vs.
Revision 1.149 by root, Sat Apr 22 23:11:32 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) = @_;
117 131
118 $self->{x} = int $x; 132 $self->{x} = int $x;
119 $self->{y} = int $y; 133 $self->{y} = int $y;
126 0 140 0
127} 141}
128 142
129sub size_request { 143sub size_request {
130 require Carp; 144 require Carp;
131 Carp::confess "size_request is abtract"; 145 Carp::confess "size_request is abstract";
132} 146}
133 147
134sub configure { 148sub configure {
135 my ($self, $x, $y, $w, $h) = @_; 149 my ($self, $x, $y, $w, $h) = @_;
136 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 += int +($w - $w2) * 0.5;
158 $y += int +($h - $h2) * 0.5;
159
160 ($w, $h) = ($w2, $h2);
161 }
162
163 if ($self->{x} != $x || $self->{y} != $y) {
137 $self->{x} = $x; 164 $self->{x} = $x;
138 $self->{y} = $y; 165 $self->{y} = $y;
166 $self->update;
167 }
139 168
140 return unless $self->{w} != $w || $self->{h} != $h; 169 if ($self->{w} != $w || $self->{h} != $h) {
141
142 $self->{w} = $w; 170 $self->{w} = $w;
143 $self->{h} = $h; 171 $self->{h} = $h;
144 172
145 $self->size_allocate ($w, $h); 173 $self->size_allocate ($w, $h);
174 $self->update;
175 }
146} 176}
147 177
148sub size_allocate { 178sub size_allocate {
149 # nothing to be done 179 # nothing to be done
150} 180}
264} 294}
265 295
266sub check_size { 296sub check_size {
267 my ($self) = @_; 297 my ($self) = @_;
268 298
299 return unless $self->{parent};
300
269 my ($w, $h) = $self->size_request; 301 my ($w, $h) = $self->size_request;
270 302
271 if ($w != $self->{req_w} || $h != $self->{req_h}) { 303 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w; 304 $self->{req_w} = $w;
273 $self->{req_h} = $h; 305 $self->{req_h} = $h;
274 306
275 $self->{parent}->check_size 307 $self->{parent}->check_size;
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 } 308 }
281} 309}
282 310
283sub update { 311sub update {
284 my ($self) = @_; 312 my ($self) = @_;
312package CFClient::UI::DrawBG; 340package CFClient::UI::DrawBG;
313 341
314our @ISA = CFClient::UI::Base::; 342our @ISA = CFClient::UI::Base::;
315 343
316use strict; 344use strict;
317use SDL::OpenGL; 345use CFClient::OpenGL;
318 346
319sub new { 347sub new {
320 my $class = shift; 348 my $class = shift;
321 349
322 # range [value, low, high, page] 350 # range [value, low, high, page]
386 $self->{children} = [ 414 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 415 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 416 @{$self->{children}}, $child
389 ]; 417 ];
390 418
391 $self->{w} = $self->{h} = -1;
392
393 $child->check_size; 419 $child->check_size;
394} 420}
395 421
396sub remove { 422sub remove {
397 my ($self, $widget) = @_; 423 my ($self, $child) = @_;
398 424
425 delete $child->{parent};
426
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 427 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 428
401 $self->check_size; 429 $self->check_size;
402} 430}
403 431
404sub find_widget { 432sub find_widget {
436 464
437 $class->SUPER::new (children => [$child], %arg) 465 $class->SUPER::new (children => [$child], %arg)
438} 466}
439 467
440sub add { 468sub add {
441 my ($self, $widget) = @_; 469 my ($self, $child) = @_;
442 470
443 $self->{children} = []; 471 $self->{children} = [];
444 472
445 $self->SUPER::add ($widget); 473 $self->SUPER::add ($child);
446} 474}
447 475
448sub remove { 476sub remove {
449 my ($self, $widget) = @_; 477 my ($self, $widget) = @_;
450 478
470 498
471package CFClient::UI::Window; 499package CFClient::UI::Window;
472 500
473our @ISA = CFClient::UI::Bin::; 501our @ISA = CFClient::UI::Bin::;
474 502
475use SDL::OpenGL; 503use CFClient::OpenGL;
476 504
477sub new { 505sub new {
478 my ($class, %arg) = @_; 506 my ($class, %arg) = @_;
479 507
480 my $self = $class->SUPER::new (%arg); 508 my $self = $class->SUPER::new (%arg);
534sub new { die } 562sub new { die }
535 563
536sub size_request { 564sub size_request {
537 my ($self) = @_; 565 my ($self) = @_;
538 566
539 @$self{qw(child_w child_h)} = $self->child->size_request; 567 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
540 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 568 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541 569
542 @$self{qw(child_w child_h)} 570 @$self{qw(child_w child_h)}
543} 571}
544 572
553 581
554package CFClient::UI::Frame; 582package CFClient::UI::Frame;
555 583
556our @ISA = CFClient::UI::Bin::; 584our @ISA = CFClient::UI::Bin::;
557 585
558use SDL::OpenGL; 586use CFClient::OpenGL;
559
560sub size_request {
561 my ($self) = @_;
562 my $chld = $self->child
563 or return (0, 0);
564
565 $chld->move (2, 2);
566
567 map { $_ + 4 } $chld->size_request;
568}
569
570sub size_allocate {
571 my ($self, $x, $y, $w, $h) = @_;
572
573 $self->child->configure (2, 2, $w - 4, $h - 4);
574}
575
576sub _draw {
577 my ($self) = @_;
578
579 my $chld = $self->child;
580
581 my ($w, $h) = $chld->size_request;
582
583 glBegin GL_QUADS;
584 glColor 0, 0, 0;
585 glVertex 0 , 0;
586 glVertex 0 , $h + 4;
587 glVertex $w + 4 , $h + 4;
588 glVertex $w + 4 , 0;
589 glEnd;
590
591 $chld->draw;
592}
593
594#############################################################################
595
596package CFClient::UI::FancyFrame;
597
598our @ISA = CFClient::UI::Bin::;
599
600use SDL::OpenGL;
601
602my @tex =
603 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
604 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
605 587
606sub new { 588sub new {
607 my $class = shift; 589 my $class = shift;
608 590
609 # TODO: user_x, user_y, overwrite moveto?
610
611 $class->SUPER::new ( 591 my $self = $class->SUPER::new (
612 bg => [1, 1, 1, 1], 592 bg => [1, 1, 1, 1],
613 border_bg => [1, 1, 1, 1], 593 border_bg => [1, 1, 1, 1],
614 border => int $::FONTSIZE * 0.8, 594 border => 0.8,
615 @_ 595 @_
616 ) 596 );
597
598 $self
599}
600
601sub set_size {
602 my ($self, $w, $h) = @_;
603 $self->{req_w} = $w;
604 $self->{req_h} = $h;
605 $self->check_size;
617} 606}
618 607
619sub size_request { 608sub size_request {
620 my ($self) = @_; 609 my ($self) = @_;
621 610 ($self->{req_w}, $self->{req_h})
622 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
623
624 my ($w, $h) = $self->SUPER::size_request;
625
626 (
627 $w + $self->{border} * 2,
628 $h + $self->{border} * 2,
629 )
630} 611}
631 612
632sub size_allocate { 613sub size_allocate {
633 my ($self, $w, $h) = @_; 614 my ($self, $w, $h) = @_;
615 $self->{w} = $w;
616 $self->{h} = $h;
617 $self->child->configure (0, 0, $w, $h);
618}
634 619
620sub _draw {
621 my ($self) = @_;
622
623 my ($w, $h) = ($self->{w}, $self->{h});
624
625 glEnable GL_BLEND;
626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
627 glEnable GL_TEXTURE_2D;
628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
629
630# glBegin GL_QUADS;
631# glColor 0, 0, 0, 0;
632# glVertex 0 , 0;
633# glVertex 0 , $h;
634# glVertex $w, $h;
635# glVertex $w, 0;
636# glEnd;
637
638
639 $self->child->draw;
640 glDisable GL_BLEND;
641 glDisable GL_TEXTURE_2D;
642}
643
644#############################################################################
645
646package CFClient::UI::FancyFrame;
647
648our @ISA = CFClient::UI::Bin::;
649
650use CFClient::OpenGL;
651
652my @tex =
653 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
654 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
655
656sub new {
657 my $class = shift;
658
659 # TODO: user_x, user_y, overwrite moveto?
660
661 my $self = $class->SUPER::new (
662 bg => [1, 1, 1, 1],
663 border_bg => [1, 1, 1, 1],
664 border => 0.8,
665 @_
666 );
667
668 $self->{title} &&= new CFClient::UI::Label
669 align => 0,
670 valign => 1,
671 text => $self->{title},
672 fontsize => 1;
673
674 $self
675}
676
677sub border {
678 int $_[0]{border} * $::FONTSIZE
679}
680
681sub size_request {
682 my ($self) = @_;
683
684 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
685
686 my ($w, $h) = $self->SUPER::size_request;
687
688 (
689 $w + $self->border * 2,
690 $h + $self->border * 2,
691 )
692}
693
694sub size_allocate {
695 my ($self, $w, $h) = @_;
696
635 $h -= List::Util::max 0, $self->{border} * 2; 697 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 698 $w -= List::Util::max 0, $self->border * 2;
637 699
700 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
701 if $self->{title};
702
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 703 $self->child->configure ($self->border, $self->border, $w, $h);
639} 704}
640 705
641sub button_down { 706sub button_down {
642 my ($self, $ev, $x, $y) = @_; 707 my ($self, $ev, $x, $y) = @_;
643 708
709 my $border = $self->border;
710
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 711 if ($x < $self->{w} && $x >= $self->{w} - $border
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 712 && $y < $self->{h} && $y >= $self->{h} - $border) {
646 713
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 714 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 715 my ($bw, $bh) = ($self->{w}, $self->{h});
649 716
650 $self->{motion} = sub { 717 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 718 my ($ev, $x, $y) = @_;
652 719
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 720 ($x, $y) = ($ev->{x}, $ev->{y});
654 721
655 $self->{user_w} = $bw + $x - $ox; 722 $self->{user_w} = $bw + $x - $ox;
656 $self->{user_h} = $bh + $y - $oy; 723 $self->{user_h} = $bh + $y - $oy;
657 $self->check_size; 724 $self->check_size;
658 }; 725 };
659 726
660 } elsif ($x >= 0 && $x < $self->{w} 727 } elsif ($x >= 0 && $x < $self->{w}
661 && $y >= 0 && $y < $self->{border}) { 728 && $y >= 0 && $y < $border) {
662 729
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 730 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 731 my ($bx, $by) = ($self->{x}, $self->{y});
665 732
666 $self->{motion} = sub { 733 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 734 my ($ev, $x, $y) = @_;
668 735
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 736 ($x, $y) = ($ev->{x}, $ev->{y});
670 737
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 738 $self->move ($bx + $x - $ox, $by + $y - $oy);
672 $self->update; 739 $self->update;
673 }; 740 };
674 } 741 }
695 glEnable GL_BLEND; 762 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 764 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 765 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 766
767 my $border = $self->border;
768
700 glColor @{ $self->{border_bg} }; 769 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 770 $tex[1]->draw_quad (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 771 $tex[3]->draw_quad (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 772 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 773 $tex[4]->draw_quad (0, $h - $border, $w, $border);
705 774
706 my $bg = $tex[0]; 775 my $bg = $tex[0];
707 776
708 # TODO: repeat texture not scale 777 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 778 my $rep_x = $cw / $bg->{w};
712 glColor @{ $self->{bg} }; 781 glColor @{ $self->{bg} };
713 782
714 $bg->{s} = $rep_x; 783 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y; 784 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1; 785 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 786 $bg->draw_quad ($border, $border, $cw, $ch);
718 787
719 glDisable GL_TEXTURE_2D; 788 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 789 glDisable GL_BLEND;
721 790
791 $self->{title}->draw if $self->{title};
722 $self->child->draw; 792 $self->child->draw;
723} 793}
724 794
725############################################################################# 795#############################################################################
726 796
728 798
729our @ISA = CFClient::UI::Base::; 799our @ISA = CFClient::UI::Base::;
730 800
731use List::Util qw(max sum); 801use List::Util qw(max sum);
732 802
733use SDL::OpenGL; 803use CFClient::OpenGL;
734 804
735sub new { 805sub new {
736 my $class = shift; 806 my $class = shift;
737 807
738 $class->SUPER::new ( 808 $class->SUPER::new (
745 my ($self, $x, $y, $child) = @_; 815 my ($self, $x, $y, $child) = @_;
746 816
747 $child->set_parent ($self); 817 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 818 $self->{children}[$y][$x] = $child;
749 819
750 $self->{w} = $self->{h} = -1;
751
752 $child->check_size; 820 $child->check_size;
753} 821}
754 822
755# TODO: move to container class maybe? send childs a signal on removal? 823# TODO: move to container class maybe? send childs a signal on removal?
756sub clear { 824sub clear {
770 or next; 838 or next;
771 839
772 for my $x (0 .. $#$row) { 840 for my $x (0 .. $#$row) {
773 my $widget = $row->[$x] 841 my $widget = $row->[$x]
774 or next; 842 or next;
775 my ($w, $h) = $widget->size_request; 843 my ($w, $h) = @$widget{qw(req_w req_h)};
776 844
777 $w[$x] = max $w[$x], $w; 845 $w[$x] = max $w[$x], $w;
778 $h[$y] = max $h[$y], $h; 846 $h[$y] = max $h[$y], $h;
779 } 847 }
780 } 848 }
885 953
886 ($h, $w) = ($w, $h); 954 ($h, $w) = ($w, $h);
887 955
888 my $children = $self->{children}; 956 my $children = $self->{children};
889 957
890 my @h = map +($_->size_request)[0], @$children; 958 my @h = map $_->{req_w}, @$children;
891 959
892 my $req_h = List::Util::sum @h; 960 my $req_h = List::Util::sum @h;
893 961
894 if ($req_h > $h) { 962 if ($req_h > $h) {
895 # ah well, not enough space 963 # ah well, not enough space
943sub size_allocate { 1011sub size_allocate {
944 my ($self, $w, $h) = @_; 1012 my ($self, $w, $h) = @_;
945 1013
946 my $children = $self->{children}; 1014 my $children = $self->{children};
947 1015
948 my @h = map +($_->size_request)[1], @$children; 1016 my @h = map $_->{req_h}, @$children;
949 1017
950 my $req_h = List::Util::sum @h; 1018 my $req_h = List::Util::sum @h;
951 1019
952 if ($req_h > $h) { 1020 if ($req_h > $h) {
953 # ah well, not enough space 1021 # ah well, not enough space
981 1049
982package CFClient::UI::Label; 1050package CFClient::UI::Label;
983 1051
984our @ISA = CFClient::UI::Base::; 1052our @ISA = CFClient::UI::Base::;
985 1053
986use SDL::OpenGL; 1054use CFClient::OpenGL;
987 1055
988sub new { 1056sub new {
989 my ($class, %arg) = @_; 1057 my ($class, %arg) = @_;
990 1058
991 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1060 fg => [1, 1, 1],
993 fontsize => $::FONTSIZE, 1061 fontsize => 1,
994 text => "", 1062 text => "",
995 align => -1, 1063 align => -1,
996 valign => -1, 1064 valign => -1,
997 padding => 2, 1065 padding => 2,
998 layout => new CFClient::Layout, 1066 layout => new CFClient::Layout,
999 %arg 1067 %arg
1000 ); 1068 );
1001 1069
1002 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1070 if (exists $self->{template}) {
1071 my $layout = new CFClient::Layout;
1072 $layout->set_text (delete $self->{template});
1073 $self->{template} = $layout;
1074 }
1003 1075
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1076 $self->set_text (delete $self->{text}) if exists $self->{text};
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1077 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006 1078
1007 $self 1079 $self
1021 my ($self, $text) = @_; 1093 my ($self, $text) = @_;
1022 1094
1023 $self->{layout}->set_text ($text); 1095 $self->{layout}->set_text ($text);
1024 1096
1025 delete $self->{texture}; 1097 delete $self->{texture};
1098 $self->check_size;
1026 $self->update; 1099 $self->update;
1027} 1100}
1028 1101
1029sub set_markup { 1102sub set_markup {
1030 my ($self, $markup) = @_; 1103 my ($self, $markup) = @_;
1031 1104
1032 $self->{layout}->set_markup ($markup); 1105 $self->{layout}->set_markup ($markup);
1033 1106
1034 delete $self->{texture}; 1107 delete $self->{texture};
1108 $self->check_size;
1035 $self->update; 1109 $self->update;
1036} 1110}
1037 1111
1038sub size_request { 1112sub size_request {
1039 my ($self) = @_; 1113 my ($self) = @_;
1040 1114
1041 $self->{layout}->set_width; 1115 $self->{layout}->set_width;
1042 $self->{layout}->set_height ($self->{fontsize}); 1116 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1117
1044 my ($w, $h) = $self->{layout}->size; 1118 my ($w, $h) = $self->{layout}->size;
1119
1120 if (exists $self->{template}) {
1121 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1122
1123 my ($w2, $h2) = $self->{template}->size;
1124
1125 $w = List::Util::max $w, $w2;
1126 $h = List::Util::max $h, $h2;
1127 }
1045 1128
1046 ( 1129 (
1047 $w + $self->{padding} * 2, 1130 $w + $self->{padding} * 2,
1048 $h + $self->{padding} * 2, 1131 $h + $self->{padding} * 2,
1049 ) 1132 )
1053 my ($self, $w, $h) = @_; 1136 my ($self, $w, $h) = @_;
1054 1137
1055 delete $self->{texture}; 1138 delete $self->{texture};
1056} 1139}
1057 1140
1058sub update { 1141sub set_fontsize {
1059 my ($self) = @_; 1142 my ($self, $fontsize) = @_;
1060 1143
1061 delete $self->{texture}; 1144 $self->{fontsize} = $fontsize;
1062 $self->SUPER::update; 1145 $self->check_size;
1063} 1146}
1064 1147
1065sub _draw { 1148sub _draw {
1066 my ($self) = @_; 1149 my ($self) = @_;
1067 1150
1068 my $tex = $self->{texture} ||= do { 1151 my $tex = $self->{texture} ||= do {
1069 $self->{layout}->set_width ($self->{w}); 1152 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1153 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071 new_from_layout CFClient::Texture $self->{layout} 1154 new_from_layout CFClient::Texture $self->{layout}
1072 }; 1155 };
1073 1156
1074 glEnable GL_BLEND; 1157 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1158 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1100 1183
1101package CFClient::UI::EntryBase; 1184package CFClient::UI::EntryBase;
1102 1185
1103our @ISA = CFClient::UI::Label::; 1186our @ISA = CFClient::UI::Label::;
1104 1187
1105use SDL; 1188use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1189
1108sub new { 1190sub new {
1109 my $class = shift; 1191 my $class = shift;
1110 1192
1111 $class->SUPER::new ( 1193 $class->SUPER::new (
1125 1207
1126 delete $self->{cur_h}; 1208 delete $self->{cur_h};
1127 1209
1128 return if $self->{text} eq $text; 1210 return if $self->{text} eq $text;
1129 1211
1212 delete $self->{texture};
1213
1130 $self->{last_activity} = $::NOW; 1214 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1215 $self->{text} = $text;
1132 1216
1133 $text =~ s/./*/g if $self->{hidden}; 1217 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1218 $self->{layout}->set_text ("$text ");
1149} 1233}
1150 1234
1151sub size_allocate { 1235sub size_allocate {
1152 my ($self, $w, $h) = @_; 1236 my ($self, $w, $h) = @_;
1153 1237
1154 $self->_set_text ($self->{text}); 1238 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155} 1239}
1156 1240
1157sub set_text { 1241sub set_text {
1158 my ($self, $text) = @_; 1242 my ($self, $text) = @_;
1159 1243
1163} 1247}
1164 1248
1165sub key_down { 1249sub key_down {
1166 my ($self, $ev) = @_; 1250 my ($self, $ev) = @_;
1167 1251
1168 my $mod = $ev->key_mod; 1252 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1253 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1254 my $uni = $ev->{unicode};
1172 1255
1173 my $text = $self->get_text; 1256 my $text = $self->get_text;
1174 1257
1175 if ($sym == SDLK_BACKSPACE) { 1258 if ($sym == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1259 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1260 } elsif ($sym == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1261 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1262 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1263 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1264 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1265 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1266 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1267 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1268 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1269 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1270 } elsif ($sym == 27) {
1188 $self->emit ('escape'); 1271 $self->emit ('escape');
1189 } elsif ($uni) { 1272 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1273 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1274 }
1192 1275
1267 1350
1268package CFClient::UI::Entry; 1351package CFClient::UI::Entry;
1269 1352
1270our @ISA = CFClient::UI::EntryBase::; 1353our @ISA = CFClient::UI::EntryBase::;
1271 1354
1272use SDL; 1355use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1356
1275sub key_down { 1357sub key_down {
1276 my ($self, $ev) = @_; 1358 my ($self, $ev) = @_;
1277 1359
1278 my $sym = $ev->key_sym; 1360 my $sym = $ev->{sym};
1279 1361
1280 if ($sym == SDLK_RETURN) { 1362 if ($sym == 13) {
1281 $self->emit (activate => $self->get_text); 1363 $self->emit (activate => $self->get_text);
1282 $self->update; 1364 $self->update;
1283 1365
1284 } else { 1366 } else {
1285 $self->SUPER::key_down ($ev); 1367 $self->SUPER::key_down ($ev);
1291 1373
1292package CFClient::UI::Button; 1374package CFClient::UI::Button;
1293 1375
1294our @ISA = CFClient::UI::Label::; 1376our @ISA = CFClient::UI::Label::;
1295 1377
1296use SDL; 1378use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1379
1299my @tex = 1380my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1381 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1382 qw(b1_button_active.png);
1302 1383
1303sub new { 1384sub new {
1304 my $class = shift; 1385 my $class = shift;
1305 1386
1352package CFClient::UI::CheckBox; 1433package CFClient::UI::CheckBox;
1353 1434
1354our @ISA = CFClient::UI::DrawBG::; 1435our @ISA = CFClient::UI::DrawBG::;
1355 1436
1356my @tex = 1437my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1438 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1439 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359 1440
1360use SDL; 1441use CFClient::OpenGL;
1361use SDL::OpenGL;
1362 1442
1363sub new { 1443sub new {
1364 my $class = shift; 1444 my $class = shift;
1365 1445
1366 $class->SUPER::new ( 1446 $class->SUPER::new (
1412 glDisable GL_BLEND; 1492 glDisable GL_BLEND;
1413} 1493}
1414 1494
1415############################################################################# 1495#############################################################################
1416 1496
1417package CFClient::UI::VGauge; 1497package CFClient::UI::Image;
1418 1498
1419our @ISA = CFClient::UI::Base::; 1499our @ISA = CFClient::UI::Base::;
1420 1500
1421use SDL::OpenGL; 1501use CFClient::OpenGL;
1502use Carp qw/confess/;
1422 1503
1423my %tex = ( 1504our %loaded_images;
1424 food => [
1425 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1426 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1427 ],
1428 grace => [
1429 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1430 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1431 ],
1432 hp => [
1433 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1434 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1435 ],
1436 mana => [
1437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1438 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1439 ],
1440);
1441 1505
1442# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new { 1506sub new {
1444 my $class = shift; 1507 my $class = shift;
1445 1508
1446 my $self = $class->SUPER::new (gauge => 'food', @_); 1509 my $self = $class->SUPER::new (@_);
1510
1511 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1512
1513 $loaded_images{$self->{image}} ||=
1514 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1515
1516 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1517
1518 Scalar::Util::weaken $loaded_images{$self->{image}};
1519
1520 $self->{aspect} = $tex->{w} / $tex->{h};
1447 1521
1448 $self 1522 $self
1449} 1523}
1450 1524
1451sub size_request { 1525sub size_request {
1452 my ($self) = @_; 1526 my ($self) = @_;
1453 1527
1454 my $tex = $tex{$self->{gauge}}[0]; 1528 ($self->{tex}->{w}, $self->{tex}->{h})
1455
1456 @$tex{qw(w h)}
1457}
1458
1459sub set_max {
1460 my ($self, $max) = @_;
1461
1462 $self->{max_val} = $max;
1463}
1464
1465sub set_value {
1466 my ($self, $val, $max) = @_;
1467
1468 $self->set_max ($max)
1469 if defined $max;
1470
1471 $max = $self->{max_val};
1472 $self->{val} = $val;
1473
1474 $self->update;
1475} 1529}
1476 1530
1477sub _draw { 1531sub _draw {
1478 my ($self) = @_; 1532 my ($self) = @_;
1479 1533
1480 my $tex = $tex{$self->{gauge}}; 1534 my $tex = $self->{tex};
1481 1535
1482 my ($w, $h) = ($self->{w}, $self->{h}); 1536 my ($w, $h) = ($self->{w}, $self->{h});
1483 1537
1484 my $ycut = $self->{val} / ($self->{max_val} || 1); 1538 if ($self->{rot90}) {
1485 $ycut = 1 if $self->{val} > $self->{max_val}; 1539 glRotate 90, 0, 0, 1;
1540 glTranslate 0, -$self->{w}, 0;
1486 1541
1487 my $t1 = $tex->[0]; 1542 ($w, $h) = ($h, $w);
1488 my $t2 = $tex->[1]; 1543 }
1489 1544
1490 glEnable GL_BLEND; 1545 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1547 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1548 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1549
1550 $tex->draw_quad (0, 0, $w, $h);
1551
1552 glDisable GL_BLEND;
1553 glDisable GL_TEXTURE_2D;
1554}
1555
1556#############################################################################
1557
1558package CFClient::UI::VGauge;
1559
1560our @ISA = CFClient::UI::Base::;
1561
1562use CFClient::OpenGL;
1563
1564my %tex = (
1565 food => [
1566 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1567 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1568 ],
1569 grace => [
1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1571 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1572 ],
1573 hp => [
1574 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1575 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1576 ],
1577 mana => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1580 ],
1581);
1582
1583# eg. VGauge->new (gauge => 'food'), default gauge: food
1584sub new {
1585 my $class = shift;
1586
1587 my $self = $class->SUPER::new (
1588 type => 'food',
1589 @_
1590 );
1591
1592 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1593
1594 $self
1595}
1596
1597sub size_request {
1598 my ($self) = @_;
1599
1600 #my $tex = $tex{$self->{type}}[0];
1601 #@$tex{qw(w h)}
1602 (0, 0)
1603}
1604
1605sub set_max {
1606 my ($self, $max) = @_;
1607
1608 $self->{max_val} = $max;
1609}
1610
1611sub set_value {
1612 my ($self, $val, $max) = @_;
1613
1614 $self->set_max ($max)
1615 if defined $max;
1616
1617 $max = $self->{max_val};
1618 $self->{val} = $val;
1619
1620 $self->update;
1621}
1622
1623sub _draw {
1624 my ($self) = @_;
1625
1626 my $tex = $tex{$self->{type}};
1627
1628 my ($w, $h) = ($self->{w}, $self->{h});
1629
1630 if ($self->{vertical}) {
1631 glRotate 90, 0, 0, 1;
1632 glTranslate 0, -$self->{w}, 0;
1633
1634 ($w, $h) = ($h, $w);
1635 }
1636
1637 my $ycut = $self->{val} / ($self->{max_val} || 1);
1638 $ycut = 1 if $self->{val} > $self->{max_val};
1639
1640 my $t1 = $tex->[0];
1641 my $t2 = $tex->[1];
1642
1643 glEnable GL_BLEND;
1644 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1645 glEnable GL_TEXTURE_2D;
1646 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647
1495 my $h1 = $self->{h} - $ycut * $self->{h}; 1648 my $h1 = $self->{h} - $ycut * $self->{h};
1496 my $h2 = $ycut * $self->{h}; 1649 my $h2 = $ycut * $self->{h};
1497 1650
1498 my $yp = 0;
1499
1500 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1651 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS; 1652 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp; 1653 glTexCoord 0 , 0; glVertex 0 , 0;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1654 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1655 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1656 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506 glEnd; 1657 glEnd;
1507
1508 $yp += $h1;
1509 1658
1510 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1659 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS; 1660 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1661 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1662 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1514 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2; 1663 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1515 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1664 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1516 glEnd; 1665 glEnd;
1517 1666
1518 glDisable GL_BLEND; 1667 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1520} 1669}
1521 1670
1522############################################################################# 1671#############################################################################
1523 1672
1673package CFClient::UI::Gauge;
1674
1675our @ISA = CFClient::UI::VBox::;
1676
1677sub new {
1678 my ($class, %arg) = shift;
1679
1680 my $self = $class->SUPER::new (
1681 @_,
1682 );
1683
1684 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
1685 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1686 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
1687
1688 $self
1689}
1690
1691sub set_fontsize {
1692 my ($self, $fsize) = @_;
1693
1694 $self->{value}->set_fontsize ($fsize);
1695 $self->{max} ->set_fontsize ($fsize);
1696}
1697
1698sub set_value {
1699 my ($self, $val, $max) = @_;
1700
1701 $self->set_max ($max)
1702 if defined $max;
1703
1704 $self->{gauge}->set_value ($val, $max);
1705 $self->{value}->set_text ($val);
1706}
1707
1708sub set_max {
1709 my ($self, $max) = @_;
1710
1711 $self->{gauge}->set_max ($max);
1712 $self->{max}->set_text ($max);
1713}
1714
1715#############################################################################
1716
1524package CFClient::UI::Slider; 1717package CFClient::UI::Slider;
1525 1718
1526use strict; 1719use strict;
1527 1720
1528use SDL::OpenGL; 1721use CFClient::OpenGL;
1529 1722
1530our @ISA = CFClient::UI::DrawBG::; 1723our @ISA = CFClient::UI::DrawBG::;
1531 1724
1532my @tex = 1725my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1726 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1543 # TODO: calculations are off 1736 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 1737 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 1738 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 1739 active_fg => [0, 0, 0],
1547 range => [0, 0, 100, 10], 1740 range => [0, 0, 100, 10],
1548 req_w => 40, 1741 req_w => 20,
1549 req_h => 13, 1742 req_h => 20,
1550 vertical => 0, 1743 vertical => 0,
1551 can_hover => 1, 1744 can_hover => 1,
1552 inner_pad => 5, 1745 inner_pad => 5,
1553 @_ 1746 @_
1554 ); 1747 );
1658 1851
1659package CFClient::UI::TextView; 1852package CFClient::UI::TextView;
1660 1853
1661our @ISA = CFClient::UI::HBox::; 1854our @ISA = CFClient::UI::HBox::;
1662 1855
1663use SDL::OpenGL; 1856use CFClient::OpenGL;
1664 1857
1665sub new { 1858sub new {
1666 my $class = shift; 1859 my $class = shift;
1667 1860
1668 my $self = $class->SUPER::new ( 1861 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6,
1670 req_h => $::HEIGHT / 6,
1671 fontsize => $::FONTSIZE, 1862 fontsize => 1,
1672 @_, 1863 @_,
1673 1864
1674 layout => (new CFClient::Layout), 1865 layout => (new CFClient::Layout),
1675 par => [], 1866 par => [],
1676 height => 0, 1867 height => 0,
1697sub text_height { 1888sub text_height {
1698 my ($self, $text) = @_; 1889 my ($self, $text) = @_;
1699 1890
1700 my $layout = $self->{layout}; 1891 my $layout = $self->{layout};
1701 1892
1702 $layout->set_height ($self->{fontsize}); 1893 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 1894 $layout->set_width ($self->{w});
1704 $layout->set_text ($text); 1895 $layout->set_text ($text);
1705 1896
1706 ($layout->size)[1] 1897 ($layout->size)[1]
1707} 1898}
1711 1902
1712 $self->{need_reflow}++; 1903 $self->{need_reflow}++;
1713 $self->update; 1904 $self->update;
1714} 1905}
1715 1906
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate { 1907sub size_allocate {
1723 my ($self, $w, $h) = @_; 1908 my ($self, $w, $h) = @_;
1724 1909
1910 $self->SUPER::size_allocate ($w, $h);
1911
1725 $self->{layout}->set_height ($self->{fontsize}); 1912 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726 $self->{layout}->set_width ($self->{w}); 1913 $self->{layout}->set_width ($self->{children}[0]{w});
1727 1914
1728 $self->reflow; 1915 $self->reflow;
1729 $self->update;
1730} 1916}
1731 1917
1732sub add_paragraph { 1918sub add_paragraph {
1733 my ($self, $color, $text) = @_; 1919 my ($self, $color, $text) = @_;
1734 1920
1819 2005
1820} 2006}
1821 2007
1822############################################################################# 2008#############################################################################
1823 2009
1824package CFClient::UI::MapWidget;
1825
1826use strict;
1827
1828use List::Util qw(min max);
1829
1830use SDL;
1831use SDL::OpenGL;
1832
1833our @ISA = CFClient::UI::Base::;
1834
1835sub new {
1836 my $class = shift;
1837
1838 $class->SUPER::new (
1839 z => -1,
1840 can_focus => 1,
1841 list => (glGenLists 1),
1842 @_
1843 )
1844}
1845
1846sub key_down {
1847 print "MAPKEYDOWN\n";
1848}
1849
1850sub key_up {
1851}
1852
1853sub button_down {
1854 my ($self, $ev, $x, $y) = @_;
1855
1856 $self->focus_in;
1857
1858 if ($ev->button == 2) {
1859 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1860 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1861
1862 $self->{motion} = sub {
1863 my ($ev, $x, $y) = @_;
1864
1865 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1866
1867 $::CFG->{map_shift_x} = $bw + $x - $ox;
1868 $::CFG->{map_shift_y} = $bh + $y - $oy;
1869
1870 $self->update;
1871 };
1872 }
1873}
1874
1875sub button_up {
1876 my ($self, $ev, $x, $y) = @_;
1877
1878 delete $self->{motion};
1879}
1880
1881sub mouse_motion {
1882 my ($self, $ev, $x, $y) = @_;
1883
1884 $self->{motion}->($ev, $x, $y) if $self->{motion};
1885}
1886
1887sub size_request {
1888 (
1889 1 + 32 * int $::WIDTH / 32,
1890 1 + 32 * int $::HEIGHT / 32,
1891 )
1892}
1893
1894sub update {
1895 my ($self) = @_;
1896
1897 $self->{need_update} = 1;
1898 $self->SUPER::update;
1899}
1900
1901sub draw {
1902 my ($self) = @_;
1903
1904 if (delete $self->{need_update}) {
1905 glNewList $self->{list}, GL_COMPILE;
1906
1907 if ($::MAP) {
1908 my $sw = int $::WIDTH / 32;
1909 my $sh = int $::HEIGHT / 32;
1910
1911 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1912 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1913
1914 glTranslate $sx0 - 32, $sy0 - 32, 0;
1915
1916 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1917
1918 if ($::CFG->{fow_enable}) {
1919 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1920 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1921 glConvolutionFilter2D (
1922 GL_CONVOLUTION_2D,
1923 GL_ALPHA,
1924 3, 3,
1925 GL_ALPHA, GL_FLOAT,
1926 pack "f*",
1927 0.1, 0.1, 0.1,
1928 0.1, 0.2, 0.1,
1929 0.1, 0.1, 0.1,
1930 );
1931 glEnable GL_CONVOLUTION_2D;
1932 }
1933
1934 $self->{fow_texture} = new CFClient::Texture
1935 w => $w,
1936 h => $h,
1937 data => $data,
1938 internalformat => GL_ALPHA,
1939 format => GL_ALPHA;
1940
1941 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1942
1943 glEnable GL_BLEND;
1944 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1945 glEnable GL_TEXTURE_2D;
1946 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1947
1948 glColor +($::CFG->{fow_intensity}) x 3, 1;
1949 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1950
1951 glDisable GL_TEXTURE_2D;
1952 glDisable GL_BLEND;
1953 }
1954
1955 # HACK BEGIN
1956 {
1957 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1958 my ($w, $h) = (250, 250);
1959
1960 glEnable GL_BLEND;
1961 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962 glEnable GL_TEXTURE_2D;
1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964
1965 $self->{mapmap_texture} =
1966 new CFClient::Texture
1967 w => $w,
1968 h => $h,
1969 data => $::MAP->mapmap ($w, $h),
1970 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1971
1972 $self->{mapmap_texture}->draw_quad (100, 100);
1973
1974 glDisable GL_TEXTURE_2D;
1975 glDisable GL_BLEND;
1976 }
1977 # HACK END
1978 }
1979
1980 glEndList;
1981 }
1982
1983 glPushMatrix;
1984 glCallList $self->{list};
1985 glPopMatrix;
1986
1987 if ($FOCUS != $self) {
1988 glColor 64/255, 64/255, 64/255;
1989 glLogicOp GL_AND;
1990 glEnable GL_COLOR_LOGIC_OP;
1991 glBegin GL_QUADS;
1992 glVertex 0, 0;
1993 glVertex 0, $::HEIGHT;
1994 glVertex $::WIDTH, $::HEIGHT;
1995 glVertex $::WIDTH, 0;
1996 glEnd;
1997 glDisable GL_COLOR_LOGIC_OP;
1998 }
1999}
2000
2001my %DIR = (
2002 SDLK_KP8, [1, "north"],
2003 SDLK_KP9, [2, "northeast"],
2004 SDLK_KP6, [3, "east"],
2005 SDLK_KP3, [4, "southeast"],
2006 SDLK_KP2, [5, "south"],
2007 SDLK_KP1, [6, "southwest"],
2008 SDLK_KP4, [7, "west"],
2009 SDLK_KP7, [8, "northwest"],
2010
2011 SDLK_UP, [1, "north"],
2012 SDLK_RIGHT, [3, "east"],
2013 SDLK_DOWN, [5, "south"],
2014 SDLK_LEFT, [7, "west"],
2015);
2016
2017sub key_down {
2018 my ($self, $ev) = @_;
2019
2020 my $mod = $ev->key_mod;
2021 my $sym = $ev->key_sym;
2022
2023 if ($sym == SDLK_KP5) {
2024 $::CONN->user_send ("stay fire");
2025 } elsif ($sym == SDLK_a) {
2026 $::CONN->user_send ("apply");
2027 } elsif ($sym == SDLK_QUOTE) {
2028 $self->emit ('activate_console');
2029 } elsif ($sym == SDLK_SLASH) {
2030 $self->emit ('activate_console' => '/');
2031 } elsif (exists $DIR{$sym}) {
2032 if ($mod & KMOD_SHIFT) {
2033 $self->{shft}++;
2034 $::CONN->user_send ("fire $DIR{$sym}[0]");
2035 } elsif ($mod & KMOD_CTRL) {
2036 $self->{ctrl}++;
2037 $::CONN->user_send ("run $DIR{$sym}[0]");
2038 } else {
2039 $::CONN->user_send ("$DIR{$sym}[1]");
2040 }
2041 }
2042}
2043
2044sub key_up {
2045 my ($self, $ev) = @_;
2046
2047 my $mod = $ev->key_mod;
2048 my $sym = $ev->key_sym;
2049
2050 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2051 $::CONN->user_send ("fire_stop");
2052 }
2053 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2054 $::CONN->user_send ("run_stop");
2055 }
2056}
2057
2058#############################################################################
2059
2060package CFClient::UI::Animator; 2010package CFClient::UI::Animator;
2061 2011
2062use SDL::OpenGL; 2012use CFClient::OpenGL;
2063 2013
2064our @ISA = CFClient::UI::Bin::; 2014our @ISA = CFClient::UI::Bin::;
2065 2015
2066sub moveto { 2016sub moveto {
2067 my ($self, $x, $y) = @_; 2017 my ($self, $x, $y) = @_;
2140 2090
2141package CFClient::UI::Root; 2091package CFClient::UI::Root;
2142 2092
2143our @ISA = CFClient::UI::Container::; 2093our @ISA = CFClient::UI::Container::;
2144 2094
2145use SDL::OpenGL; 2095use CFClient::OpenGL;
2146 2096
2147sub check_size { 2097sub check_size {
2148 my ($self) = @_; 2098 my ($self) = @_;
2149 2099
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 2100 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2151} 2101}
2152 2102
2153sub size_request { 2103sub size_request {
2154 ($::WIDTH, $::HEIGHT) 2104 ($::WIDTH, $::HEIGHT)
2155} 2105}
2157sub configure { 2107sub configure {
2158 my ($self, $x, $y, $w, $h) = @_; 2108 my ($self, $x, $y, $w, $h) = @_;
2159 2109
2160 $self->SUPER::configure ($x, $y, $w, $h); 2110 $self->SUPER::configure ($x, $y, $w, $h);
2161 2111
2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2163 for @{$self->{children}}; 2112 for my $child (@{$self->{children}}) {
2113 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2114
2115 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2116 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2117 $child->configure ($X, $Y, $W,$H);
2118 }
2164} 2119}
2165 2120
2166sub _topleft { 2121sub _topleft {
2167 my ($self, $x, $y) = @_; 2122 my ($self, $x, $y) = @_;
2168 2123
2176 ::refresh (); 2131 ::refresh ();
2177} 2132}
2178 2133
2179sub add { 2134sub add {
2180 my ($self, $child) = @_; 2135 my ($self, $child) = @_;
2136
2137 # integerize window positions
2138 $child->{x} = int $child->{x};
2139 $child->{y} = int $child->{y};
2181 2140
2182 $self->SUPER::add ($child); 2141 $self->SUPER::add ($child);
2183} 2142}
2184 2143
2185sub on_refresh { 2144sub on_refresh {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines