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.155 by root, Sun Apr 23 02:22:54 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
150} 214}
… …
248} 312}
249 313
250sub find_widget { 314sub find_widget {
251 my ($self, $x, $y) = @_; 315 my ($self, $x, $y) = @_;
252 316
317 return () unless $self->{can_events};
318
253 return $self 319 return $self
254 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 320 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 321 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
256 322
257 () 323 ()
… …
264} 330}
265 331
266sub check_size { 332sub check_size {
267 my ($self) = @_; 333 my ($self) = @_;
268 334
335 return unless $self->{parent};
336
269 my ($w, $h) = $self->size_request; 337 my ($w, $h) = $self->size_request;
270 338
271 if ($w != $self->{req_w} || $h != $self->{req_h}) { 339 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w; 340 $self->{req_w} = $w;
273 $self->{req_h} = $h; 341 $self->{req_h} = $h;
274 342
275 $self->{parent}->check_size 343 $self->{parent}->check_size;
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 } 344 }
281} 345}
282 346
283sub update { 347sub update {
284 my ($self) = @_; 348 my ($self) = @_;
… …
312package CFClient::UI::DrawBG; 376package CFClient::UI::DrawBG;
313 377
314our @ISA = CFClient::UI::Base::; 378our @ISA = CFClient::UI::Base::;
315 379
316use strict; 380use strict;
317use SDL::OpenGL; 381use CFClient::OpenGL;
318 382
319sub new { 383sub new {
320 my $class = shift; 384 my $class = shift;
321 385
322 # range [value, low, high, page] 386 # range [value, low, high, page]
… …
351 415
352package CFClient::UI::Empty; 416package CFClient::UI::Empty;
353 417
354our @ISA = CFClient::UI::Base::; 418our @ISA = CFClient::UI::Base::;
355 419
420sub new {
421 my ($class, %arg) = @_;
422 $class->SUPER::new (can_events => 0, %arg);
423}
424
356sub size_request { 425sub size_request {
357 (0, 0) 426 (0, 0)
358} 427}
359 428
360sub draw { } 429sub draw { }
… …
368sub new { 437sub new {
369 my ($class, %arg) = @_; 438 my ($class, %arg) = @_;
370 439
371 my $children = delete $arg{children} || []; 440 my $children = delete $arg{children} || [];
372 441
373 my $self = $class->SUPER::new (children => [], %arg); 442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
374 $self->add ($_) for @$children; 443 $self->add ($_) for @$children;
375 444
376 $self 445 $self
377} 446}
378 447
… …
386 $self->{children} = [ 455 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 456 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 457 @{$self->{children}}, $child
389 ]; 458 ];
390 459
391 $self->{w} = $self->{h} = -1;
392
393 $child->check_size; 460 $child->check_size;
394} 461}
395 462
396sub remove { 463sub remove {
397 my ($self, $widget) = @_; 464 my ($self, $child) = @_;
398 465
466 delete $child->{parent};
467
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 469
401 $self->check_size; 470 $self->check_size;
471 $self->update;
402} 472}
403 473
404sub find_widget { 474sub find_widget {
405 my ($self, $x, $y) = @_; 475 my ($self, $x, $y) = @_;
406 476
… …
436 506
437 $class->SUPER::new (children => [$child], %arg) 507 $class->SUPER::new (children => [$child], %arg)
438} 508}
439 509
440sub add { 510sub add {
441 my ($self, $widget) = @_; 511 my ($self, $child) = @_;
442 512
443 $self->{children} = []; 513 $self->{children} = [];
444 514
445 $self->SUPER::add ($widget); 515 $self->SUPER::add ($child);
446} 516}
447 517
448sub remove { 518sub remove {
449 my ($self, $widget) = @_; 519 my ($self, $widget) = @_;
450 520
… …
470 540
471package CFClient::UI::Window; 541package CFClient::UI::Window;
472 542
473our @ISA = CFClient::UI::Bin::; 543our @ISA = CFClient::UI::Bin::;
474 544
475use SDL::OpenGL; 545use CFClient::OpenGL;
476 546
477sub new { 547sub new {
478 my ($class, %arg) = @_; 548 my ($class, %arg) = @_;
479 549
480 my $self = $class->SUPER::new (%arg); 550 my $self = $class->SUPER::new (%arg);
… …
534sub new { die } 604sub new { die }
535 605
536sub size_request { 606sub size_request {
537 my ($self) = @_; 607 my ($self) = @_;
538 608
539 @$self{qw(child_w child_h)} = $self->child->size_request; 609 @$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)}); 610 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541 611
542 @$self{qw(child_w child_h)} 612 @$self{qw(child_w child_h)}
543} 613}
544 614
… …
553 623
554package CFClient::UI::Frame; 624package CFClient::UI::Frame;
555 625
556our @ISA = CFClient::UI::Bin::; 626our @ISA = CFClient::UI::Bin::;
557 627
558use SDL::OpenGL; 628use 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 629
606sub new { 630sub new {
607 my $class = shift; 631 my $class = shift;
608 632
609 # TODO: user_x, user_y, overwrite moveto?
610
611 $class->SUPER::new ( 633 my $self = $class->SUPER::new (
612 bg => [1, 1, 1, 1], 634 bg => [1, 1, 1, 1],
613 border_bg => [1, 1, 1, 1], 635 border_bg => [1, 1, 1, 1],
614 border => int $::FONTSIZE * 0.8, 636 border => 0.8,
615 @_ 637 @_
616 ) 638 );
639
640 $self
641}
642
643sub set_size {
644 my ($self, $w, $h) = @_;
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
617} 648}
618 649
619sub size_request { 650sub size_request {
620 my ($self) = @_; 651 my ($self) = @_;
621 652 ($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} 653}
631 654
632sub size_allocate { 655sub size_allocate {
633 my ($self, $w, $h) = @_; 656 my ($self, $w, $h) = @_;
657 $self->{w} = $w;
658 $self->{h} = $h;
659 $self->child->configure (0, 0, $w, $h);
660}
634 661
662sub _draw {
663 my ($self) = @_;
664
665 my ($w, $h) = ($self->{w}, $self->{h});
666
667 glEnable GL_BLEND;
668 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
669 glEnable GL_TEXTURE_2D;
670 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
671
672# glBegin GL_QUADS;
673# glColor 0, 0, 0, 0;
674# glVertex 0 , 0;
675# glVertex 0 , $h;
676# glVertex $w, $h;
677# glVertex $w, 0;
678# glEnd;
679
680
681 $self->child->draw;
682 glDisable GL_BLEND;
683 glDisable GL_TEXTURE_2D;
684}
685
686#############################################################################
687
688package CFClient::UI::FancyFrame;
689
690our @ISA = CFClient::UI::Bin::;
691
692use CFClient::OpenGL;
693
694my @tex =
695 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
696 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
697
698sub new {
699 my $class = shift;
700
701 # TODO: user_x, user_y, overwrite moveto?
702
703 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1],
706 border => 0.8,
707 can_events => 1,
708 @_
709 );
710
711 $self->{title} &&= new CFClient::UI::Label
712 align => 0,
713 valign => 1,
714 text => $self->{title},
715 fontsize => 1;
716
717 $self
718}
719
720sub border {
721 int $_[0]{border} * $::FONTSIZE
722}
723
724sub size_request {
725 my ($self) = @_;
726
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728
729 my ($w, $h) = $self->SUPER::size_request;
730
731 (
732 $w + $self->border * 2,
733 $h + $self->border * 2,
734 )
735}
736
737sub size_allocate {
738 my ($self, $w, $h) = @_;
739
635 $h -= List::Util::max 0, $self->{border} * 2; 740 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 741 $w -= List::Util::max 0, $self->border * 2;
637 742
743 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
744 if $self->{title};
745
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 746 $self->child->configure ($self->border, $self->border, $w, $h);
639} 747}
640 748
641sub button_down { 749sub button_down {
642 my ($self, $ev, $x, $y) = @_; 750 my ($self, $ev, $x, $y) = @_;
643 751
752 my $border = $self->border;
753
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 754 if ($x < $self->{w} && $x >= $self->{w} - $border
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 755 && $y < $self->{h} && $y >= $self->{h} - $border) {
646 756
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 757 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 758 my ($bw, $bh) = ($self->{w}, $self->{h});
649 759
650 $self->{motion} = sub { 760 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 761 my ($ev, $x, $y) = @_;
652 762
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 763 ($x, $y) = ($ev->{x}, $ev->{y});
654 764
655 $self->{user_w} = $bw + $x - $ox; 765 $self->{user_w} = $bw + $x - $ox;
656 $self->{user_h} = $bh + $y - $oy; 766 $self->{user_h} = $bh + $y - $oy;
657 $self->check_size; 767 $self->check_size;
658 }; 768 };
659 769
660 } elsif ($x >= 0 && $x < $self->{w} 770 } elsif ($x >= 0 && $x < $self->{w}
661 && $y >= 0 && $y < $self->{border}) { 771 && $y >= 0 && $y < $border) {
662 772
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 773 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 774 my ($bx, $by) = ($self->{x}, $self->{y});
665 775
666 $self->{motion} = sub { 776 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 777 my ($ev, $x, $y) = @_;
668 778
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 779 ($x, $y) = ($ev->{x}, $ev->{y});
670 780
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 781 $self->move ($bx + $x - $ox, $by + $y - $oy);
672 $self->update; 782 $self->update;
673 }; 783 };
674 } 784 }
… …
695 glEnable GL_BLEND; 805 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 807 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 809
810 my $border = $self->border;
811
700 glColor @{ $self->{border_bg} }; 812 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 813 $tex[1]->draw_quad (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 814 $tex[3]->draw_quad (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 816 $tex[4]->draw_quad (0, $h - $border, $w, $border);
705 817
706 my $bg = $tex[0]; 818 my $bg = $tex[0];
707 819
708 # TODO: repeat texture not scale 820 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 821 my $rep_x = $cw / $bg->{w};
… …
712 glColor @{ $self->{bg} }; 824 glColor @{ $self->{bg} };
713 825
714 $bg->{s} = $rep_x; 826 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y; 827 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1; 828 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 829 $bg->draw_quad ($border, $border, $cw, $ch);
718 830
719 glDisable GL_TEXTURE_2D; 831 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 832 glDisable GL_BLEND;
721 833
834 $self->{title}->draw if $self->{title};
722 $self->child->draw; 835 $self->child->draw;
723} 836}
724 837
725############################################################################# 838#############################################################################
726 839
… …
728 841
729our @ISA = CFClient::UI::Base::; 842our @ISA = CFClient::UI::Base::;
730 843
731use List::Util qw(max sum); 844use List::Util qw(max sum);
732 845
733use SDL::OpenGL; 846use CFClient::OpenGL;
734 847
735sub new { 848sub new {
736 my $class = shift; 849 my $class = shift;
737 850
738 $class->SUPER::new ( 851 $class->SUPER::new (
… …
745 my ($self, $x, $y, $child) = @_; 858 my ($self, $x, $y, $child) = @_;
746 859
747 $child->set_parent ($self); 860 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 861 $self->{children}[$y][$x] = $child;
749 862
750 $self->{w} = $self->{h} = -1;
751
752 $child->check_size; 863 $child->check_size;
753} 864}
754 865
755# TODO: move to container class maybe? send childs a signal on removal? 866# TODO: move to container class maybe? send childs a signal on removal?
756sub clear { 867sub clear {
… …
770 or next; 881 or next;
771 882
772 for my $x (0 .. $#$row) { 883 for my $x (0 .. $#$row) {
773 my $widget = $row->[$x] 884 my $widget = $row->[$x]
774 or next; 885 or next;
775 my ($w, $h) = $widget->size_request; 886 my ($w, $h) = @$widget{qw(req_w req_h)};
776 887
777 $w[$x] = max $w[$x], $w; 888 $w[$x] = max $w[$x], $w;
778 $h[$y] = max $h[$y], $h; 889 $h[$y] = max $h[$y], $h;
779 } 890 }
780 } 891 }
… …
885 996
886 ($h, $w) = ($w, $h); 997 ($h, $w) = ($w, $h);
887 998
888 my $children = $self->{children}; 999 my $children = $self->{children};
889 1000
890 my @h = map +($_->size_request)[0], @$children; 1001 my @h = map $_->{req_w}, @$children;
891 1002
892 my $req_h = List::Util::sum @h; 1003 my $req_h = List::Util::sum @h;
893 1004
894 if ($req_h > $h) { 1005 if ($req_h > $h) {
895 # ah well, not enough space 1006 # ah well, not enough space
… …
943sub size_allocate { 1054sub size_allocate {
944 my ($self, $w, $h) = @_; 1055 my ($self, $w, $h) = @_;
945 1056
946 my $children = $self->{children}; 1057 my $children = $self->{children};
947 1058
948 my @h = map +($_->size_request)[1], @$children; 1059 my @h = map $_->{req_h}, @$children;
949 1060
950 my $req_h = List::Util::sum @h; 1061 my $req_h = List::Util::sum @h;
951 1062
952 if ($req_h > $h) { 1063 if ($req_h > $h) {
953 # ah well, not enough space 1064 # ah well, not enough space
… …
981 1092
982package CFClient::UI::Label; 1093package CFClient::UI::Label;
983 1094
984our @ISA = CFClient::UI::Base::; 1095our @ISA = CFClient::UI::Base::;
985 1096
986use SDL::OpenGL; 1097use CFClient::OpenGL;
987 1098
988sub new { 1099sub new {
989 my ($class, %arg) = @_; 1100 my ($class, %arg) = @_;
990 1101
991 my $self = $class->SUPER::new ( 1102 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1103 fg => [1, 1, 1],
993 fontsize => $::FONTSIZE, 1104 fontsize => 1,
994 text => "", 1105 text => "",
995 align => -1, 1106 align => -1,
996 valign => -1, 1107 valign => -1,
997 padding => 2, 1108 padding => 2,
998 layout => new CFClient::Layout, 1109 layout => new CFClient::Layout,
1110 can_events => 0,
999 %arg 1111 %arg
1000 ); 1112 );
1001 1113
1002 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1114 if (exists $self->{template}) {
1115 my $layout = new CFClient::Layout;
1116 $layout->set_text (delete $self->{template});
1117 $self->{template} = $layout;
1118 }
1003 1119
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1120 $self->set_text (delete $self->{text}) if exists $self->{text};
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006 1122
1007 $self 1123 $self
… …
1021 my ($self, $text) = @_; 1137 my ($self, $text) = @_;
1022 1138
1023 $self->{layout}->set_text ($text); 1139 $self->{layout}->set_text ($text);
1024 1140
1025 delete $self->{texture}; 1141 delete $self->{texture};
1142 $self->check_size;
1026 $self->update; 1143 $self->update;
1027} 1144}
1028 1145
1029sub set_markup { 1146sub set_markup {
1030 my ($self, $markup) = @_; 1147 my ($self, $markup) = @_;
1031 1148
1032 $self->{layout}->set_markup ($markup); 1149 $self->{layout}->set_markup ($markup);
1033 1150
1034 delete $self->{texture}; 1151 delete $self->{texture};
1152 $self->check_size;
1035 $self->update; 1153 $self->update;
1036} 1154}
1037 1155
1038sub size_request { 1156sub size_request {
1039 my ($self) = @_; 1157 my ($self) = @_;
1040 1158
1041 $self->{layout}->set_width; 1159 $self->{layout}->set_width;
1042 $self->{layout}->set_height ($self->{fontsize}); 1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1161
1044 my ($w, $h) = $self->{layout}->size; 1162 my ($w, $h) = $self->{layout}->size;
1163
1164 if (exists $self->{template}) {
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166
1167 my ($w2, $h2) = $self->{template}->size;
1168
1169 $w = List::Util::max $w, $w2;
1170 $h = List::Util::max $h, $h2;
1171 }
1045 1172
1046 ( 1173 (
1047 $w + $self->{padding} * 2, 1174 $w + $self->{padding} * 2,
1048 $h + $self->{padding} * 2, 1175 $h + $self->{padding} * 2,
1049 ) 1176 )
… …
1053 my ($self, $w, $h) = @_; 1180 my ($self, $w, $h) = @_;
1054 1181
1055 delete $self->{texture}; 1182 delete $self->{texture};
1056} 1183}
1057 1184
1058sub update { 1185sub set_fontsize {
1059 my ($self) = @_; 1186 my ($self, $fontsize) = @_;
1060 1187
1188 $self->{fontsize} = $fontsize;
1061 delete $self->{texture}; 1189 delete $self->{texture};
1190 $self->check_size;
1062 $self->SUPER::update; 1191 $self->update;
1063} 1192}
1064 1193
1065sub _draw { 1194sub _draw {
1066 my ($self) = @_; 1195 my ($self) = @_;
1067 1196
1068 my $tex = $self->{texture} ||= do { 1197 my $tex = $self->{texture} ||= do {
1069 $self->{layout}->set_width ($self->{w}); 1198 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071 new_from_layout CFClient::Texture $self->{layout} 1200 new_from_layout CFClient::Texture $self->{layout}
1072 }; 1201 };
1073 1202
1074 glEnable GL_BLEND; 1203 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1100 1229
1101package CFClient::UI::EntryBase; 1230package CFClient::UI::EntryBase;
1102 1231
1103our @ISA = CFClient::UI::Label::; 1232our @ISA = CFClient::UI::Label::;
1104 1233
1105use SDL; 1234use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1235
1108sub new { 1236sub new {
1109 my $class = shift; 1237 my $class = shift;
1110 1238
1111 $class->SUPER::new ( 1239 $class->SUPER::new (
… …
1114 active_bg => [1, 1, 1, 0.5], 1242 active_bg => [1, 1, 1, 0.5],
1115 active_fg => [0, 0, 0], 1243 active_fg => [0, 0, 0],
1116 can_hover => 1, 1244 can_hover => 1,
1117 can_focus => 1, 1245 can_focus => 1,
1118 valign => 0, 1246 valign => 0,
1247 can_events => 1,
1119 @_ 1248 @_
1120 ) 1249 )
1121} 1250}
1122 1251
1123sub _set_text { 1252sub _set_text {
… …
1125 1254
1126 delete $self->{cur_h}; 1255 delete $self->{cur_h};
1127 1256
1128 return if $self->{text} eq $text; 1257 return if $self->{text} eq $text;
1129 1258
1259 delete $self->{texture};
1260
1130 $self->{last_activity} = $::NOW; 1261 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1262 $self->{text} = $text;
1132 1263
1133 $text =~ s/./*/g if $self->{hidden}; 1264 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1265 $self->{layout}->set_text ("$text ");
… …
1149} 1280}
1150 1281
1151sub size_allocate { 1282sub size_allocate {
1152 my ($self, $w, $h) = @_; 1283 my ($self, $w, $h) = @_;
1153 1284
1154 $self->_set_text ($self->{text}); 1285 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155} 1286}
1156 1287
1157sub set_text { 1288sub set_text {
1158 my ($self, $text) = @_; 1289 my ($self, $text) = @_;
1159 1290
… …
1163} 1294}
1164 1295
1165sub key_down { 1296sub key_down {
1166 my ($self, $ev) = @_; 1297 my ($self, $ev) = @_;
1167 1298
1168 my $mod = $ev->key_mod; 1299 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1300 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1301 my $uni = $ev->{unicode};
1172 1302
1173 my $text = $self->get_text; 1303 my $text = $self->get_text;
1174 1304
1175 if ($sym == SDLK_BACKSPACE) { 1305 if ($sym == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1306 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1307 } elsif ($sym == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1308 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1309 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1310 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1311 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1312 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1313 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1314 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1315 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1316 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1317 } elsif ($sym == 27) {
1188 $self->emit ('escape'); 1318 $self->emit ('escape');
1189 } elsif ($uni) { 1319 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1320 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1321 }
1192 1322
… …
1267 1397
1268package CFClient::UI::Entry; 1398package CFClient::UI::Entry;
1269 1399
1270our @ISA = CFClient::UI::EntryBase::; 1400our @ISA = CFClient::UI::EntryBase::;
1271 1401
1272use SDL; 1402use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1403
1275sub key_down { 1404sub key_down {
1276 my ($self, $ev) = @_; 1405 my ($self, $ev) = @_;
1277 1406
1278 my $sym = $ev->key_sym; 1407 my $sym = $ev->{sym};
1279 1408
1280 if ($sym == SDLK_RETURN) { 1409 if ($sym == 13) {
1281 $self->emit (activate => $self->get_text); 1410 $self->emit (activate => $self->get_text);
1282 $self->update; 1411 $self->update;
1283 1412
1284 } else { 1413 } else {
1285 $self->SUPER::key_down ($ev); 1414 $self->SUPER::key_down ($ev);
… …
1291 1420
1292package CFClient::UI::Button; 1421package CFClient::UI::Button;
1293 1422
1294our @ISA = CFClient::UI::Label::; 1423our @ISA = CFClient::UI::Label::;
1295 1424
1296use SDL; 1425use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1426
1299my @tex = 1427my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1428 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1429 qw(b1_button_active.png);
1302 1430
1303sub new { 1431sub new {
1304 my $class = shift; 1432 my $class = shift;
1305 1433
… …
1309 bg => [1, 1, 1, 0.2], 1437 bg => [1, 1, 1, 0.2],
1310 active_fg => [0, 0, 1], 1438 active_fg => [0, 0, 1],
1311 can_hover => 1, 1439 can_hover => 1,
1312 align => 0, 1440 align => 0,
1313 valign => 0, 1441 valign => 0,
1442 can_events => 1,
1314 @_ 1443 @_
1315 ) 1444 )
1316} 1445}
1317 1446
1318sub button_up { 1447sub button_up {
… …
1352package CFClient::UI::CheckBox; 1481package CFClient::UI::CheckBox;
1353 1482
1354our @ISA = CFClient::UI::DrawBG::; 1483our @ISA = CFClient::UI::DrawBG::;
1355 1484
1356my @tex = 1485my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1486 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1487 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359 1488
1360use SDL; 1489use CFClient::OpenGL;
1361use SDL::OpenGL;
1362 1490
1363sub new { 1491sub new {
1364 my $class = shift; 1492 my $class = shift;
1365 1493
1366 $class->SUPER::new ( 1494 $class->SUPER::new (
… …
1412 glDisable GL_BLEND; 1540 glDisable GL_BLEND;
1413} 1541}
1414 1542
1415############################################################################# 1543#############################################################################
1416 1544
1417package CFClient::UI::VGauge; 1545package CFClient::UI::Image;
1418 1546
1419our @ISA = CFClient::UI::Base::; 1547our @ISA = CFClient::UI::Base::;
1420 1548
1421use SDL::OpenGL; 1549use CFClient::OpenGL;
1550use Carp qw/confess/;
1422 1551
1423my %tex = ( 1552our %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 1553
1442# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new { 1554sub new {
1444 my $class = shift; 1555 my $class = shift;
1445 1556
1446 my $self = $class->SUPER::new (gauge => 'food', @_); 1557 my $self = $class->SUPER::new (can_events => 0, @_);
1558
1559 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1560
1561 $loaded_images{$self->{image}} ||=
1562 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1563
1564 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1565
1566 Scalar::Util::weaken $loaded_images{$self->{image}};
1567
1568 $self->{aspect} = $tex->{w} / $tex->{h};
1447 1569
1448 $self 1570 $self
1449} 1571}
1450 1572
1451sub size_request { 1573sub size_request {
1452 my ($self) = @_; 1574 my ($self) = @_;
1453 1575
1454 my $tex = $tex{$self->{gauge}}[0]; 1576 ($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} 1577}
1476 1578
1477sub _draw { 1579sub _draw {
1478 my ($self) = @_; 1580 my ($self) = @_;
1479 1581
1480 my $tex = $tex{$self->{gauge}}; 1582 my $tex = $self->{tex};
1481 1583
1482 my ($w, $h) = ($self->{w}, $self->{h}); 1584 my ($w, $h) = ($self->{w}, $self->{h});
1483 1585
1484 my $ycut = $self->{val} / ($self->{max_val} || 1); 1586 if ($self->{rot90}) {
1485 $ycut = 1 if $self->{val} > $self->{max_val}; 1587 glRotate 90, 0, 0, 1;
1588 glTranslate 0, -$self->{w}, 0;
1486 1589
1487 my $t1 = $tex->[0]; 1590 ($w, $h) = ($h, $w);
1488 my $t2 = $tex->[1]; 1591 }
1489 1592
1490 glEnable GL_BLEND; 1593 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1595 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1597
1598 $tex->draw_quad (0, 0, $w, $h);
1599
1600 glDisable GL_BLEND;
1601 glDisable GL_TEXTURE_2D;
1602}
1603
1604#############################################################################
1605
1606package CFClient::UI::VGauge;
1607
1608our @ISA = CFClient::UI::Base::;
1609
1610use CFClient::OpenGL;
1611
1612my %tex = (
1613 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ],
1617 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1620 ],
1621 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ],
1625 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1628 ],
1629);
1630
1631# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new {
1633 my $class = shift;
1634
1635 my $self = $class->SUPER::new (
1636 type => 'food',
1637 @_
1638 );
1639
1640 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1641
1642 $self
1643}
1644
1645sub size_request {
1646 my ($self) = @_;
1647
1648 #my $tex = $tex{$self->{type}}[0];
1649 #@$tex{qw(w h)}
1650 (0, 0)
1651}
1652
1653sub set_max {
1654 my ($self, $max) = @_;
1655
1656 $self->{max_val} = $max;
1657}
1658
1659sub set_value {
1660 my ($self, $val, $max) = @_;
1661
1662 $self->set_max ($max)
1663 if defined $max;
1664
1665 $max = $self->{max_val};
1666 $self->{val} = $val;
1667
1668 $self->update;
1669}
1670
1671sub _draw {
1672 my ($self) = @_;
1673
1674 my $tex = $tex{$self->{type}};
1675
1676 my ($w, $h) = ($self->{w}, $self->{h});
1677
1678 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1;
1680 glTranslate 0, -$self->{w}, 0;
1681
1682 ($w, $h) = ($h, $w);
1683 }
1684
1685 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687
1688 my $t1 = $tex->[0];
1689 my $t2 = $tex->[1];
1690
1691 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695
1495 my $h1 = $self->{h} - $ycut * $self->{h}; 1696 my $h1 = $self->{h} - $ycut * $self->{h};
1496 my $h2 = $ycut * $self->{h}; 1697 my $h2 = $ycut * $self->{h};
1497 1698
1498 my $yp = 0;
1499
1500 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1699 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS; 1700 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp; 1701 glTexCoord 0 , 0; glVertex 0 , 0;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1704 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506 glEnd; 1705 glEnd;
1507
1508 $yp += $h1;
1509 1706
1510 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1707 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS; 1708 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1514 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2; 1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1515 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1516 glEnd; 1713 glEnd;
1517 1714
1518 glDisable GL_BLEND; 1715 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1716 glDisable GL_TEXTURE_2D;
1520} 1717}
1521 1718
1522############################################################################# 1719#############################################################################
1523 1720
1721package CFClient::UI::Gauge;
1722
1723our @ISA = CFClient::UI::VBox::;
1724
1725sub new {
1726 my ($class, %arg) = @_;
1727
1728 my $self = $class->SUPER::new (
1729 tooltip => $arg{type},
1730 %arg,
1731 );
1732
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1734 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1735 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736
1737 $self
1738}
1739
1740sub set_fontsize {
1741 my ($self, $fsize) = @_;
1742
1743 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize);
1745}
1746
1747sub set_value {
1748 my ($self, $val, $max) = @_;
1749
1750 $self->set_max ($max)
1751 if defined $max;
1752
1753 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762}
1763
1764#############################################################################
1765
1524package CFClient::UI::Slider; 1766package CFClient::UI::Slider;
1525 1767
1526use strict; 1768use strict;
1527 1769
1528use SDL::OpenGL; 1770use CFClient::OpenGL;
1529 1771
1530our @ISA = CFClient::UI::DrawBG::; 1772our @ISA = CFClient::UI::DrawBG::;
1531 1773
1532my @tex = 1774my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1775 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1543 # TODO: calculations are off 1785 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 1786 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 1787 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 1788 active_fg => [0, 0, 0],
1547 range => [0, 0, 100, 10], 1789 range => [0, 0, 100, 10],
1548 req_w => 40, 1790 req_w => 20,
1549 req_h => 13, 1791 req_h => 20,
1550 vertical => 0, 1792 vertical => 0,
1551 can_hover => 1, 1793 can_hover => 1,
1552 inner_pad => 5, 1794 inner_pad => 5,
1553 @_ 1795 @_
1554 ); 1796 );
… …
1658 1900
1659package CFClient::UI::TextView; 1901package CFClient::UI::TextView;
1660 1902
1661our @ISA = CFClient::UI::HBox::; 1903our @ISA = CFClient::UI::HBox::;
1662 1904
1663use SDL::OpenGL; 1905use CFClient::OpenGL;
1664 1906
1665sub new { 1907sub new {
1666 my $class = shift; 1908 my $class = shift;
1667 1909
1668 my $self = $class->SUPER::new ( 1910 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6,
1670 req_h => $::HEIGHT / 6,
1671 fontsize => $::FONTSIZE, 1911 fontsize => 1,
1672 @_, 1912 @_,
1673 1913
1674 layout => (new CFClient::Layout), 1914 layout => (new CFClient::Layout),
1675 par => [], 1915 par => [],
1676 height => 0, 1916 height => 0,
… …
1697sub text_height { 1937sub text_height {
1698 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1699 1939
1700 my $layout = $self->{layout}; 1940 my $layout = $self->{layout};
1701 1941
1702 $layout->set_height ($self->{fontsize}); 1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 1943 $layout->set_width ($self->{w});
1704 $layout->set_text ($text); 1944 $layout->set_text ($text);
1705 1945
1706 ($layout->size)[1] 1946 ($layout->size)[1]
1707} 1947}
… …
1711 1951
1712 $self->{need_reflow}++; 1952 $self->{need_reflow}++;
1713 $self->update; 1953 $self->update;
1714} 1954}
1715 1955
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate { 1956sub size_allocate {
1723 my ($self, $w, $h) = @_; 1957 my ($self, $w, $h) = @_;
1724 1958
1959 $self->SUPER::size_allocate ($w, $h);
1960
1725 $self->{layout}->set_height ($self->{fontsize}); 1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726 $self->{layout}->set_width ($self->{w}); 1962 $self->{layout}->set_width ($self->{children}[0]{w});
1727 1963
1728 $self->reflow; 1964 $self->reflow;
1729 $self->update;
1730} 1965}
1731 1966
1732sub add_paragraph { 1967sub add_paragraph {
1733 my ($self, $color, $text) = @_; 1968 my ($self, $color, $text) = @_;
1734 1969
… …
1819 2054
1820} 2055}
1821 2056
1822############################################################################# 2057#############################################################################
1823 2058
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; 2059package CFClient::UI::Animator;
2061 2060
2062use SDL::OpenGL; 2061use CFClient::OpenGL;
2063 2062
2064our @ISA = CFClient::UI::Bin::; 2063our @ISA = CFClient::UI::Bin::;
2065 2064
2066sub moveto { 2065sub moveto {
2067 my ($self, $x, $y) = @_; 2066 my ($self, $x, $y) = @_;
… …
2107 my $class = shift; 2106 my $class = shift;
2108 2107
2109 my $self = $class->SUPER::new ( 2108 my $self = $class->SUPER::new (
2110 state => 0, 2109 state => 0,
2111 connect_activate => \&toggle_flopper, 2110 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2112 @_
2113 ); 2113 );
2114 2114
2115 if ($self->{state}) { 2115 if ($self->{state}) {
2116 $self->{state} = 0; 2116 $self->{state} = 0;
… …
2136 $self->emit (changed => $self->{state}); 2136 $self->emit (changed => $self->{state});
2137} 2137}
2138 2138
2139############################################################################# 2139#############################################################################
2140 2140
2141package CFClient::UI::Tooltip;
2142
2143our @ISA = CFClient::UI::Bin::;
2144
2145use CFClient::OpenGL;
2146
2147sub new {
2148 my $class = shift;
2149
2150 $class->SUPER::new (
2151 @_,
2152 can_events => 0,
2153 )
2154}
2155
2156sub set_text {
2157 my ($self, $text) = @_;
2158
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2160 $self->{label}->set_text ($text);
2161 $self->add ($self->{label});
2162}
2163
2164sub size_request {
2165 my ($self) = @_;
2166
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4)
2173}
2174
2175sub _draw {
2176 my ($self) = @_;
2177
2178 glPushMatrix;
2179 glTranslate 0.375, 0.375;
2180
2181 my ($w, $h) = @$self{qw(w h)};
2182
2183 glColor 1, 0.8, 0.4;
2184 glBegin GL_QUADS;
2185 glVertex 0 , 0;
2186 glVertex 0 , $h;
2187 glVertex $w, $h;
2188 glVertex $w, 0;
2189 glEnd;
2190
2191 glColor 0, 0, 0;
2192 glBegin GL_LINE_LOOP;
2193 glVertex 0 , 0;
2194 glVertex 0 , $h;
2195 glVertex $w, $h;
2196 glVertex $w, 0;
2197 glEnd;
2198
2199 glPopMatrix;
2200
2201 glTranslate 2, 2;
2202 $self->SUPER::_draw;
2203}
2204
2205#############################################################################
2206
2141package CFClient::UI::Root; 2207package CFClient::UI::Root;
2142 2208
2143our @ISA = CFClient::UI::Container::; 2209our @ISA = CFClient::UI::Container::;
2144 2210
2145use SDL::OpenGL; 2211use CFClient::OpenGL;
2146 2212
2147sub check_size { 2213sub check_size {
2148 my ($self) = @_; 2214 my ($self) = @_;
2149 2215
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2151} 2217}
2152 2218
2153sub size_request { 2219sub size_request {
2154 ($::WIDTH, $::HEIGHT) 2220 ($::WIDTH, $::HEIGHT)
2155} 2221}
… …
2157sub configure { 2223sub configure {
2158 my ($self, $x, $y, $w, $h) = @_; 2224 my ($self, $x, $y, $w, $h) = @_;
2159 2225
2160 $self->SUPER::configure ($x, $y, $w, $h); 2226 $self->SUPER::configure ($x, $y, $w, $h);
2161 2227
2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2163 for @{$self->{children}}; 2228 for my $child (@{$self->{children}}) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2233 $child->configure ($X, $Y, $W,$H);
2234 }
2164} 2235}
2165 2236
2166sub _topleft { 2237sub _topleft {
2167 my ($self, $x, $y) = @_; 2238 my ($self, $x, $y) = @_;
2168 2239
… …
2176 ::refresh (); 2247 ::refresh ();
2177} 2248}
2178 2249
2179sub add { 2250sub add {
2180 my ($self, $child) = @_; 2251 my ($self, $child) = @_;
2252
2253 # integerize window positions
2254 $child->{x} = int $child->{x};
2255 $child->{y} = int $child->{y};
2181 2256
2182 $self->SUPER::add ($child); 2257 $self->SUPER::add ($child);
2183} 2258}
2184 2259
2185sub on_refresh { 2260sub on_refresh {
… …
2211############################################################################# 2286#############################################################################
2212 2287
2213package CFClient::UI; 2288package CFClient::UI;
2214 2289
2215$ROOT = new CFClient::UI::Root; 2290$ROOT = new CFClient::UI::Root;
2291$TOOLTIP = new CFClient::UI::Tooltip;
2216 2292
22171 22931
2218 2294

Diff Legend

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