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.147 by root, Sat Apr 22 03:50:25 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}
… …
272 $self->{req_w} = $w; 302 $self->{req_w} = $w;
273 $self->{req_h} = $h; 303 $self->{req_h} = $h;
274 304
275 $self->{parent}->check_size 305 $self->{parent}->check_size
276 if $self->{parent}; 306 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 } 307 }
281} 308}
282 309
283sub update { 310sub update {
284 my ($self) = @_; 311 my ($self) = @_;
… …
312package CFClient::UI::DrawBG; 339package CFClient::UI::DrawBG;
313 340
314our @ISA = CFClient::UI::Base::; 341our @ISA = CFClient::UI::Base::;
315 342
316use strict; 343use strict;
317use SDL::OpenGL; 344use CFClient::OpenGL;
318 345
319sub new { 346sub new {
320 my $class = shift; 347 my $class = shift;
321 348
322 # range [value, low, high, page] 349 # range [value, low, high, page]
… …
386 $self->{children} = [ 413 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 414 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 415 @{$self->{children}}, $child
389 ]; 416 ];
390 417
391 $self->{w} = $self->{h} = -1;
392
393 $child->check_size; 418 $child->check_size;
394} 419}
395 420
396sub remove { 421sub remove {
397 my ($self, $widget) = @_; 422 my ($self, $child) = @_;
398 423
424 delete $child->{parent};
425
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 427
401 $self->check_size; 428 $self->check_size;
402} 429}
403 430
404sub find_widget { 431sub find_widget {
… …
436 463
437 $class->SUPER::new (children => [$child], %arg) 464 $class->SUPER::new (children => [$child], %arg)
438} 465}
439 466
440sub add { 467sub add {
441 my ($self, $widget) = @_; 468 my ($self, $child) = @_;
442 469
443 $self->{children} = []; 470 $self->{children} = [];
444 471
445 $self->SUPER::add ($widget); 472 $self->SUPER::add ($child);
446} 473}
447 474
448sub remove { 475sub remove {
449 my ($self, $widget) = @_; 476 my ($self, $widget) = @_;
450 477
… …
470 497
471package CFClient::UI::Window; 498package CFClient::UI::Window;
472 499
473our @ISA = CFClient::UI::Bin::; 500our @ISA = CFClient::UI::Bin::;
474 501
475use SDL::OpenGL; 502use CFClient::OpenGL;
476 503
477sub new { 504sub new {
478 my ($class, %arg) = @_; 505 my ($class, %arg) = @_;
479 506
480 my $self = $class->SUPER::new (%arg); 507 my $self = $class->SUPER::new (%arg);
… …
553 580
554package CFClient::UI::Frame; 581package CFClient::UI::Frame;
555 582
556our @ISA = CFClient::UI::Bin::; 583our @ISA = CFClient::UI::Bin::;
557 584
558use SDL::OpenGL; 585use CFClient::OpenGL;
559 586
560sub size_request { 587sub size_request {
561 my ($self) = @_; 588 my ($self) = @_;
562 my $chld = $self->child 589 my $chld = $self->child
563 or return (0, 0); 590 or return (0, 0);
… …
595 622
596package CFClient::UI::FancyFrame; 623package CFClient::UI::FancyFrame;
597 624
598our @ISA = CFClient::UI::Bin::; 625our @ISA = CFClient::UI::Bin::;
599 626
600use SDL::OpenGL; 627use CFClient::OpenGL;
601 628
602my @tex = 629my @tex =
603 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
604 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);
605 632
606sub new { 633sub new {
607 my $class = shift; 634 my $class = shift;
608 635
609 # TODO: user_x, user_y, overwrite moveto? 636 # TODO: user_x, user_y, overwrite moveto?
610 637
611 $class->SUPER::new ( 638 my $self = $class->SUPER::new (
612 bg => [1, 1, 1, 1], 639 bg => [1, 1, 1, 1],
613 border_bg => [1, 1, 1, 1], 640 border_bg => [1, 1, 1, 1],
614 border => int $::FONTSIZE * 0.8, 641 border => 0.8,
615 @_ 642 @_
616 ) 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
617} 656}
618 657
619sub size_request { 658sub size_request {
620 my ($self) = @_; 659 my ($self) = @_;
621 660
622 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
623 662
624 my ($w, $h) = $self->SUPER::size_request; 663 my ($w, $h) = $self->SUPER::size_request;
625 664
626 ( 665 (
627 $w + $self->{border} * 2, 666 $w + $self->border * 2,
628 $h + $self->{border} * 2, 667 $h + $self->border * 2,
629 ) 668 )
630} 669}
631 670
632sub size_allocate { 671sub size_allocate {
633 my ($self, $w, $h) = @_; 672 my ($self, $w, $h) = @_;
634 673
635 $h -= List::Util::max 0, $self->{border} * 2; 674 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 675 $w -= List::Util::max 0, $self->border * 2;
637 676
677 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
678 if $self->{title};
679
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 680 $self->child->configure ($self->border, $self->border, $w, $h);
639} 681}
640 682
641sub button_down { 683sub button_down {
642 my ($self, $ev, $x, $y) = @_; 684 my ($self, $ev, $x, $y) = @_;
643 685
686 my $border = $self->border;
687
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 688 if ($x < $self->{w} && $x >= $self->{w} - $border
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 689 && $y < $self->{h} && $y >= $self->{h} - $border) {
646 690
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 691 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 692 my ($bw, $bh) = ($self->{w}, $self->{h});
649 693
650 $self->{motion} = sub { 694 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 695 my ($ev, $x, $y) = @_;
652 696
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 697 ($x, $y) = ($ev->{x}, $ev->{y});
654 698
655 $self->{user_w} = $bw + $x - $ox; 699 $self->{user_w} = $bw + $x - $ox;
656 $self->{user_h} = $bh + $y - $oy; 700 $self->{user_h} = $bh + $y - $oy;
657 $self->check_size; 701 $self->check_size;
658 }; 702 };
659 703
660 } elsif ($x >= 0 && $x < $self->{w} 704 } elsif ($x >= 0 && $x < $self->{w}
661 && $y >= 0 && $y < $self->{border}) { 705 && $y >= 0 && $y < $border) {
662 706
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 707 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 708 my ($bx, $by) = ($self->{x}, $self->{y});
665 709
666 $self->{motion} = sub { 710 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 711 my ($ev, $x, $y) = @_;
668 712
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 713 ($x, $y) = ($ev->{x}, $ev->{y});
670 714
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 715 $self->move ($bx + $x - $ox, $by + $y - $oy);
672 $self->update; 716 $self->update;
673 }; 717 };
674 } 718 }
… …
695 glEnable GL_BLEND; 739 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 741 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 743
744 my $border = $self->border;
745
700 glColor @{ $self->{border_bg} }; 746 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 747 $tex[1]->draw_quad (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 748 $tex[3]->draw_quad (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 750 $tex[4]->draw_quad (0, $h - $border, $w, $border);
705 751
706 my $bg = $tex[0]; 752 my $bg = $tex[0];
707 753
708 # TODO: repeat texture not scale 754 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 755 my $rep_x = $cw / $bg->{w};
… …
712 glColor @{ $self->{bg} }; 758 glColor @{ $self->{bg} };
713 759
714 $bg->{s} = $rep_x; 760 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y; 761 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1; 762 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 763 $bg->draw_quad ($border, $border, $cw, $ch);
718 764
719 glDisable GL_TEXTURE_2D; 765 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 766 glDisable GL_BLEND;
721 767
768 $self->{title}->draw if $self->{title};
722 $self->child->draw; 769 $self->child->draw;
723} 770}
724 771
725############################################################################# 772#############################################################################
726 773
… …
728 775
729our @ISA = CFClient::UI::Base::; 776our @ISA = CFClient::UI::Base::;
730 777
731use List::Util qw(max sum); 778use List::Util qw(max sum);
732 779
733use SDL::OpenGL; 780use CFClient::OpenGL;
734 781
735sub new { 782sub new {
736 my $class = shift; 783 my $class = shift;
737 784
738 $class->SUPER::new ( 785 $class->SUPER::new (
… …
744sub add { 791sub add {
745 my ($self, $x, $y, $child) = @_; 792 my ($self, $x, $y, $child) = @_;
746 793
747 $child->set_parent ($self); 794 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 795 $self->{children}[$y][$x] = $child;
749
750 $self->{w} = $self->{h} = -1;
751 796
752 $child->check_size; 797 $child->check_size;
753} 798}
754 799
755# 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?
… …
981 1026
982package CFClient::UI::Label; 1027package CFClient::UI::Label;
983 1028
984our @ISA = CFClient::UI::Base::; 1029our @ISA = CFClient::UI::Base::;
985 1030
986use SDL::OpenGL; 1031use CFClient::OpenGL;
987 1032
988sub new { 1033sub new {
989 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
990 1035
991 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1037 fg => [1, 1, 1],
993 fontsize => $::FONTSIZE, 1038 fontsize => 1,
994 text => "", 1039 text => "",
995 align => -1, 1040 align => -1,
996 valign => -1, 1041 valign => -1,
997 padding => 2, 1042 padding => 2,
998 layout => new CFClient::Layout, 1043 layout => new CFClient::Layout,
999 %arg 1044 %arg
1000 ); 1045 );
1001 1046
1002 $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 }
1003 1052
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1053 $self->set_text (delete $self->{text}) if exists $self->{text};
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006 1055
1007 $self 1056 $self
… …
1037 1086
1038sub size_request { 1087sub size_request {
1039 my ($self) = @_; 1088 my ($self) = @_;
1040 1089
1041 $self->{layout}->set_width; 1090 $self->{layout}->set_width;
1042 $self->{layout}->set_height ($self->{fontsize}); 1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1092
1044 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 }
1045 1103
1046 ( 1104 (
1047 $w + $self->{padding} * 2, 1105 $w + $self->{padding} * 2,
1048 $h + $self->{padding} * 2, 1106 $h + $self->{padding} * 2,
1049 ) 1107 )
… …
1053 my ($self, $w, $h) = @_; 1111 my ($self, $w, $h) = @_;
1054 1112
1055 delete $self->{texture}; 1113 delete $self->{texture};
1056} 1114}
1057 1115
1058sub update { 1116sub set_fontsize {
1059 my ($self) = @_; 1117 my ($self, $fontsize) = @_;
1060 1118
1061 delete $self->{texture}; 1119 $self->{fontsize} = $fontsize;
1062 $self->SUPER::update; 1120 $self->check_size;
1063} 1121}
1064 1122
1065sub _draw { 1123sub _draw {
1066 my ($self) = @_; 1124 my ($self) = @_;
1067 1125
1068 my $tex = $self->{texture} ||= do { 1126 my $tex = $self->{texture} ||= do {
1069 $self->{layout}->set_width ($self->{w}); 1127 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1128 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071 new_from_layout CFClient::Texture $self->{layout} 1129 new_from_layout CFClient::Texture $self->{layout}
1072 }; 1130 };
1073 1131
1074 glEnable GL_BLEND; 1132 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1133 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1100 1158
1101package CFClient::UI::EntryBase; 1159package CFClient::UI::EntryBase;
1102 1160
1103our @ISA = CFClient::UI::Label::; 1161our @ISA = CFClient::UI::Label::;
1104 1162
1105use SDL; 1163use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1164
1108sub new { 1165sub new {
1109 my $class = shift; 1166 my $class = shift;
1110 1167
1111 $class->SUPER::new ( 1168 $class->SUPER::new (
… …
1125 1182
1126 delete $self->{cur_h}; 1183 delete $self->{cur_h};
1127 1184
1128 return if $self->{text} eq $text; 1185 return if $self->{text} eq $text;
1129 1186
1187 delete $self->{texture};
1188
1130 $self->{last_activity} = $::NOW; 1189 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1190 $self->{text} = $text;
1132 1191
1133 $text =~ s/./*/g if $self->{hidden}; 1192 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1193 $self->{layout}->set_text ("$text ");
… …
1163} 1222}
1164 1223
1165sub key_down { 1224sub key_down {
1166 my ($self, $ev) = @_; 1225 my ($self, $ev) = @_;
1167 1226
1168 my $mod = $ev->key_mod; 1227 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1228 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1229 my $uni = $ev->{unicode};
1172 1230
1173 my $text = $self->get_text; 1231 my $text = $self->get_text;
1174 1232
1175 if ($sym == SDLK_BACKSPACE) { 1233 if ($sym == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1234 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1235 } elsif ($sym == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1236 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1237 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1238 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1239 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1240 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1241 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1242 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1243 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1244 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1245 } elsif ($sym == 27) {
1188 $self->emit ('escape'); 1246 $self->emit ('escape');
1189 } elsif ($uni) { 1247 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1248 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1249 }
1192 1250
… …
1267 1325
1268package CFClient::UI::Entry; 1326package CFClient::UI::Entry;
1269 1327
1270our @ISA = CFClient::UI::EntryBase::; 1328our @ISA = CFClient::UI::EntryBase::;
1271 1329
1272use SDL; 1330use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1331
1275sub key_down { 1332sub key_down {
1276 my ($self, $ev) = @_; 1333 my ($self, $ev) = @_;
1277 1334
1278 my $sym = $ev->key_sym; 1335 my $sym = $ev->{sym};
1279 1336
1280 if ($sym == SDLK_RETURN) { 1337 if ($sym == 13) {
1281 $self->emit (activate => $self->get_text); 1338 $self->emit (activate => $self->get_text);
1282 $self->update; 1339 $self->update;
1283 1340
1284 } else { 1341 } else {
1285 $self->SUPER::key_down ($ev); 1342 $self->SUPER::key_down ($ev);
… …
1291 1348
1292package CFClient::UI::Button; 1349package CFClient::UI::Button;
1293 1350
1294our @ISA = CFClient::UI::Label::; 1351our @ISA = CFClient::UI::Label::;
1295 1352
1296use SDL; 1353use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1354
1299my @tex = 1355my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1357 qw(b1_button_active.png);
1302 1358
1303sub new { 1359sub new {
1304 my $class = shift; 1360 my $class = shift;
1305 1361
… …
1352package CFClient::UI::CheckBox; 1408package CFClient::UI::CheckBox;
1353 1409
1354our @ISA = CFClient::UI::DrawBG::; 1410our @ISA = CFClient::UI::DrawBG::;
1355 1411
1356my @tex = 1412my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1413 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1414 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359 1415
1360use SDL; 1416use CFClient::OpenGL;
1361use SDL::OpenGL;
1362 1417
1363sub new { 1418sub new {
1364 my $class = shift; 1419 my $class = shift;
1365 1420
1366 $class->SUPER::new ( 1421 $class->SUPER::new (
… …
1412 glDisable GL_BLEND; 1467 glDisable GL_BLEND;
1413} 1468}
1414 1469
1415############################################################################# 1470#############################################################################
1416 1471
1417package CFClient::UI::VGauge; 1472package CFClient::UI::Image;
1418 1473
1419our @ISA = CFClient::UI::Base::; 1474our @ISA = CFClient::UI::Base::;
1420 1475
1421use SDL::OpenGL; 1476use CFClient::OpenGL;
1477use Carp qw/confess/;
1422 1478
1423my %tex = ( 1479our %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 1480
1442# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new { 1481sub new {
1444 my $class = shift; 1482 my $class = shift;
1445 1483
1446 my $self = $class->SUPER::new (gauge => 'food', @_); 1484 my $self = $class->SUPER::new (@_);
1485
1486 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1487
1488 $loaded_images{$self->{image}} ||=
1489 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1490
1491 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1492
1493 Scalar::Util::weaken $loaded_images{$self->{image}};
1494
1495 $self->{aspect} = $tex->{w} / $tex->{h};
1447 1496
1448 $self 1497 $self
1449} 1498}
1450 1499
1451sub size_request { 1500sub size_request {
1452 my ($self) = @_; 1501 my ($self) = @_;
1453 1502
1454 my $tex = $tex{$self->{gauge}}[0]; 1503 ($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} 1504}
1476 1505
1477sub _draw { 1506sub _draw {
1478 my ($self) = @_; 1507 my ($self) = @_;
1479 1508
1480 my $tex = $tex{$self->{gauge}}; 1509 my $tex = $self->{tex};
1481 1510
1482 my ($w, $h) = ($self->{w}, $self->{h}); 1511 my ($w, $h) = ($self->{w}, $self->{h});
1483 1512
1484 my $ycut = $self->{val} / ($self->{max_val} || 1); 1513 if ($self->{rot90}) {
1485 $ycut = 1 if $self->{val} > $self->{max_val}; 1514 glRotate 90, 0, 0, 1;
1515 glTranslate 0, -$self->{w}, 0;
1486 1516
1487 my $t1 = $tex->[0]; 1517 ($w, $h) = ($h, $w);
1488 my $t2 = $tex->[1]; 1518 }
1489 1519
1490 glEnable GL_BLEND; 1520 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1521 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1522 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1523 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1524
1525 $tex->draw_quad (0, 0, $w, $h);
1526
1527 glDisable GL_BLEND;
1528 glDisable GL_TEXTURE_2D;
1529}
1530
1531#############################################################################
1532
1533package CFClient::UI::VGauge;
1534
1535our @ISA = CFClient::UI::Base::;
1536
1537use CFClient::OpenGL;
1538
1539my %tex = (
1540 food => [
1541 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1542 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1543 ],
1544 grace => [
1545 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1546 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1547 ],
1548 hp => [
1549 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1550 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1551 ],
1552 mana => [
1553 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1554 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1555 ],
1556);
1557
1558# eg. VGauge->new (gauge => 'food'), default gauge: food
1559sub new {
1560 my $class = shift;
1561
1562 my $self = $class->SUPER::new (
1563 type => 'food',
1564 @_
1565 );
1566
1567 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1568
1569 $self
1570}
1571
1572sub size_request {
1573 my ($self) = @_;
1574
1575 #my $tex = $tex{$self->{type}}[0];
1576 #@$tex{qw(w h)}
1577 (0, 0)
1578}
1579
1580sub set_max {
1581 my ($self, $max) = @_;
1582
1583 $self->{max_val} = $max;
1584}
1585
1586sub set_value {
1587 my ($self, $val, $max) = @_;
1588
1589 $self->set_max ($max)
1590 if defined $max;
1591
1592 $max = $self->{max_val};
1593 $self->{val} = $val;
1594
1595 $self->update;
1596}
1597
1598sub _draw {
1599 my ($self) = @_;
1600
1601 my $tex = $tex{$self->{type}};
1602
1603 my ($w, $h) = ($self->{w}, $self->{h});
1604
1605 if ($self->{vertical}) {
1606 glRotate 90, 0, 0, 1;
1607 glTranslate 0, -$self->{w}, 0;
1608
1609 ($w, $h) = ($h, $w);
1610 }
1611
1612 my $ycut = $self->{val} / ($self->{max_val} || 1);
1613 $ycut = 1 if $self->{val} > $self->{max_val};
1614
1615 my $t1 = $tex->[0];
1616 my $t2 = $tex->[1];
1617
1618 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1620 glEnable GL_TEXTURE_2D;
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1622
1495 my $h1 = $self->{h} - $ycut * $self->{h}; 1623 my $h1 = $self->{h} - $ycut * $self->{h};
1496 my $h2 = $ycut * $self->{h}; 1624 my $h2 = $ycut * $self->{h};
1497 1625
1498 my $yp = 0;
1499
1500 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1626 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS; 1627 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp; 1628 glTexCoord 0 , 0; glVertex 0 , 0;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1629 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1630 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1631 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506 glEnd; 1632 glEnd;
1507
1508 $yp += $h1;
1509 1633
1510 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1634 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS; 1635 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1636 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1637 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1514 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2; 1638 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1515 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1639 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1516 glEnd; 1640 glEnd;
1517 1641
1518 glDisable GL_BLEND; 1642 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1643 glDisable GL_TEXTURE_2D;
1520} 1644}
1521 1645
1522############################################################################# 1646#############################################################################
1523 1647
1648package CFClient::UI::Gauge;
1649
1650our @ISA = CFClient::UI::VBox::;
1651
1652sub new {
1653 my ($class, %arg) = shift;
1654
1655 my $self = $class->SUPER::new (
1656 @_,
1657 );
1658
1659 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
1660 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1661 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
1662
1663 $self
1664}
1665
1666sub set_fontsize {
1667 my ($self, $fsize) = @_;
1668
1669 $self->{value}->set_fontsize ($fsize);
1670 $self->{max} ->set_fontsize ($fsize);
1671}
1672
1673sub set_value {
1674 my ($self, $val, $max) = @_;
1675
1676 $self->set_max ($max)
1677 if defined $max;
1678
1679 $self->{gauge}->set_value ($val, $max);
1680 $self->{value}->set_text ($val);
1681}
1682
1683sub set_max {
1684 my ($self, $max) = @_;
1685
1686 $self->{gauge}->set_max ($max);
1687 $self->{max}->set_text ($max);
1688}
1689
1690#############################################################################
1691
1524package CFClient::UI::Slider; 1692package CFClient::UI::Slider;
1525 1693
1526use strict; 1694use strict;
1527 1695
1528use SDL::OpenGL; 1696use CFClient::OpenGL;
1529 1697
1530our @ISA = CFClient::UI::DrawBG::; 1698our @ISA = CFClient::UI::DrawBG::;
1531 1699
1532my @tex = 1700my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1701 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1543 # TODO: calculations are off 1711 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 1712 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 1713 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 1714 active_fg => [0, 0, 0],
1547 range => [0, 0, 100, 10], 1715 range => [0, 0, 100, 10],
1548 req_w => 40, 1716 req_w => 20,
1549 req_h => 13, 1717 req_h => 20,
1550 vertical => 0, 1718 vertical => 0,
1551 can_hover => 1, 1719 can_hover => 1,
1552 inner_pad => 5, 1720 inner_pad => 5,
1553 @_ 1721 @_
1554 ); 1722 );
… …
1658 1826
1659package CFClient::UI::TextView; 1827package CFClient::UI::TextView;
1660 1828
1661our @ISA = CFClient::UI::HBox::; 1829our @ISA = CFClient::UI::HBox::;
1662 1830
1663use SDL::OpenGL; 1831use CFClient::OpenGL;
1664 1832
1665sub new { 1833sub new {
1666 my $class = shift; 1834 my $class = shift;
1667 1835
1668 my $self = $class->SUPER::new ( 1836 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6,
1670 req_h => $::HEIGHT / 6,
1671 fontsize => $::FONTSIZE, 1837 fontsize => 1,
1672 @_, 1838 @_,
1673 1839
1674 layout => (new CFClient::Layout), 1840 layout => (new CFClient::Layout),
1675 par => [], 1841 par => [],
1676 height => 0, 1842 height => 0,
… …
1697sub text_height { 1863sub text_height {
1698 my ($self, $text) = @_; 1864 my ($self, $text) = @_;
1699 1865
1700 my $layout = $self->{layout}; 1866 my $layout = $self->{layout};
1701 1867
1702 $layout->set_height ($self->{fontsize}); 1868 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 1869 $layout->set_width ($self->{w});
1704 $layout->set_text ($text); 1870 $layout->set_text ($text);
1705 1871
1706 ($layout->size)[1] 1872 ($layout->size)[1]
1707} 1873}
… …
1711 1877
1712 $self->{need_reflow}++; 1878 $self->{need_reflow}++;
1713 $self->update; 1879 $self->update;
1714} 1880}
1715 1881
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate { 1882sub size_allocate {
1723 my ($self, $w, $h) = @_; 1883 my ($self, $w, $h) = @_;
1724 1884
1885 $self->SUPER::size_allocate ($w, $h);
1886
1725 $self->{layout}->set_height ($self->{fontsize}); 1887 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726 $self->{layout}->set_width ($self->{w}); 1888 $self->{layout}->set_width ($self->{children}[0]{w});
1727 1889
1728 $self->reflow; 1890 $self->reflow;
1729 $self->update;
1730} 1891}
1731 1892
1732sub add_paragraph { 1893sub add_paragraph {
1733 my ($self, $color, $text) = @_; 1894 my ($self, $color, $text) = @_;
1734 1895
… …
1819 1980
1820} 1981}
1821 1982
1822############################################################################# 1983#############################################################################
1823 1984
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; 1985package CFClient::UI::Animator;
2061 1986
2062use SDL::OpenGL; 1987use CFClient::OpenGL;
2063 1988
2064our @ISA = CFClient::UI::Bin::; 1989our @ISA = CFClient::UI::Bin::;
2065 1990
2066sub moveto { 1991sub moveto {
2067 my ($self, $x, $y) = @_; 1992 my ($self, $x, $y) = @_;
… …
2140 2065
2141package CFClient::UI::Root; 2066package CFClient::UI::Root;
2142 2067
2143our @ISA = CFClient::UI::Container::; 2068our @ISA = CFClient::UI::Container::;
2144 2069
2145use SDL::OpenGL; 2070use CFClient::OpenGL;
2146 2071
2147sub check_size { 2072sub check_size {
2148 my ($self) = @_; 2073 my ($self) = @_;
2149 2074
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 2075 $self->configure (0, 0, $::WITH, $::HEIGHT);
… …
2176 ::refresh (); 2101 ::refresh ();
2177} 2102}
2178 2103
2179sub add { 2104sub add {
2180 my ($self, $child) = @_; 2105 my ($self, $child) = @_;
2106
2107 # integerize window positions
2108 $child->{x} = int $child->{x};
2109 $child->{y} = int $child->{y};
2181 2110
2182 $self->SUPER::add ($child); 2111 $self->SUPER::add ($child);
2183} 2112}
2184 2113
2185sub on_refresh { 2114sub on_refresh {

Diff Legend

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