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.129 by root, Tue Apr 18 01:36:13 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) = @_;
117 131
118 $self->{x} = int $x; 132 $self->{x} = int $x;
119 $self->{y} = int $y; 133 $self->{y} = int $y;
… …
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 += ($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) {
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) = @_;
… …
288} 315}
289 316
290sub connect { 317sub connect {
291 my ($self, $signal, $cb) = @_; 318 my ($self, $signal, $cb) = @_;
292 319
293 push @{ $self->{cb}{$signal} }, $cb; 320 push @{ $self->{signal_cb}{$signal} }, $cb;
294} 321}
295 322
296sub emit { 323sub emit {
297 my ($self, $signal, @args) = @_; 324 my ($self, $signal, @args) = @_;
298 325
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
299 $_->($self, @args) 327 $cb->($self, @args);
300 for @{$self->{cb}{$signal} || []}; 328 }
301} 329}
302 330
303sub DESTROY { 331sub DESTROY {
304 my ($self) = @_; 332 my ($self) = @_;
305 333
… …
311package CFClient::UI::DrawBG; 339package CFClient::UI::DrawBG;
312 340
313our @ISA = CFClient::UI::Base::; 341our @ISA = CFClient::UI::Base::;
314 342
315use strict; 343use strict;
316use SDL::OpenGL; 344use CFClient::OpenGL;
317 345
318sub new { 346sub new {
319 my $class = shift; 347 my $class = shift;
320 348
321 # range [value, low, high, page] 349 # range [value, low, high, page]
… …
385 $self->{children} = [ 413 $self->{children} = [
386 sort { $a->{z} <=> $b->{z} } 414 sort { $a->{z} <=> $b->{z} }
387 @{$self->{children}}, $child 415 @{$self->{children}}, $child
388 ]; 416 ];
389 417
390 $self->{w} = $self->{h} = -1;
391
392 $child->check_size; 418 $child->check_size;
393} 419}
394 420
395sub remove { 421sub remove {
396 my ($self, $widget) = @_; 422 my ($self, $child) = @_;
397 423
424 delete $child->{parent};
425
398 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
399 427
400 $self->check_size; 428 $self->check_size;
401} 429}
402 430
403sub find_widget { 431sub find_widget {
… …
435 463
436 $class->SUPER::new (children => [$child], %arg) 464 $class->SUPER::new (children => [$child], %arg)
437} 465}
438 466
439sub add { 467sub add {
440 my ($self, $widget) = @_; 468 my ($self, $child) = @_;
441 469
442 $self->{children} = []; 470 $self->{children} = [];
443 471
444 $self->SUPER::add ($widget); 472 $self->SUPER::add ($child);
445} 473}
446 474
447sub remove { 475sub remove {
448 my ($self, $widget) = @_; 476 my ($self, $widget) = @_;
449 477
… …
469 497
470package CFClient::UI::Window; 498package CFClient::UI::Window;
471 499
472our @ISA = CFClient::UI::Bin::; 500our @ISA = CFClient::UI::Bin::;
473 501
474use SDL::OpenGL; 502use CFClient::OpenGL;
475 503
476sub new { 504sub new {
477 my ($class, %arg) = @_; 505 my ($class, %arg) = @_;
478 506
479 my $self = $class->SUPER::new (%arg); 507 my $self = $class->SUPER::new (%arg);
… …
552 580
553package CFClient::UI::Frame; 581package CFClient::UI::Frame;
554 582
555our @ISA = CFClient::UI::Bin::; 583our @ISA = CFClient::UI::Bin::;
556 584
557use SDL::OpenGL; 585use CFClient::OpenGL;
558 586
559sub size_request { 587sub size_request {
560 my ($self) = @_; 588 my ($self) = @_;
561 my $chld = $self->child 589 my $chld = $self->child
562 or return (0, 0); 590 or return (0, 0);
… …
594 622
595package CFClient::UI::FancyFrame; 623package CFClient::UI::FancyFrame;
596 624
597our @ISA = CFClient::UI::Bin::; 625our @ISA = CFClient::UI::Bin::;
598 626
599use SDL::OpenGL; 627use CFClient::OpenGL;
600 628
601my @tex = 629my @tex =
602 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
603 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);
604 632
605sub new { 633sub new {
606 my $class = shift; 634 my $class = shift;
607 635
608 # TODO: user_x, user_y, overwrite moveto? 636 # TODO: user_x, user_y, overwrite moveto?
609 637
610 $class->SUPER::new ( 638 my $self = $class->SUPER::new (
611 bg => [1, 1, 1, 1], 639 bg => [1, 1, 1, 1],
612 border_bg => [1, 1, 1, 1], 640 border_bg => [1, 1, 1, 1],
613 border => int $::FONTSIZE * 0.8, 641 border => 0.8,
614 @_ 642 @_
615 ) 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
616} 656}
617 657
618sub size_request { 658sub size_request {
619 my ($self) = @_; 659 my ($self) = @_;
620 660
621 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};
622 662
623 my ($w, $h) = $self->SUPER::size_request; 663 my ($w, $h) = $self->SUPER::size_request;
624 664
625 ( 665 (
626 $w + $self->{border} * 2, 666 $w + $self->border * 2,
627 $h + $self->{border} * 2, 667 $h + $self->border * 2,
628 ) 668 )
629} 669}
630 670
631sub size_allocate { 671sub size_allocate {
632 my ($self, $w, $h) = @_; 672 my ($self, $w, $h) = @_;
633 673
634 $h -= List::Util::max 0, $self->{border} * 2; 674 $h -= List::Util::max 0, $self->border * 2;
635 $w -= List::Util::max 0, $self->{border} * 2; 675 $w -= List::Util::max 0, $self->border * 2;
636 676
677 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
678 if $self->{title};
679
637 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 680 $self->child->configure ($self->border, $self->border, $w, $h);
638} 681}
639 682
640sub button_down { 683sub button_down {
641 my ($self, $ev, $x, $y) = @_; 684 my ($self, $ev, $x, $y) = @_;
642 685
686 my $border = $self->border;
687
643 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 688 if ($x < $self->{w} && $x >= $self->{w} - $border
644 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 689 && $y < $self->{h} && $y >= $self->{h} - $border) {
645 690
646 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 691 my ($ox, $oy) = ($ev->{x}, $ev->{y});
647 my ($bw, $bh) = ($self->{w}, $self->{h}); 692 my ($bw, $bh) = ($self->{w}, $self->{h});
648 693
649 $self->{motion} = sub { 694 $self->{motion} = sub {
650 my ($ev, $x, $y) = @_; 695 my ($ev, $x, $y) = @_;
651 696
652 ($x, $y) = ($ev->motion_x, $ev->motion_y); 697 ($x, $y) = ($ev->{x}, $ev->{y});
653 698
654 $self->{user_w} = $bw + $x - $ox; 699 $self->{user_w} = $bw + $x - $ox;
655 $self->{user_h} = $bh + $y - $oy; 700 $self->{user_h} = $bh + $y - $oy;
656 $self->check_size; 701 $self->check_size;
657 }; 702 };
658 703
659 } elsif ($x >= 0 && $x < $self->{w} 704 } elsif ($x >= 0 && $x < $self->{w}
660 && $y >= 0 && $y < $self->{border}) { 705 && $y >= 0 && $y < $border) {
661 706
662 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 707 my ($ox, $oy) = ($ev->{x}, $ev->{y});
663 my ($bx, $by) = ($self->{x}, $self->{y}); 708 my ($bx, $by) = ($self->{x}, $self->{y});
664 709
665 $self->{motion} = sub { 710 $self->{motion} = sub {
666 my ($ev, $x, $y) = @_; 711 my ($ev, $x, $y) = @_;
667 712
668 ($x, $y) = ($ev->motion_x, $ev->motion_y); 713 ($x, $y) = ($ev->{x}, $ev->{y});
669 714
670 $self->move ($bx + $x - $ox, $by + $y - $oy); 715 $self->move ($bx + $x - $ox, $by + $y - $oy);
671 $self->update; 716 $self->update;
672 }; 717 };
673 } 718 }
… …
694 glEnable GL_BLEND; 739 glEnable GL_BLEND;
695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
696 glEnable GL_TEXTURE_2D; 741 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
698 743
744 my $border = $self->border;
745
699 glColor @{ $self->{border_bg} }; 746 glColor @{ $self->{border_bg} };
700 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 747 $tex[1]->draw_quad (0, 0, $w, $border);
701 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 748 $tex[3]->draw_quad (0, $border, $border, $ch);
702 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
703 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 750 $tex[4]->draw_quad (0, $h - $border, $w, $border);
704 751
705 my $bg = $tex[0]; 752 my $bg = $tex[0];
706 753
707 # TODO: repeat texture not scale 754 # TODO: repeat texture not scale
708 my $rep_x = $cw / $bg->{w}; 755 my $rep_x = $cw / $bg->{w};
… …
711 glColor @{ $self->{bg} }; 758 glColor @{ $self->{bg} };
712 759
713 $bg->{s} = $rep_x; 760 $bg->{s} = $rep_x;
714 $bg->{t} = $rep_y; 761 $bg->{t} = $rep_y;
715 $bg->{wrap_mode} = 1; 762 $bg->{wrap_mode} = 1;
716 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 763 $bg->draw_quad ($border, $border, $cw, $ch);
717 764
718 glDisable GL_TEXTURE_2D; 765 glDisable GL_TEXTURE_2D;
719 glDisable GL_BLEND; 766 glDisable GL_BLEND;
720 767
768 $self->{title}->draw if $self->{title};
721 $self->child->draw; 769 $self->child->draw;
722} 770}
723 771
724############################################################################# 772#############################################################################
725 773
… …
727 775
728our @ISA = CFClient::UI::Base::; 776our @ISA = CFClient::UI::Base::;
729 777
730use List::Util qw(max sum); 778use List::Util qw(max sum);
731 779
732use SDL::OpenGL; 780use CFClient::OpenGL;
733 781
734sub new { 782sub new {
735 my $class = shift; 783 my $class = shift;
736 784
737 $class->SUPER::new ( 785 $class->SUPER::new (
… …
743sub add { 791sub add {
744 my ($self, $x, $y, $child) = @_; 792 my ($self, $x, $y, $child) = @_;
745 793
746 $child->set_parent ($self); 794 $child->set_parent ($self);
747 $self->{children}[$y][$x] = $child; 795 $self->{children}[$y][$x] = $child;
748
749 $self->{w} = $self->{h} = -1;
750 796
751 $child->check_size; 797 $child->check_size;
752} 798}
753 799
754# 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?
… …
980 1026
981package CFClient::UI::Label; 1027package CFClient::UI::Label;
982 1028
983our @ISA = CFClient::UI::Base::; 1029our @ISA = CFClient::UI::Base::;
984 1030
985use SDL::OpenGL; 1031use CFClient::OpenGL;
986 1032
987sub new { 1033sub new {
988 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
989 1035
990 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
991 fg => [1, 1, 1], 1037 fg => [1, 1, 1],
992 fontsize => $::FONTSIZE, 1038 fontsize => 1,
993 text => "", 1039 text => "",
994 align => -1, 1040 align => -1,
995 valign => -1, 1041 valign => -1,
996 padding => 2, 1042 padding => 2,
997 layout => new CFClient::Layout, 1043 layout => new CFClient::Layout,
998 %arg 1044 %arg
999 ); 1045 );
1000 1046
1001 $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 }
1002 1052
1003 $self->set_text (delete $self->{text}) if exists $self->{text}; 1053 $self->set_text (delete $self->{text}) if exists $self->{text};
1004 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1005 1055
1006 $self 1056 $self
… …
1036 1086
1037sub size_request { 1087sub size_request {
1038 my ($self) = @_; 1088 my ($self) = @_;
1039 1089
1040 $self->{layout}->set_width; 1090 $self->{layout}->set_width;
1041 $self->{layout}->set_height ($self->{fontsize}); 1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1042 1092
1043 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 }
1044 1103
1045 ( 1104 (
1046 $w + $self->{padding} * 2, 1105 $w + $self->{padding} * 2,
1047 $h + $self->{padding} * 2, 1106 $h + $self->{padding} * 2,
1048 ) 1107 )
… …
1052 my ($self, $w, $h) = @_; 1111 my ($self, $w, $h) = @_;
1053 1112
1054 delete $self->{texture}; 1113 delete $self->{texture};
1055} 1114}
1056 1115
1057sub update {
1058 my ($self) = @_;
1059
1060 delete $self->{texture};
1061 $self->SUPER::update;
1062}
1063
1064sub _draw { 1116sub _draw {
1065 my ($self) = @_; 1117 my ($self) = @_;
1066 1118
1067 my $tex = $self->{texture} ||= do { 1119 my $tex = $self->{texture} ||= do {
1068 $self->{layout}->set_width ($self->{w}); 1120 $self->{layout}->set_width ($self->{w});
1069 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1121 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1070 new_from_layout CFClient::Texture $self->{layout} 1122 new_from_layout CFClient::Texture $self->{layout}
1071 }; 1123 };
1072 1124
1073 glEnable GL_BLEND; 1125 glEnable GL_BLEND;
1074 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1126 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1099 1151
1100package CFClient::UI::EntryBase; 1152package CFClient::UI::EntryBase;
1101 1153
1102our @ISA = CFClient::UI::Label::; 1154our @ISA = CFClient::UI::Label::;
1103 1155
1104use SDL; 1156use CFClient::OpenGL;
1105use SDL::OpenGL;
1106 1157
1107sub new { 1158sub new {
1108 my $class = shift; 1159 my $class = shift;
1109 1160
1110 $class->SUPER::new ( 1161 $class->SUPER::new (
… …
1124 1175
1125 delete $self->{cur_h}; 1176 delete $self->{cur_h};
1126 1177
1127 return if $self->{text} eq $text; 1178 return if $self->{text} eq $text;
1128 1179
1180 delete $self->{texture};
1181
1129 $self->{last_activity} = $::NOW; 1182 $self->{last_activity} = $::NOW;
1130 $self->{text} = $text; 1183 $self->{text} = $text;
1131 1184
1132 $text =~ s/./*/g if $self->{hidden}; 1185 $text =~ s/./*/g if $self->{hidden};
1133 $self->{layout}->set_text ("$text "); 1186 $self->{layout}->set_text ("$text ");
… …
1162} 1215}
1163 1216
1164sub key_down { 1217sub key_down {
1165 my ($self, $ev) = @_; 1218 my ($self, $ev) = @_;
1166 1219
1167 my $mod = $ev->key_mod; 1220 my $mod = $ev->{mod};
1168 my $sym = $ev->key_sym; 1221 my $sym = $ev->{sym};
1169
1170 my $uni = $ev->key_unicode; 1222 my $uni = $ev->{unicode};
1171 1223
1172 my $text = $self->get_text; 1224 my $text = $self->get_text;
1173 1225
1174 if ($sym == SDLK_BACKSPACE) { 1226 if ($sym == 8) {
1175 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1227 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1176 } elsif ($sym == SDLK_DELETE) { 1228 } elsif ($sym == 127) {
1177 substr $text, $self->{cursor}, 1, ""; 1229 substr $text, $self->{cursor}, 1, "";
1178 } elsif ($sym == SDLK_LEFT) { 1230 } elsif ($sym == CFClient::SDLK_LEFT) {
1179 --$self->{cursor} if $self->{cursor}; 1231 --$self->{cursor} if $self->{cursor};
1180 } elsif ($sym == SDLK_RIGHT) { 1232 } elsif ($sym == CFClient::SDLK_RIGHT) {
1181 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1233 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1182 } elsif ($sym == SDLK_HOME) { 1234 } elsif ($sym == CFClient::SDLK_HOME) {
1183 $self->{cursor} = 0; 1235 $self->{cursor} = 0;
1184 } elsif ($sym == SDLK_END) { 1236 } elsif ($sym == CFClient::SDLK_END) {
1185 $self->{cursor} = length $text; 1237 $self->{cursor} = length $text;
1186 } elsif ($sym == SDLK_ESCAPE) { 1238 } elsif ($sym == 27) {
1187 $self->emit ('escape'); 1239 $self->emit ('escape');
1188 } elsif ($uni) { 1240 } elsif ($uni) {
1189 substr $text, $self->{cursor}++, 0, chr $uni; 1241 substr $text, $self->{cursor}++, 0, chr $uni;
1190 } 1242 }
1191 1243
… …
1266 1318
1267package CFClient::UI::Entry; 1319package CFClient::UI::Entry;
1268 1320
1269our @ISA = CFClient::UI::EntryBase::; 1321our @ISA = CFClient::UI::EntryBase::;
1270 1322
1271use SDL; 1323use CFClient::OpenGL;
1272use SDL::OpenGL;
1273 1324
1274sub key_down { 1325sub key_down {
1275 my ($self, $ev) = @_; 1326 my ($self, $ev) = @_;
1276 1327
1277 my $sym = $ev->key_sym; 1328 my $sym = $ev->{sym};
1278 1329
1279 if ($sym == SDLK_RETURN) { 1330 if ($sym == 13) {
1280 $self->emit (activate => $self->get_text); 1331 $self->emit (activate => $self->get_text);
1281 $self->update; 1332 $self->update;
1282 1333
1283 } else { 1334 } else {
1284 $self->SUPER::key_down ($ev); 1335 $self->SUPER::key_down ($ev);
… …
1290 1341
1291package CFClient::UI::Button; 1342package CFClient::UI::Button;
1292 1343
1293our @ISA = CFClient::UI::Label::; 1344our @ISA = CFClient::UI::Label::;
1294 1345
1295use SDL; 1346use CFClient::OpenGL;
1296use SDL::OpenGL;
1297 1347
1298my @tex = 1348my @tex =
1299 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1349 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1300 qw(b1_button_active.png); 1350 qw(b1_button_active.png);
1301 1351
… …
1354 1404
1355my @tex = 1405my @tex =
1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1357 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1407 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1358 1408
1359use SDL; 1409use CFClient::OpenGL;
1360use SDL::OpenGL;
1361 1410
1362sub new { 1411sub new {
1363 my $class = shift; 1412 my $class = shift;
1364 1413
1365 $class->SUPER::new ( 1414 $class->SUPER::new (
… …
1415 1464
1416package CFClient::UI::VGauge; 1465package CFClient::UI::VGauge;
1417 1466
1418our @ISA = CFClient::UI::Base::; 1467our @ISA = CFClient::UI::Base::;
1419 1468
1420use SDL::OpenGL; 1469use CFClient::OpenGL;
1421 1470
1422my %tex = ( 1471my %tex = (
1423 food => [ 1472 food => [
1424 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1473 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1425 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1474 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
… …
1440 1489
1441# eg. VGauge->new (gauge => 'food'), default gauge: food 1490# eg. VGauge->new (gauge => 'food'), default gauge: food
1442sub new { 1491sub new {
1443 my $class = shift; 1492 my $class = shift;
1444 1493
1445 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};
1446 1500
1447 $self 1501 $self
1448} 1502}
1449 1503
1450sub size_request { 1504sub size_request {
1451 my ($self) = @_; 1505 my ($self) = @_;
1452 1506
1453 my $tex = $tex{$self->{gauge}}[0]; 1507 #my $tex = $tex{$self->{type}}[0];
1454
1455 @$tex{qw(w h)} 1508 #@$tex{qw(w h)}
1509 (0, 0)
1456} 1510}
1457 1511
1458sub set_max { 1512sub set_max {
1459 my ($self, $max) = @_; 1513 my ($self, $max) = @_;
1460 1514
… …
1474} 1528}
1475 1529
1476sub _draw { 1530sub _draw {
1477 my ($self) = @_; 1531 my ($self) = @_;
1478 1532
1479 my $tex = $tex{$self->{gauge}}; 1533 my $tex = $tex{$self->{type}};
1480 1534
1481 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 }
1482 1543
1483 my $ycut = $self->{val} / ($self->{max_val} || 1); 1544 my $ycut = $self->{val} / ($self->{max_val} || 1);
1484 $ycut = 1 if $self->{val} > $self->{max_val}; 1545 $ycut = 1 if $self->{val} > $self->{max_val};
1485 1546
1486 my $t1 = $tex->[0]; 1547 my $t1 = $tex->[0];
… …
1492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1493 1554
1494 my $h1 = $self->{h} - $ycut * $self->{h}; 1555 my $h1 = $self->{h} - $ycut * $self->{h};
1495 my $h2 = $ycut * $self->{h}; 1556 my $h2 = $ycut * $self->{h};
1496 1557
1497 my $yp = 0;
1498
1499 glBindTexture (GL_TEXTURE_2D, $t1->{name}); 1558 glBindTexture GL_TEXTURE_2D, $t1->{name};
1500 glBegin (GL_QUADS); 1559 glBegin GL_QUADS;
1501 glTexCoord (0, 0); glVertex (0 , $yp); 1560 glTexCoord 0 , 0; glVertex 0 , 0;
1502 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1); 1561 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1503 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1); 1562 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1504 glTexCoord (1, 0); glVertex (0 + $w, $yp); 1563 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1505 glEnd (); 1564 glEnd;
1506 1565
1507 $yp += $h1;
1508
1509 glBindTexture (GL_TEXTURE_2D, $t2->{name}); 1566 glBindTexture GL_TEXTURE_2D, $t2->{name};
1510 glBegin (GL_QUADS); 1567 glBegin GL_QUADS;
1511 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp); 1568 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1512 glTexCoord (0, 1); glVertex (0 , $yp + $h2); 1569 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1513 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2); 1570 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1514 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp); 1571 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1515 glEnd (); 1572 glEnd;
1516 1573
1517 glDisable GL_BLEND; 1574 glDisable GL_BLEND;
1518 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1519} 1576}
1520 1577
1521############################################################################# 1578#############################################################################
1522 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
1523package CFClient::UI::Slider; 1617package CFClient::UI::Slider;
1524 1618
1525use strict; 1619use strict;
1526 1620
1527use SDL::OpenGL; 1621use CFClient::OpenGL;
1528 1622
1529our @ISA = CFClient::UI::DrawBG::; 1623our @ISA = CFClient::UI::DrawBG::;
1530 1624
1531my @tex = 1625my @tex =
1532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1542 # TODO: calculations are off 1636 # TODO: calculations are off
1543 my $self = $class->SUPER::new ( 1637 my $self = $class->SUPER::new (
1544 fg => [1, 1, 1], 1638 fg => [1, 1, 1],
1545 active_fg => [0, 0, 0], 1639 active_fg => [0, 0, 0],
1546 range => [0, 0, 100, 10], 1640 range => [0, 0, 100, 10],
1547 req_w => 40, 1641 req_w => 20,
1548 req_h => 13, 1642 req_h => 20,
1549 vertical => 0, 1643 vertical => 0,
1550 can_hover => 1, 1644 can_hover => 1,
1551 inner_pad => 5, 1645 inner_pad => 5,
1552 @_ 1646 @_
1553 ); 1647 );
… …
1657 1751
1658package CFClient::UI::TextView; 1752package CFClient::UI::TextView;
1659 1753
1660our @ISA = CFClient::UI::HBox::; 1754our @ISA = CFClient::UI::HBox::;
1661 1755
1662use SDL::OpenGL; 1756use CFClient::OpenGL;
1663 1757
1664sub new { 1758sub new {
1665 my $class = shift; 1759 my $class = shift;
1666 1760
1667 my $self = $class->SUPER::new ( 1761 my $self = $class->SUPER::new (
1668 req_w => $::WIDTH / 6,
1669 req_h => $::HEIGHT / 6,
1670 fontsize => $::FONTSIZE, 1762 fontsize => 1,
1671 @_, 1763 @_,
1672 1764
1673 layout => (new CFClient::Layout), 1765 layout => (new CFClient::Layout),
1674 par => [], 1766 par => [],
1675 height => 0, 1767 height => 0,
… …
1696sub text_height { 1788sub text_height {
1697 my ($self, $text) = @_; 1789 my ($self, $text) = @_;
1698 1790
1699 my $layout = $self->{layout}; 1791 my $layout = $self->{layout};
1700 1792
1701 $layout->set_height ($self->{fontsize}); 1793 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1702 $layout->set_width ($self->{w}); 1794 $layout->set_width ($self->{w});
1703 $layout->set_text ($text); 1795 $layout->set_text ($text);
1704 1796
1705 ($layout->size)[1] 1797 ($layout->size)[1]
1706} 1798}
… …
1710 1802
1711 $self->{need_reflow}++; 1803 $self->{need_reflow}++;
1712 $self->update; 1804 $self->update;
1713} 1805}
1714 1806
1715sub size_request {
1716 my ($self) = @_;
1717
1718 ($self->{req_w}, $self->{req_h})
1719}
1720
1721sub size_allocate { 1807sub size_allocate {
1722 my ($self, $w, $h) = @_; 1808 my ($self, $w, $h) = @_;
1723 1809
1810 $self->SUPER::size_allocate ($w, $h);
1811
1724 $self->{layout}->set_height ($self->{fontsize}); 1812 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1725 $self->{layout}->set_width ($self->{w}); 1813 $self->{layout}->set_width ($self->{children}[0]{w});
1726 1814
1727 $self->reflow; 1815 $self->reflow;
1728 $self->update;
1729} 1816}
1730 1817
1731sub add_paragraph { 1818sub add_paragraph {
1732 my ($self, $color, $text) = @_; 1819 my ($self, $color, $text) = @_;
1733 1820
… …
1818 1905
1819} 1906}
1820 1907
1821############################################################################# 1908#############################################################################
1822 1909
1823package CFClient::UI::MapWidget;
1824
1825use strict;
1826
1827use List::Util qw(min max);
1828
1829use SDL;
1830use SDL::OpenGL;
1831
1832our @ISA = CFClient::UI::Base::;
1833
1834sub new {
1835 my $class = shift;
1836
1837 $class->SUPER::new (
1838 z => -1,
1839 can_focus => 1,
1840 list => (glGenLists 1),
1841 @_
1842 )
1843}
1844
1845sub key_down {
1846 print "MAPKEYDOWN\n";
1847}
1848
1849sub key_up {
1850}
1851
1852sub button_down {
1853 my ($self, $ev, $x, $y) = @_;
1854
1855 $self->focus_in;
1856
1857 if ($ev->button == 2) {
1858 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1859 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1860
1861 $self->{motion} = sub {
1862 my ($ev, $x, $y) = @_;
1863
1864 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1865
1866 $::CFG->{map_shift_x} = $bw + $x - $ox;
1867 $::CFG->{map_shift_y} = $bh + $y - $oy;
1868
1869 $self->update;
1870 };
1871 }
1872}
1873
1874sub button_up {
1875 my ($self, $ev, $x, $y) = @_;
1876
1877 delete $self->{motion};
1878}
1879
1880sub mouse_motion {
1881 my ($self, $ev, $x, $y) = @_;
1882
1883 $self->{motion}->($ev, $x, $y) if $self->{motion};
1884}
1885
1886sub size_request {
1887 (
1888 1 + 32 * int $::WIDTH / 32,
1889 1 + 32 * int $::HEIGHT / 32,
1890 )
1891}
1892
1893sub update {
1894 my ($self) = @_;
1895
1896 $self->{need_update} = 1;
1897 $self->SUPER::update;
1898}
1899
1900sub draw {
1901 my ($self) = @_;
1902
1903 if (delete $self->{need_update}) {
1904 glNewList $self->{list}, GL_COMPILE;
1905
1906 if ($::MAP) {
1907 my $sw = int $::WIDTH / 32;
1908 my $sh = int $::HEIGHT / 32;
1909
1910 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1911 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1912
1913 glTranslate $sx0 - 32, $sy0 - 32, 0;
1914
1915 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1916
1917 if ($::CFG->{fow_enable}) {
1918 if ($::CFG->{fow_smooth}) { # smooth fog of war
1919 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1920 glConvolutionFilter2D (
1921 GL_CONVOLUTION_2D,
1922 GL_ALPHA,
1923 3, 3,
1924 GL_ALPHA, GL_FLOAT,
1925 pack "f*",
1926 0.1, 0.1, 0.1,
1927 0.1, 0.2, 0.1,
1928 0.1, 0.1, 0.1,
1929 );
1930 glEnable GL_CONVOLUTION_2D;
1931 }
1932
1933 $self->{fow_texture} = new CFClient::Texture
1934 w => $w,
1935 h => $h,
1936 data => $data,
1937 internalformat => GL_ALPHA,
1938 format => GL_ALPHA;
1939
1940 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1941
1942 glEnable GL_BLEND;
1943 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1944 glEnable GL_TEXTURE_2D;
1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1946
1947 glColor +($::CFG->{fow_intensity}) x 3, 1;
1948 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1949
1950 glDisable GL_TEXTURE_2D;
1951 glDisable GL_BLEND;
1952 }
1953
1954 # HACK BEGIN
1955 {
1956 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1957 my ($w, $h) = (250, 250);
1958
1959 glEnable GL_BLEND;
1960 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961 glEnable GL_TEXTURE_2D;
1962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963
1964 $self->{mapmap_texture} =
1965 new CFClient::Texture
1966 w => $w,
1967 h => $h,
1968 data => $::MAP->mapmap ($w, $h),
1969 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1970
1971 $self->{mapmap_texture}->draw_quad (100, 100);
1972
1973 glDisable GL_TEXTURE_2D;
1974 glDisable GL_BLEND;
1975 }
1976 # HACK END
1977 }
1978
1979 glEndList;
1980 }
1981
1982 glPushMatrix;
1983 glCallList $self->{list};
1984 glPopMatrix;
1985
1986 if ($FOCUS != $self) {
1987 glColor 64/255, 64/255, 64/255;
1988 glLogicOp GL_AND;
1989 glEnable GL_COLOR_LOGIC_OP;
1990 glBegin GL_QUADS;
1991 glVertex 0, 0;
1992 glVertex 0, $::HEIGHT;
1993 glVertex $::WIDTH, $::HEIGHT;
1994 glVertex $::WIDTH, 0;
1995 glEnd;
1996 glDisable GL_COLOR_LOGIC_OP;
1997 }
1998}
1999
2000my %DIR = (
2001 SDLK_KP8, [1, "north"],
2002 SDLK_KP9, [2, "northeast"],
2003 SDLK_KP6, [3, "east"],
2004 SDLK_KP3, [4, "southeast"],
2005 SDLK_KP2, [5, "south"],
2006 SDLK_KP1, [6, "southwest"],
2007 SDLK_KP4, [7, "west"],
2008 SDLK_KP7, [8, "northwest"],
2009
2010 SDLK_UP, [1, "north"],
2011 SDLK_RIGHT, [3, "east"],
2012 SDLK_DOWN, [5, "south"],
2013 SDLK_LEFT, [7, "west"],
2014);
2015
2016sub key_down {
2017 my ($self, $ev) = @_;
2018
2019 my $mod = $ev->key_mod;
2020 my $sym = $ev->key_sym;
2021
2022 if ($sym == SDLK_KP5) {
2023 $::CONN->user_send ("stay fire");
2024 } elsif ($sym == SDLK_a) {
2025 $::CONN->user_send ("apply");
2026 } elsif ($sym == SDLK_QUOTE) {
2027 $self->emit ('activate_console');
2028 } elsif ($sym == SDLK_SLASH) {
2029 $self->emit ('activate_console' => '/');
2030 } elsif (exists $DIR{$sym}) {
2031 if ($mod & KMOD_SHIFT) {
2032 $self->{shft}++;
2033 $::CONN->user_send ("fire $DIR{$sym}[0]");
2034 } elsif ($mod & KMOD_CTRL) {
2035 $self->{ctrl}++;
2036 $::CONN->user_send ("run $DIR{$sym}[0]");
2037 } else {
2038 $::CONN->user_send ("$DIR{$sym}[1]");
2039 }
2040 }
2041}
2042
2043sub key_up {
2044 my ($self, $ev) = @_;
2045
2046 my $mod = $ev->key_mod;
2047 my $sym = $ev->key_sym;
2048
2049 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2050 $::CONN->user_send ("fire_stop");
2051 }
2052 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2053 $::CONN->user_send ("run_stop");
2054 }
2055}
2056
2057#############################################################################
2058
2059package CFClient::UI::Animator; 1910package CFClient::UI::Animator;
2060 1911
2061use SDL::OpenGL; 1912use CFClient::OpenGL;
2062 1913
2063our @ISA = CFClient::UI::Bin::; 1914our @ISA = CFClient::UI::Bin::;
2064 1915
2065sub moveto { 1916sub moveto {
2066 my ($self, $x, $y) = @_; 1917 my ($self, $x, $y) = @_;
… …
2139 1990
2140package CFClient::UI::Root; 1991package CFClient::UI::Root;
2141 1992
2142our @ISA = CFClient::UI::Container::; 1993our @ISA = CFClient::UI::Container::;
2143 1994
2144use SDL::OpenGL; 1995use CFClient::OpenGL;
2145 1996
2146sub check_size { 1997sub check_size {
2147 my ($self) = @_; 1998 my ($self) = @_;
2148 1999
2149 $self->configure (0, 0, $::WITH, $::HEIGHT); 2000 $self->configure (0, 0, $::WITH, $::HEIGHT);

Diff Legend

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