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.157 by root, Sun Apr 23 21:47:32 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_text ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show;
31 }
32
33 return;
34 }
35 }
36 }
37
38 $TOOLTIP->hide;
39 delete $TOOLTIP->{owner};
40}
14 41
15# class methods for events 42# class methods for events
16sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->key_down ($_[0]) if $FOCUS;
18} 45}
… …
21 $FOCUS->key_up ($_[0]) if $FOCUS; 48 $FOCUS->key_up ($_[0]) if $FOCUS;
22} 49}
23 50
24sub feed_sdl_button_down_event { 51sub feed_sdl_button_down_event {
25 my ($ev) = @_; 52 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 53 my ($x, $y) = ($ev->{x}, $ev->{y});
27 54
28 if (!$BUTTON_STATE) { 55 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 56 my $widget = $ROOT->find_widget ($x, $y);
30 57
31 $GRAB = $widget; 58 $GRAB = $widget;
32 $GRAB->update if $GRAB; 59 $GRAB->update if $GRAB;
33 }
34 60
61 check_tooltip;
62 }
63
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 64 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 65
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 67}
39 68
40sub feed_sdl_button_up_event { 69sub feed_sdl_button_up_event {
41 my ($ev) = @_; 70 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 71 my ($x, $y) = ($ev->{x}, $ev->{y});
43 72
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 73 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 74
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 76
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 78
50 if (!$BUTTON_STATE) { 79 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 80 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 81 $grab->update if $grab;
53 $GRAB->update if $GRAB; 82 $GRAB->update if $GRAB;
83
84 check_tooltip;
54 } 85 }
55} 86}
56 87
57sub feed_sdl_motion_event { 88sub feed_sdl_motion_event {
58 my ($ev) = @_; 89 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 90 my ($x, $y) = ($ev->{x}, $ev->{y});
60 91
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 92 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 93
63 if ($widget != $HOVER) { 94 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 95 my $hover = $HOVER; $HOVER = $widget;
65 96
66 $hover->update if $hover && $hover->{can_hover}; 97 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 98 $HOVER->update if $HOVER && $HOVER->{can_hover};
99
100 check_tooltip;
68 } 101 }
69 102
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71} 104}
72 105
… …
87 120
88package CFClient::UI::Base; 121package CFClient::UI::Base;
89 122
90use strict; 123use strict;
91 124
92use SDL::OpenGL; 125use CFClient::OpenGL;
93 126
94sub new { 127sub new {
95 my $class = shift; 128 my $class = shift;
96 129
97 my $self = bless { 130 my $self = bless {
98 x => 0, 131 x => 0,
99 y => 0, 132 y => 0,
100 z => 0, 133 z => 0,
101 w => -1, 134 can_events => 1,
102 h => -1,
103 @_ 135 @_
104 }, $class; 136 }, $class;
105 137
106 for (keys %$self) { 138 for (keys %$self) {
107 if (/^connect_(.*)$/) { 139 if (/^connect_(.*)$/) {
… …
110 } 142 }
111 143
112 $self 144 $self
113} 145}
114 146
147sub show {
148 my ($self) = @_;
149
150 return if $self->{parent};
151
152 $CFClient::UI::ROOT->add ($self);
153}
154
155sub hide {
156 my ($self) = @_;
157
158 return unless $self->{parent};
159
160 $self->{parent}->remove ($self);
161}
162
115sub move { 163sub move {
116 my ($self, $x, $y, $z) = @_; 164 my ($self, $x, $y, $z) = @_;
117 165
118 $self->{x} = int $x; 166 $self->{x} = int $x;
119 $self->{y} = int $y; 167 $self->{y} = int $y;
… …
126 0 174 0
127} 175}
128 176
129sub size_request { 177sub size_request {
130 require Carp; 178 require Carp;
131 Carp::confess "size_request is abtract"; 179 Carp::confess "size_request is abstract";
132} 180}
133 181
134sub configure { 182sub configure {
135 my ($self, $x, $y, $w, $h) = @_; 183 my ($self, $x, $y, $w, $h) = @_;
136 184
185 if ($self->{aspect}) {
186 my $w2 = List::Util::min $w, int $h * $self->{aspect};
187 my $h2 = List::Util::min $h, int $w / $self->{aspect};
188
189 # use alignment to adjust x, y
190
191 $x += int +($w - $w2) * 0.5;
192 $y += int +($h - $h2) * 0.5;
193
194 ($w, $h) = ($w2, $h2);
195 }
196
197 if ($self->{x} != $x || $self->{y} != $y) {
137 $self->{x} = $x; 198 $self->{x} = $x;
138 $self->{y} = $y; 199 $self->{y} = $y;
200 $self->update;
201 }
139 202
140 return unless $self->{w} != $w || $self->{h} != $h; 203 if ($self->{w} != $w || $self->{h} != $h) {
141
142 $self->{w} = $w; 204 $self->{w} = $w;
143 $self->{h} = $h; 205 $self->{h} = $h;
144 206
145 $self->size_allocate ($w, $h); 207 $self->size_allocate ($w, $h);
208 $self->update;
209 }
146} 210}
147 211
148sub size_allocate { 212sub size_allocate {
149 # nothing to be done 213 # nothing to be done
214}
215
216sub set_max_size {
217 my ($self, $w, $h) = @_;
218
219 delete $self->{max_w}; $self->{max_w} = $w if $w;
220 delete $self->{max_h}; $self->{max_h} = $h if $h;
150} 221}
151 222
152# return top left coordinates 223# return top left coordinates
153sub _topleft { 224sub _topleft {
154 my ($self, $x, $y) = @_; 225 my ($self, $x, $y) = @_;
… …
248} 319}
249 320
250sub find_widget { 321sub find_widget {
251 my ($self, $x, $y) = @_; 322 my ($self, $x, $y) = @_;
252 323
324 return () unless $self->{can_events};
325
253 return $self 326 return $self
254 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 327 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 328 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
256 329
257 () 330 ()
… …
264} 337}
265 338
266sub check_size { 339sub check_size {
267 my ($self) = @_; 340 my ($self) = @_;
268 341
342 return unless $self->{parent};
343
269 my ($w, $h) = $self->size_request; 344 my ($w, $h) = $self->size_request;
270 345
271 if ($w != $self->{req_w} || $h != $self->{req_h}) { 346 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w; 347 $self->{req_w} = $w;
273 $self->{req_h} = $h; 348 $self->{req_h} = $h;
274 349
275 $self->{parent}->check_size 350 $self->{parent}->check_size;
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 } 351 }
281} 352}
282 353
283sub update { 354sub update {
284 my ($self) = @_; 355 my ($self) = @_;
… …
312package CFClient::UI::DrawBG; 383package CFClient::UI::DrawBG;
313 384
314our @ISA = CFClient::UI::Base::; 385our @ISA = CFClient::UI::Base::;
315 386
316use strict; 387use strict;
317use SDL::OpenGL; 388use CFClient::OpenGL;
318 389
319sub new { 390sub new {
320 my $class = shift; 391 my $class = shift;
321 392
322 # range [value, low, high, page] 393 # range [value, low, high, page]
… …
351 422
352package CFClient::UI::Empty; 423package CFClient::UI::Empty;
353 424
354our @ISA = CFClient::UI::Base::; 425our @ISA = CFClient::UI::Base::;
355 426
427sub new {
428 my ($class, %arg) = @_;
429 $class->SUPER::new (can_events => 0, %arg);
430}
431
356sub size_request { 432sub size_request {
357 (0, 0) 433 (0, 0)
358} 434}
359 435
360sub draw { } 436sub draw { }
… …
368sub new { 444sub new {
369 my ($class, %arg) = @_; 445 my ($class, %arg) = @_;
370 446
371 my $children = delete $arg{children} || []; 447 my $children = delete $arg{children} || [];
372 448
373 my $self = $class->SUPER::new (children => [], %arg); 449 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
374 $self->add ($_) for @$children; 450 $self->add ($_) for @$children;
375 451
376 $self 452 $self
377} 453}
378 454
… …
386 $self->{children} = [ 462 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 463 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 464 @{$self->{children}}, $child
389 ]; 465 ];
390 466
391 $self->{w} = $self->{h} = -1;
392
393 $child->check_size; 467 $child->check_size;
394} 468}
395 469
396sub remove { 470sub remove {
397 my ($self, $widget) = @_; 471 my ($self, $child) = @_;
398 472
473 delete $child->{parent};
474
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 476
401 $self->check_size; 477 $self->check_size;
478 $self->update;
402} 479}
403 480
404sub find_widget { 481sub find_widget {
405 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
406 483
… …
436 513
437 $class->SUPER::new (children => [$child], %arg) 514 $class->SUPER::new (children => [$child], %arg)
438} 515}
439 516
440sub add { 517sub add {
441 my ($self, $widget) = @_; 518 my ($self, $child) = @_;
442 519
443 $self->{children} = []; 520 $self->{children} = [];
444 521
445 $self->SUPER::add ($widget); 522 $self->SUPER::add ($child);
446} 523}
447 524
448sub remove { 525sub remove {
449 my ($self, $widget) = @_; 526 my ($self, $widget) = @_;
450 527
… …
470 547
471package CFClient::UI::Window; 548package CFClient::UI::Window;
472 549
473our @ISA = CFClient::UI::Bin::; 550our @ISA = CFClient::UI::Bin::;
474 551
475use SDL::OpenGL; 552use CFClient::OpenGL;
476 553
477sub new { 554sub new {
478 my ($class, %arg) = @_; 555 my ($class, %arg) = @_;
479 556
480 my $self = $class->SUPER::new (%arg); 557 my $self = $class->SUPER::new (%arg);
… …
534sub new { die } 611sub new { die }
535 612
536sub size_request { 613sub size_request {
537 my ($self) = @_; 614 my ($self) = @_;
538 615
539 @$self{qw(child_w child_h)} = $self->child->size_request; 616 @$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)}); 617 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541 618
542 @$self{qw(child_w child_h)} 619 @$self{qw(child_w child_h)}
543} 620}
544 621
… …
553 630
554package CFClient::UI::Frame; 631package CFClient::UI::Frame;
555 632
556our @ISA = CFClient::UI::Bin::; 633our @ISA = CFClient::UI::Bin::;
557 634
558use SDL::OpenGL; 635use 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 636
606sub new { 637sub new {
607 my $class = shift; 638 my $class = shift;
608 639
609 # TODO: user_x, user_y, overwrite moveto?
610
611 $class->SUPER::new ( 640 my $self = $class->SUPER::new (
612 bg => [1, 1, 1, 1], 641 bg => [1, 1, 1, 1],
613 border_bg => [1, 1, 1, 1], 642 border_bg => [1, 1, 1, 1],
614 border => int $::FONTSIZE * 0.8, 643 border => 0.8,
615 @_ 644 @_
616 ) 645 );
646
647 $self
648}
649
650sub set_size {
651 my ($self, $w, $h) = @_;
652 $self->{req_w} = $w;
653 $self->{req_h} = $h;
654 $self->check_size;
617} 655}
618 656
619sub size_request { 657sub size_request {
620 my ($self) = @_; 658 my ($self) = @_;
621 659 ($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} 660}
631 661
632sub size_allocate { 662sub size_allocate {
633 my ($self, $w, $h) = @_; 663 my ($self, $w, $h) = @_;
664 $self->{w} = $w;
665 $self->{h} = $h;
666 $self->child->configure (0, 0, $w, $h);
667}
634 668
669sub _draw {
670 my ($self) = @_;
671
672 my ($w, $h) = ($self->{w}, $self->{h});
673
674 glEnable GL_BLEND;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676 glEnable GL_TEXTURE_2D;
677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
678
679# glBegin GL_QUADS;
680# glColor 0, 0, 0, 0;
681# glVertex 0 , 0;
682# glVertex 0 , $h;
683# glVertex $w, $h;
684# glVertex $w, 0;
685# glEnd;
686
687
688 $self->child->draw;
689 glDisable GL_BLEND;
690 glDisable GL_TEXTURE_2D;
691}
692
693#############################################################################
694
695package CFClient::UI::FancyFrame;
696
697our @ISA = CFClient::UI::Bin::;
698
699use CFClient::OpenGL;
700
701my @tex =
702 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
703 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
704
705sub new {
706 my $class = shift;
707
708 # TODO: user_x, user_y, overwrite moveto?
709
710 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1],
713 border => 0.8,
714 can_events => 1,
715 @_
716 );
717
718 $self->{title} &&= new CFClient::UI::Label
719 align => 0,
720 valign => 1,
721 text => $self->{title},
722 fontsize => 1;
723
724 $self
725}
726
727sub border {
728 int $_[0]{border} * $::FONTSIZE
729}
730
731sub size_request {
732 my ($self) = @_;
733
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735
736 my ($w, $h) = $self->SUPER::size_request;
737
738 (
739 $w + $self->border * 2,
740 $h + $self->border * 2,
741 )
742}
743
744sub size_allocate {
745 my ($self, $w, $h) = @_;
746
635 $h -= List::Util::max 0, $self->{border} * 2; 747 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 748 $w -= List::Util::max 0, $self->border * 2;
637 749
750 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
751 if $self->{title};
752
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 753 $self->child->configure ($self->border, $self->border, $w, $h);
639} 754}
640 755
641sub button_down { 756sub button_down {
642 my ($self, $ev, $x, $y) = @_; 757 my ($self, $ev, $x, $y) = @_;
643 758
759 my $border = $self->border;
760
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 761 if ($x < $self->{w} && $x >= $self->{w} - $border
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 762 && $y < $self->{h} && $y >= $self->{h} - $border) {
646 763
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 764 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 765 my ($bw, $bh) = ($self->{w}, $self->{h});
649 766
650 $self->{motion} = sub { 767 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 768 my ($ev, $x, $y) = @_;
652 769
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 770 ($x, $y) = ($ev->{x}, $ev->{y});
654 771
655 $self->{user_w} = $bw + $x - $ox; 772 $self->{user_w} = $bw + $x - $ox;
656 $self->{user_h} = $bh + $y - $oy; 773 $self->{user_h} = $bh + $y - $oy;
657 $self->check_size; 774 $self->check_size;
658 }; 775 };
659 776
660 } elsif ($x >= 0 && $x < $self->{w} 777 } elsif ($x >= 0 && $x < $self->{w}
661 && $y >= 0 && $y < $self->{border}) { 778 && $y >= 0 && $y < $border) {
662 779
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 780 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 781 my ($bx, $by) = ($self->{x}, $self->{y});
665 782
666 $self->{motion} = sub { 783 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 784 my ($ev, $x, $y) = @_;
668 785
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 786 ($x, $y) = ($ev->{x}, $ev->{y});
670 787
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 788 $self->move ($bx + $x - $ox, $by + $y - $oy);
672 $self->update; 789 $self->update;
673 }; 790 };
674 } 791 }
… …
695 glEnable GL_BLEND; 812 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 814 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 816
817 my $border = $self->border;
818
700 glColor @{ $self->{border_bg} }; 819 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 820 $tex[1]->draw_quad (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 821 $tex[3]->draw_quad (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 822 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 823 $tex[4]->draw_quad (0, $h - $border, $w, $border);
705 824
706 my $bg = $tex[0]; 825 my $bg = $tex[0];
707 826
708 # TODO: repeat texture not scale 827 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 828 my $rep_x = $cw / $bg->{w};
… …
712 glColor @{ $self->{bg} }; 831 glColor @{ $self->{bg} };
713 832
714 $bg->{s} = $rep_x; 833 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y; 834 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1; 835 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 836 $bg->draw_quad ($border, $border, $cw, $ch);
718 837
719 glDisable GL_TEXTURE_2D; 838 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 839 glDisable GL_BLEND;
721 840
841 $self->{title}->draw if $self->{title};
722 $self->child->draw; 842 $self->child->draw;
723} 843}
724 844
725############################################################################# 845#############################################################################
726 846
… …
728 848
729our @ISA = CFClient::UI::Base::; 849our @ISA = CFClient::UI::Base::;
730 850
731use List::Util qw(max sum); 851use List::Util qw(max sum);
732 852
733use SDL::OpenGL; 853use CFClient::OpenGL;
734 854
735sub new { 855sub new {
736 my $class = shift; 856 my $class = shift;
737 857
738 $class->SUPER::new ( 858 $class->SUPER::new (
… …
745 my ($self, $x, $y, $child) = @_; 865 my ($self, $x, $y, $child) = @_;
746 866
747 $child->set_parent ($self); 867 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 868 $self->{children}[$y][$x] = $child;
749 869
750 $self->{w} = $self->{h} = -1;
751
752 $child->check_size; 870 $child->check_size;
753} 871}
754 872
755# TODO: move to container class maybe? send childs a signal on removal? 873# TODO: move to container class maybe? send childs a signal on removal?
756sub clear { 874sub clear {
… …
770 or next; 888 or next;
771 889
772 for my $x (0 .. $#$row) { 890 for my $x (0 .. $#$row) {
773 my $widget = $row->[$x] 891 my $widget = $row->[$x]
774 or next; 892 or next;
775 my ($w, $h) = $widget->size_request; 893 my ($w, $h) = @$widget{qw(req_w req_h)};
776 894
777 $w[$x] = max $w[$x], $w; 895 $w[$x] = max $w[$x], $w;
778 $h[$y] = max $h[$y], $h; 896 $h[$y] = max $h[$y], $h;
779 } 897 }
780 } 898 }
… …
885 1003
886 ($h, $w) = ($w, $h); 1004 ($h, $w) = ($w, $h);
887 1005
888 my $children = $self->{children}; 1006 my $children = $self->{children};
889 1007
890 my @h = map +($_->size_request)[0], @$children; 1008 my @h = map $_->{req_w}, @$children;
891 1009
892 my $req_h = List::Util::sum @h; 1010 my $req_h = List::Util::sum @h;
893 1011
894 if ($req_h > $h) { 1012 if ($req_h > $h) {
895 # ah well, not enough space 1013 # ah well, not enough space
… …
943sub size_allocate { 1061sub size_allocate {
944 my ($self, $w, $h) = @_; 1062 my ($self, $w, $h) = @_;
945 1063
946 my $children = $self->{children}; 1064 my $children = $self->{children};
947 1065
948 my @h = map +($_->size_request)[1], @$children; 1066 my @h = map $_->{req_h}, @$children;
949 1067
950 my $req_h = List::Util::sum @h; 1068 my $req_h = List::Util::sum @h;
951 1069
952 if ($req_h > $h) { 1070 if ($req_h > $h) {
953 # ah well, not enough space 1071 # ah well, not enough space
… …
981 1099
982package CFClient::UI::Label; 1100package CFClient::UI::Label;
983 1101
984our @ISA = CFClient::UI::Base::; 1102our @ISA = CFClient::UI::Base::;
985 1103
986use SDL::OpenGL; 1104use CFClient::OpenGL;
987 1105
988sub new { 1106sub new {
989 my ($class, %arg) = @_; 1107 my ($class, %arg) = @_;
990 1108
991 my $self = $class->SUPER::new ( 1109 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1110 fg => [1, 1, 1],
1111 #font => default_font
993 fontsize => $::FONTSIZE, 1112 fontsize => 1,
994 text => "", 1113 text => "",
995 align => -1, 1114 align => -1,
996 valign => -1, 1115 valign => -1,
997 padding => 2, 1116 padding => 2,
998 layout => new CFClient::Layout, 1117 layout => new CFClient::Layout,
1118 can_events => 0,
999 %arg 1119 %arg
1000 ); 1120 );
1001 1121
1002 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1122 if (exists $self->{template}) {
1123 my $layout = new CFClient::Layout;
1124 $layout->set_text (delete $self->{template});
1125 $self->{template} = $layout;
1126 }
1003 1127
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1128 $self->set_text (delete $self->{text}) if exists $self->{text};
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006 1130
1007 $self 1131 $self
… …
1021 my ($self, $text) = @_; 1145 my ($self, $text) = @_;
1022 1146
1023 $self->{layout}->set_text ($text); 1147 $self->{layout}->set_text ($text);
1024 1148
1025 delete $self->{texture}; 1149 delete $self->{texture};
1150 $self->check_size;
1026 $self->update; 1151 $self->update;
1027} 1152}
1028 1153
1029sub set_markup { 1154sub set_markup {
1030 my ($self, $markup) = @_; 1155 my ($self, $markup) = @_;
1031 1156
1032 $self->{layout}->set_markup ($markup); 1157 $self->{layout}->set_markup ($markup);
1033 1158
1034 delete $self->{texture}; 1159 delete $self->{texture};
1160 $self->check_size;
1035 $self->update; 1161 $self->update;
1036} 1162}
1037 1163
1038sub size_request { 1164sub size_request {
1039 my ($self) = @_; 1165 my ($self) = @_;
1040 1166
1041 $self->{layout}->set_width; 1167 $self->{layout}->set_font ($self->{font}) if $self->{font};
1168 $self->{layout}->set_width ($self->{max_w} || -1);
1042 $self->{layout}->set_height ($self->{fontsize}); 1169 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1170
1044 my ($w, $h) = $self->{layout}->size; 1171 my ($w, $h) = $self->{layout}->size;
1172
1173 if (exists $self->{template}) {
1174 $self->{template}->set_font ($self->{font}) if $self->{font};
1175 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1176
1177 my ($w2, $h2) = $self->{template}->size;
1178
1179 $w = List::Util::max $w, $w2;
1180 $h = List::Util::max $h, $h2;
1181 }
1045 1182
1046 ( 1183 (
1047 $w + $self->{padding} * 2, 1184 $w + $self->{padding} * 2,
1048 $h + $self->{padding} * 2, 1185 $h + $self->{padding} * 2,
1049 ) 1186 )
… …
1053 my ($self, $w, $h) = @_; 1190 my ($self, $w, $h) = @_;
1054 1191
1055 delete $self->{texture}; 1192 delete $self->{texture};
1056} 1193}
1057 1194
1058sub update { 1195sub set_fontsize {
1059 my ($self) = @_; 1196 my ($self, $fontsize) = @_;
1060 1197
1198 $self->{fontsize} = $fontsize;
1061 delete $self->{texture}; 1199 delete $self->{texture};
1200 $self->check_size;
1062 $self->SUPER::update; 1201 $self->update;
1063} 1202}
1064 1203
1065sub _draw { 1204sub _draw {
1066 my ($self) = @_; 1205 my ($self) = @_;
1067 1206
1068 my $tex = $self->{texture} ||= do { 1207 my $tex = $self->{texture} ||= do {
1208 $self->{layout}->set_font ($self->{font}) if $self->{font};
1069 $self->{layout}->set_width ($self->{w}); 1209 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1210 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071 new_from_layout CFClient::Texture $self->{layout} 1211 new_from_layout CFClient::Texture $self->{layout}
1072 }; 1212 };
1073 1213
1074 glEnable GL_BLEND; 1214 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1215 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1100 1240
1101package CFClient::UI::EntryBase; 1241package CFClient::UI::EntryBase;
1102 1242
1103our @ISA = CFClient::UI::Label::; 1243our @ISA = CFClient::UI::Label::;
1104 1244
1105use SDL; 1245use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1246
1108sub new { 1247sub new {
1109 my $class = shift; 1248 my $class = shift;
1110 1249
1111 $class->SUPER::new ( 1250 $class->SUPER::new (
… …
1114 active_bg => [1, 1, 1, 0.5], 1253 active_bg => [1, 1, 1, 0.5],
1115 active_fg => [0, 0, 0], 1254 active_fg => [0, 0, 0],
1116 can_hover => 1, 1255 can_hover => 1,
1117 can_focus => 1, 1256 can_focus => 1,
1118 valign => 0, 1257 valign => 0,
1258 can_events => 1,
1119 @_ 1259 @_
1120 ) 1260 )
1121} 1261}
1122 1262
1123sub _set_text { 1263sub _set_text {
… …
1125 1265
1126 delete $self->{cur_h}; 1266 delete $self->{cur_h};
1127 1267
1128 return if $self->{text} eq $text; 1268 return if $self->{text} eq $text;
1129 1269
1270 delete $self->{texture};
1271
1130 $self->{last_activity} = $::NOW; 1272 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1273 $self->{text} = $text;
1132 1274
1133 $text =~ s/./*/g if $self->{hidden}; 1275 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1276 $self->{layout}->set_text ("$text ");
… …
1149} 1291}
1150 1292
1151sub size_allocate { 1293sub size_allocate {
1152 my ($self, $w, $h) = @_; 1294 my ($self, $w, $h) = @_;
1153 1295
1154 $self->_set_text ($self->{text}); 1296 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155} 1297}
1156 1298
1157sub set_text { 1299sub set_text {
1158 my ($self, $text) = @_; 1300 my ($self, $text) = @_;
1159 1301
… …
1163} 1305}
1164 1306
1165sub key_down { 1307sub key_down {
1166 my ($self, $ev) = @_; 1308 my ($self, $ev) = @_;
1167 1309
1168 my $mod = $ev->key_mod; 1310 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1311 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1312 my $uni = $ev->{unicode};
1172 1313
1173 my $text = $self->get_text; 1314 my $text = $self->get_text;
1174 1315
1175 if ($sym == SDLK_BACKSPACE) { 1316 if ($sym == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1317 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1318 } elsif ($sym == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1319 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1320 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1321 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1322 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1323 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1324 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1325 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1326 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1327 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1328 } elsif ($sym == 27) {
1188 $self->emit ('escape'); 1329 $self->emit ('escape');
1189 } elsif ($uni) { 1330 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1331 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1332 }
1192 1333
… …
1267 1408
1268package CFClient::UI::Entry; 1409package CFClient::UI::Entry;
1269 1410
1270our @ISA = CFClient::UI::EntryBase::; 1411our @ISA = CFClient::UI::EntryBase::;
1271 1412
1272use SDL; 1413use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1414
1275sub key_down { 1415sub key_down {
1276 my ($self, $ev) = @_; 1416 my ($self, $ev) = @_;
1277 1417
1278 my $sym = $ev->key_sym; 1418 my $sym = $ev->{sym};
1279 1419
1280 if ($sym == SDLK_RETURN) { 1420 if ($sym == 13) {
1281 $self->emit (activate => $self->get_text); 1421 $self->emit (activate => $self->get_text);
1282 $self->update; 1422 $self->update;
1283 1423
1284 } else { 1424 } else {
1285 $self->SUPER::key_down ($ev); 1425 $self->SUPER::key_down ($ev);
… …
1291 1431
1292package CFClient::UI::Button; 1432package CFClient::UI::Button;
1293 1433
1294our @ISA = CFClient::UI::Label::; 1434our @ISA = CFClient::UI::Label::;
1295 1435
1296use SDL; 1436use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1437
1299my @tex = 1438my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1439 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1440 qw(b1_button_active.png);
1302 1441
1303sub new { 1442sub new {
1304 my $class = shift; 1443 my $class = shift;
1305 1444
… …
1309 bg => [1, 1, 1, 0.2], 1448 bg => [1, 1, 1, 0.2],
1310 active_fg => [0, 0, 1], 1449 active_fg => [0, 0, 1],
1311 can_hover => 1, 1450 can_hover => 1,
1312 align => 0, 1451 align => 0,
1313 valign => 0, 1452 valign => 0,
1453 can_events => 1,
1314 @_ 1454 @_
1315 ) 1455 )
1316} 1456}
1317 1457
1318sub button_up { 1458sub button_up {
… …
1352package CFClient::UI::CheckBox; 1492package CFClient::UI::CheckBox;
1353 1493
1354our @ISA = CFClient::UI::DrawBG::; 1494our @ISA = CFClient::UI::DrawBG::;
1355 1495
1356my @tex = 1496my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1497 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1498 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359 1499
1360use SDL; 1500use CFClient::OpenGL;
1361use SDL::OpenGL;
1362 1501
1363sub new { 1502sub new {
1364 my $class = shift; 1503 my $class = shift;
1365 1504
1366 $class->SUPER::new ( 1505 $class->SUPER::new (
… …
1412 glDisable GL_BLEND; 1551 glDisable GL_BLEND;
1413} 1552}
1414 1553
1415############################################################################# 1554#############################################################################
1416 1555
1417package CFClient::UI::VGauge; 1556package CFClient::UI::Image;
1418 1557
1419our @ISA = CFClient::UI::Base::; 1558our @ISA = CFClient::UI::Base::;
1420 1559
1421use SDL::OpenGL; 1560use CFClient::OpenGL;
1561use Carp qw/confess/;
1422 1562
1423my %tex = ( 1563our %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 1564
1442# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new { 1565sub new {
1444 my $class = shift; 1566 my $class = shift;
1445 1567
1446 my $self = $class->SUPER::new (gauge => 'food', @_); 1568 my $self = $class->SUPER::new (can_events => 0, @_);
1569
1570 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1571
1572 $loaded_images{$self->{image}} ||=
1573 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1574
1575 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1576
1577 Scalar::Util::weaken $loaded_images{$self->{image}};
1578
1579 $self->{aspect} = $tex->{w} / $tex->{h};
1447 1580
1448 $self 1581 $self
1449} 1582}
1450 1583
1451sub size_request { 1584sub size_request {
1452 my ($self) = @_; 1585 my ($self) = @_;
1453 1586
1454 my $tex = $tex{$self->{gauge}}[0]; 1587 ($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} 1588}
1476 1589
1477sub _draw { 1590sub _draw {
1478 my ($self) = @_; 1591 my ($self) = @_;
1479 1592
1480 my $tex = $tex{$self->{gauge}}; 1593 my $tex = $self->{tex};
1481 1594
1482 my ($w, $h) = ($self->{w}, $self->{h}); 1595 my ($w, $h) = ($self->{w}, $self->{h});
1483 1596
1484 my $ycut = $self->{val} / ($self->{max_val} || 1); 1597 if ($self->{rot90}) {
1485 $ycut = 1 if $self->{val} > $self->{max_val}; 1598 glRotate 90, 0, 0, 1;
1599 glTranslate 0, -$self->{w}, 0;
1486 1600
1487 my $t1 = $tex->[0]; 1601 ($w, $h) = ($h, $w);
1488 my $t2 = $tex->[1]; 1602 }
1489 1603
1490 glEnable GL_BLEND; 1604 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1605 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1606 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1608
1609 $tex->draw_quad (0, 0, $w, $h);
1610
1611 glDisable GL_BLEND;
1612 glDisable GL_TEXTURE_2D;
1613}
1614
1615#############################################################################
1616
1617package CFClient::UI::VGauge;
1618
1619our @ISA = CFClient::UI::Base::;
1620
1621use CFClient::OpenGL;
1622
1623my %tex = (
1624 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ],
1628 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1631 ],
1632 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ],
1636 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1639 ],
1640);
1641
1642# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new {
1644 my $class = shift;
1645
1646 my $self = $class->SUPER::new (
1647 type => 'food',
1648 @_
1649 );
1650
1651 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1652
1653 $self
1654}
1655
1656sub size_request {
1657 my ($self) = @_;
1658
1659 #my $tex = $tex{$self->{type}}[0];
1660 #@$tex{qw(w h)}
1661 (0, 0)
1662}
1663
1664sub set_max {
1665 my ($self, $max) = @_;
1666
1667 $self->{max_val} = $max;
1668}
1669
1670sub set_value {
1671 my ($self, $val, $max) = @_;
1672
1673 $self->set_max ($max)
1674 if defined $max;
1675
1676 $max = $self->{max_val};
1677 $self->{val} = $val;
1678
1679 $self->update;
1680}
1681
1682sub _draw {
1683 my ($self) = @_;
1684
1685 my $tex = $tex{$self->{type}};
1686
1687 my ($w, $h) = ($self->{w}, $self->{h});
1688
1689 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1;
1691 glTranslate 0, -$self->{w}, 0;
1692
1693 ($w, $h) = ($h, $w);
1694 }
1695
1696 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698
1699 my $t1 = $tex->[0];
1700 my $t2 = $tex->[1];
1701
1702 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706
1495 my $h1 = $self->{h} - $ycut * $self->{h}; 1707 my $h1 = $self->{h} - $ycut * $self->{h};
1496 my $h2 = $ycut * $self->{h}; 1708 my $h2 = $ycut * $self->{h};
1497 1709
1498 my $yp = 0;
1499
1500 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1710 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS; 1711 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp; 1712 glTexCoord 0 , 0; glVertex 0 , 0;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1715 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506 glEnd; 1716 glEnd;
1507
1508 $yp += $h1;
1509 1717
1510 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1718 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS; 1719 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1514 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2; 1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1515 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1516 glEnd; 1724 glEnd;
1517 1725
1518 glDisable GL_BLEND; 1726 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1727 glDisable GL_TEXTURE_2D;
1520} 1728}
1521 1729
1522############################################################################# 1730#############################################################################
1523 1731
1732package CFClient::UI::Gauge;
1733
1734our @ISA = CFClient::UI::VBox::;
1735
1736sub new {
1737 my ($class, %arg) = @_;
1738
1739 my $self = $class->SUPER::new (
1740 tooltip => $arg{type},
1741 %arg,
1742 );
1743
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1);
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1);
1747
1748 $self
1749}
1750
1751sub set_fontsize {
1752 my ($self, $fsize) = @_;
1753
1754 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize);
1756}
1757
1758sub set_value {
1759 my ($self, $val, $max) = @_;
1760
1761 $self->set_max ($max)
1762 if defined $max;
1763
1764 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val);
1766}
1767
1768sub set_max {
1769 my ($self, $max) = @_;
1770
1771 $self->{gauge}->set_max ($max);
1772 $self->{max}->set_text ($max);
1773}
1774
1775#############################################################################
1776
1524package CFClient::UI::Slider; 1777package CFClient::UI::Slider;
1525 1778
1526use strict; 1779use strict;
1527 1780
1528use SDL::OpenGL; 1781use CFClient::OpenGL;
1529 1782
1530our @ISA = CFClient::UI::DrawBG::; 1783our @ISA = CFClient::UI::DrawBG::;
1531 1784
1532my @tex = 1785my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1786 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1543 # TODO: calculations are off 1796 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 1797 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 1798 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 1799 active_fg => [0, 0, 0],
1547 range => [0, 0, 100, 10], 1800 range => [0, 0, 100, 10],
1548 req_w => 40, 1801 req_w => 20,
1549 req_h => 13, 1802 req_h => 20,
1550 vertical => 0, 1803 vertical => 0,
1551 can_hover => 1, 1804 can_hover => 1,
1552 inner_pad => 5, 1805 inner_pad => 5,
1553 @_ 1806 @_
1554 ); 1807 );
… …
1658 1911
1659package CFClient::UI::TextView; 1912package CFClient::UI::TextView;
1660 1913
1661our @ISA = CFClient::UI::HBox::; 1914our @ISA = CFClient::UI::HBox::;
1662 1915
1663use SDL::OpenGL; 1916use CFClient::OpenGL;
1664 1917
1665sub new { 1918sub new {
1666 my $class = shift; 1919 my $class = shift;
1667 1920
1668 my $self = $class->SUPER::new ( 1921 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6,
1670 req_h => $::HEIGHT / 6,
1671 fontsize => $::FONTSIZE, 1922 fontsize => 1,
1923 #font => default_font
1672 @_, 1924 @_,
1673 1925
1674 layout => (new CFClient::Layout), 1926 layout => (new CFClient::Layout),
1675 par => [], 1927 par => [],
1676 height => 0, 1928 height => 0,
… …
1697sub text_height { 1949sub text_height {
1698 my ($self, $text) = @_; 1950 my ($self, $text) = @_;
1699 1951
1700 my $layout = $self->{layout}; 1952 my $layout = $self->{layout};
1701 1953
1702 $layout->set_height ($self->{fontsize}); 1954 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 1955 $layout->set_width ($self->{w});
1704 $layout->set_text ($text); 1956 $layout->set_text ($text);
1705 1957
1706 ($layout->size)[1] 1958 ($layout->size)[1]
1707} 1959}
… …
1711 1963
1712 $self->{need_reflow}++; 1964 $self->{need_reflow}++;
1713 $self->update; 1965 $self->update;
1714} 1966}
1715 1967
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate { 1968sub size_allocate {
1723 my ($self, $w, $h) = @_; 1969 my ($self, $w, $h) = @_;
1724 1970
1971 $self->SUPER::size_allocate ($w, $h);
1972
1973 $self->{layout}->set_font ($self->{font}) if $self->{font};
1725 $self->{layout}->set_height ($self->{fontsize}); 1974 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726 $self->{layout}->set_width ($self->{w}); 1975 $self->{layout}->set_width ($self->{children}[0]{w});
1727 1976
1728 $self->reflow; 1977 $self->reflow;
1729 $self->update;
1730} 1978}
1731 1979
1732sub add_paragraph { 1980sub add_paragraph {
1733 my ($self, $color, $text) = @_; 1981 my ($self, $color, $text) = @_;
1734 1982
… …
1782 my $y1 = $top + $self->{h}; 2030 my $y1 = $top + $self->{h};
1783 2031
1784 my $y = 0; 2032 my $y = 0;
1785 2033
1786 my $layout = $self->{layout}; 2034 my $layout = $self->{layout};
2035
2036 $layout->set_font ($self->{font}) if $self->{font};
1787 2037
1788 for my $par (@{$self->{par}}) { 2038 for my $par (@{$self->{par}}) {
1789 my $h = $par->[0]; 2039 my $h = $par->[0];
1790 2040
1791 if ($y0 < $y + $h && $y < $y1) { 2041 if ($y0 < $y + $h && $y < $y1) {
… …
1819 2069
1820} 2070}
1821 2071
1822############################################################################# 2072#############################################################################
1823 2073
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; 2074package CFClient::UI::Animator;
2061 2075
2062use SDL::OpenGL; 2076use CFClient::OpenGL;
2063 2077
2064our @ISA = CFClient::UI::Bin::; 2078our @ISA = CFClient::UI::Bin::;
2065 2079
2066sub moveto { 2080sub moveto {
2067 my ($self, $x, $y) = @_; 2081 my ($self, $x, $y) = @_;
… …
2107 my $class = shift; 2121 my $class = shift;
2108 2122
2109 my $self = $class->SUPER::new ( 2123 my $self = $class->SUPER::new (
2110 state => 0, 2124 state => 0,
2111 connect_activate => \&toggle_flopper, 2125 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2112 @_ 2127 @_
2113 ); 2128 );
2114 2129
2115 if ($self->{state}) { 2130 if ($self->{state}) {
2116 $self->{state} = 0; 2131 $self->{state} = 0;
… …
2136 $self->emit (changed => $self->{state}); 2151 $self->emit (changed => $self->{state});
2137} 2152}
2138 2153
2139############################################################################# 2154#############################################################################
2140 2155
2156package CFClient::UI::Tooltip;
2157
2158our @ISA = CFClient::UI::Bin::;
2159
2160use CFClient::OpenGL;
2161
2162sub new {
2163 my $class = shift;
2164
2165 $class->SUPER::new (
2166 @_,
2167 can_events => 0,
2168 )
2169}
2170
2171sub set_text {
2172 my ($self, $text) = @_;
2173
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2175 $self->{label}->set_text ($text);
2176 $self->add ($self->{label});
2177}
2178
2179sub size_request {
2180 my ($self) = @_;
2181
2182 $self->child->set_max_size ($::WIDTH * 0.2);
2183
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185
2186 ($w + 4, $h + 4)
2187}
2188
2189sub _draw {
2190 my ($self) = @_;
2191
2192 glPushMatrix;
2193 glTranslate 0.375, 0.375;
2194
2195 my ($w, $h) = @$self{qw(w h)};
2196
2197 glColor 1, 0.8, 0.4;
2198 glBegin GL_QUADS;
2199 glVertex 0 , 0;
2200 glVertex 0 , $h;
2201 glVertex $w, $h;
2202 glVertex $w, 0;
2203 glEnd;
2204
2205 glColor 0, 0, 0;
2206 glBegin GL_LINE_LOOP;
2207 glVertex 0 , 0;
2208 glVertex 0 , $h;
2209 glVertex $w, $h;
2210 glVertex $w, 0;
2211 glEnd;
2212
2213 glPopMatrix;
2214
2215 glTranslate 2, 2;
2216 $self->SUPER::_draw;
2217}
2218
2219#############################################################################
2220
2141package CFClient::UI::Root; 2221package CFClient::UI::Root;
2142 2222
2143our @ISA = CFClient::UI::Container::; 2223our @ISA = CFClient::UI::Container::;
2144 2224
2145use SDL::OpenGL; 2225use CFClient::OpenGL;
2146 2226
2147sub check_size { 2227sub check_size {
2148 my ($self) = @_; 2228 my ($self) = @_;
2149 2229
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 2230 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2151} 2231}
2152 2232
2153sub size_request { 2233sub size_request {
2154 ($::WIDTH, $::HEIGHT) 2234 ($::WIDTH, $::HEIGHT)
2155} 2235}
… …
2157sub configure { 2237sub configure {
2158 my ($self, $x, $y, $w, $h) = @_; 2238 my ($self, $x, $y, $w, $h) = @_;
2159 2239
2160 $self->SUPER::configure ($x, $y, $w, $h); 2240 $self->SUPER::configure ($x, $y, $w, $h);
2161 2241
2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2163 for @{$self->{children}}; 2242 for my $child (@{$self->{children}}) {
2243 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2244
2245 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2246 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2247 $child->configure ($X, $Y, $W,$H);
2248 }
2164} 2249}
2165 2250
2166sub _topleft { 2251sub _topleft {
2167 my ($self, $x, $y) = @_; 2252 my ($self, $x, $y) = @_;
2168 2253
… …
2176 ::refresh (); 2261 ::refresh ();
2177} 2262}
2178 2263
2179sub add { 2264sub add {
2180 my ($self, $child) = @_; 2265 my ($self, $child) = @_;
2266
2267 # integerize window positions
2268 $child->{x} = int $child->{x};
2269 $child->{y} = int $child->{y};
2181 2270
2182 $self->SUPER::add ($child); 2271 $self->SUPER::add ($child);
2183} 2272}
2184 2273
2185sub on_refresh { 2274sub on_refresh {
… …
2211############################################################################# 2300#############################################################################
2212 2301
2213package CFClient::UI; 2302package CFClient::UI;
2214 2303
2215$ROOT = new CFClient::UI::Root; 2304$ROOT = new CFClient::UI::Root;
2305$TOOLTIP = new CFClient::UI::Tooltip;
2216 2306
22171 23071
2218 2308

Diff Legend

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