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.150 by elmex, Sun Apr 23 00:08:29 2006 UTC

… …
21 $FOCUS->key_up ($_[0]) if $FOCUS; 21 $FOCUS->key_up ($_[0]) if $FOCUS;
22} 22}
23 23
24sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
25 my ($ev) = @_; 25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->{x}, $ev->{y});
27 27
28 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
30 30
31 $GRAB = $widget; 31 $GRAB = $widget;
32 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
33 } 33 }
34 34
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 36
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 38}
39 39
40sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
41 my ($ev) = @_; 41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->{x}, $ev->{y});
43 43
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 47
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
… …
54 } 54 }
55} 55}
56 56
57sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
58 my ($ev) = @_; 58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->{x}, $ev->{y});
60 60
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
… …
87 87
88package CFClient::UI::Base; 88package CFClient::UI::Base;
89 89
90use strict; 90use strict;
91 91
92use SDL::OpenGL; 92use CFClient::OpenGL;
93 93
94sub new { 94sub new {
95 my $class = shift; 95 my $class = shift;
96 96
97 my $self = bless { 97 my $self = bless {
98 x => 0, 98 x => 0,
99 y => 0, 99 y => 0,
100 z => 0, 100 z => 0,
101 w => -1, 101 can_events => 1,
102 h => -1,
103 @_ 102 @_
104 }, $class; 103 }, $class;
105 104
106 for (keys %$self) { 105 for (keys %$self) {
107 if (/^connect_(.*)$/) { 106 if (/^connect_(.*)$/) {
… …
110 } 109 }
111 110
112 $self 111 $self
113} 112}
114 113
114sub show {
115 my ($self) = @_;
116
117 return if $self->{parent};
118
119 $CFClient::UI::ROOT->add ($self);
120}
121
122sub hide {
123 my ($self) = @_;
124
125 return unless $self->{parent};
126
127 $self->{parent}->remove ($self);
128}
129
115sub move { 130sub move {
116 my ($self, $x, $y, $z) = @_; 131 my ($self, $x, $y, $z) = @_;
117 132
118 $self->{x} = int $x; 133 $self->{x} = int $x;
119 $self->{y} = int $y; 134 $self->{y} = int $y;
… …
126 0 141 0
127} 142}
128 143
129sub size_request { 144sub size_request {
130 require Carp; 145 require Carp;
131 Carp::confess "size_request is abtract"; 146 Carp::confess "size_request is abstract";
132} 147}
133 148
134sub configure { 149sub configure {
135 my ($self, $x, $y, $w, $h) = @_; 150 my ($self, $x, $y, $w, $h) = @_;
136 151
152 if ($self->{aspect}) {
153 my $w2 = List::Util::min $w, int $h * $self->{aspect};
154 my $h2 = List::Util::min $h, int $w / $self->{aspect};
155
156 # use alignment to adjust x, y
157
158 $x += int +($w - $w2) * 0.5;
159 $y += int +($h - $h2) * 0.5;
160
161 ($w, $h) = ($w2, $h2);
162 }
163
164 if ($self->{x} != $x || $self->{y} != $y) {
137 $self->{x} = $x; 165 $self->{x} = $x;
138 $self->{y} = $y; 166 $self->{y} = $y;
167 $self->update;
168 }
139 169
140 return unless $self->{w} != $w || $self->{h} != $h; 170 if ($self->{w} != $w || $self->{h} != $h) {
141
142 $self->{w} = $w; 171 $self->{w} = $w;
143 $self->{h} = $h; 172 $self->{h} = $h;
144 173
145 $self->size_allocate ($w, $h); 174 $self->size_allocate ($w, $h);
175 $self->update;
176 }
146} 177}
147 178
148sub size_allocate { 179sub size_allocate {
149 # nothing to be done 180 # nothing to be done
150} 181}
… …
248} 279}
249 280
250sub find_widget { 281sub find_widget {
251 my ($self, $x, $y) = @_; 282 my ($self, $x, $y) = @_;
252 283
284 return () unless $self->{can_events};
285
253 return $self 286 return $self
254 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 287 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 288 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
256 289
257 () 290 ()
… …
264} 297}
265 298
266sub check_size { 299sub check_size {
267 my ($self) = @_; 300 my ($self) = @_;
268 301
302 return unless $self->{parent};
303
269 my ($w, $h) = $self->size_request; 304 my ($w, $h) = $self->size_request;
270 305
271 if ($w != $self->{req_w} || $h != $self->{req_h}) { 306 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w; 307 $self->{req_w} = $w;
273 $self->{req_h} = $h; 308 $self->{req_h} = $h;
274 309
275 $self->{parent}->check_size 310 $self->{parent}->check_size;
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 } 311 }
281} 312}
282 313
283sub update { 314sub update {
284 my ($self) = @_; 315 my ($self) = @_;
… …
312package CFClient::UI::DrawBG; 343package CFClient::UI::DrawBG;
313 344
314our @ISA = CFClient::UI::Base::; 345our @ISA = CFClient::UI::Base::;
315 346
316use strict; 347use strict;
317use SDL::OpenGL; 348use CFClient::OpenGL;
318 349
319sub new { 350sub new {
320 my $class = shift; 351 my $class = shift;
321 352
322 # range [value, low, high, page] 353 # range [value, low, high, page]
… …
351 382
352package CFClient::UI::Empty; 383package CFClient::UI::Empty;
353 384
354our @ISA = CFClient::UI::Base::; 385our @ISA = CFClient::UI::Base::;
355 386
387sub new {
388 my ($class, %arg) = @_;
389 $class->SUPER::new (can_events => 0, %arg);
390}
391
356sub size_request { 392sub size_request {
357 (0, 0) 393 (0, 0)
358} 394}
359 395
360sub draw { } 396sub draw { }
… …
368sub new { 404sub new {
369 my ($class, %arg) = @_; 405 my ($class, %arg) = @_;
370 406
371 my $children = delete $arg{children} || []; 407 my $children = delete $arg{children} || [];
372 408
373 my $self = $class->SUPER::new (children => [], %arg); 409 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
374 $self->add ($_) for @$children; 410 $self->add ($_) for @$children;
375 411
376 $self 412 $self
377} 413}
378 414
… …
386 $self->{children} = [ 422 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 423 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 424 @{$self->{children}}, $child
389 ]; 425 ];
390 426
391 $self->{w} = $self->{h} = -1;
392
393 $child->check_size; 427 $child->check_size;
394} 428}
395 429
396sub remove { 430sub remove {
397 my ($self, $widget) = @_; 431 my ($self, $child) = @_;
398 432
433 delete $child->{parent};
434
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 435 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 436
401 $self->check_size; 437 $self->check_size;
402} 438}
403 439
404sub find_widget { 440sub find_widget {
… …
436 472
437 $class->SUPER::new (children => [$child], %arg) 473 $class->SUPER::new (children => [$child], %arg)
438} 474}
439 475
440sub add { 476sub add {
441 my ($self, $widget) = @_; 477 my ($self, $child) = @_;
442 478
443 $self->{children} = []; 479 $self->{children} = [];
444 480
445 $self->SUPER::add ($widget); 481 $self->SUPER::add ($child);
446} 482}
447 483
448sub remove { 484sub remove {
449 my ($self, $widget) = @_; 485 my ($self, $widget) = @_;
450 486
… …
470 506
471package CFClient::UI::Window; 507package CFClient::UI::Window;
472 508
473our @ISA = CFClient::UI::Bin::; 509our @ISA = CFClient::UI::Bin::;
474 510
475use SDL::OpenGL; 511use CFClient::OpenGL;
476 512
477sub new { 513sub new {
478 my ($class, %arg) = @_; 514 my ($class, %arg) = @_;
479 515
480 my $self = $class->SUPER::new (%arg); 516 my $self = $class->SUPER::new (%arg);
… …
534sub new { die } 570sub new { die }
535 571
536sub size_request { 572sub size_request {
537 my ($self) = @_; 573 my ($self) = @_;
538 574
539 @$self{qw(child_w child_h)} = $self->child->size_request; 575 @$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)}); 576 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541 577
542 @$self{qw(child_w child_h)} 578 @$self{qw(child_w child_h)}
543} 579}
544 580
… …
553 589
554package CFClient::UI::Frame; 590package CFClient::UI::Frame;
555 591
556our @ISA = CFClient::UI::Bin::; 592our @ISA = CFClient::UI::Bin::;
557 593
558use SDL::OpenGL; 594use 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 595
606sub new { 596sub new {
607 my $class = shift; 597 my $class = shift;
608 598
609 # TODO: user_x, user_y, overwrite moveto?
610
611 $class->SUPER::new ( 599 my $self = $class->SUPER::new (
612 bg => [1, 1, 1, 1], 600 bg => [1, 1, 1, 1],
613 border_bg => [1, 1, 1, 1], 601 border_bg => [1, 1, 1, 1],
614 border => int $::FONTSIZE * 0.8, 602 border => 0.8,
615 @_ 603 @_
616 ) 604 );
605
606 $self
607}
608
609sub set_size {
610 my ($self, $w, $h) = @_;
611 $self->{req_w} = $w;
612 $self->{req_h} = $h;
613 $self->check_size;
617} 614}
618 615
619sub size_request { 616sub size_request {
620 my ($self) = @_; 617 my ($self) = @_;
621 618 ($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} 619}
631 620
632sub size_allocate { 621sub size_allocate {
633 my ($self, $w, $h) = @_; 622 my ($self, $w, $h) = @_;
623 $self->{w} = $w;
624 $self->{h} = $h;
625 $self->child->configure (0, 0, $w, $h);
626}
634 627
628sub _draw {
629 my ($self) = @_;
630
631 my ($w, $h) = ($self->{w}, $self->{h});
632
633 glEnable GL_BLEND;
634 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
635 glEnable GL_TEXTURE_2D;
636 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
637
638# glBegin GL_QUADS;
639# glColor 0, 0, 0, 0;
640# glVertex 0 , 0;
641# glVertex 0 , $h;
642# glVertex $w, $h;
643# glVertex $w, 0;
644# glEnd;
645
646
647 $self->child->draw;
648 glDisable GL_BLEND;
649 glDisable GL_TEXTURE_2D;
650}
651
652#############################################################################
653
654package CFClient::UI::FancyFrame;
655
656our @ISA = CFClient::UI::Bin::;
657
658use CFClient::OpenGL;
659
660my @tex =
661 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
662 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
663
664sub new {
665 my $class = shift;
666
667 # TODO: user_x, user_y, overwrite moveto?
668
669 my $self = $class->SUPER::new (
670 bg => [1, 1, 1, 1],
671 border_bg => [1, 1, 1, 1],
672 border => 0.8,
673 can_events => 1,
674 @_
675 );
676
677 $self->{title} &&= new CFClient::UI::Label
678 align => 0,
679 valign => 1,
680 text => $self->{title},
681 fontsize => 1;
682
683 $self
684}
685
686sub border {
687 int $_[0]{border} * $::FONTSIZE
688}
689
690sub size_request {
691 my ($self) = @_;
692
693 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
694
695 my ($w, $h) = $self->SUPER::size_request;
696
697 (
698 $w + $self->border * 2,
699 $h + $self->border * 2,
700 )
701}
702
703sub size_allocate {
704 my ($self, $w, $h) = @_;
705
635 $h -= List::Util::max 0, $self->{border} * 2; 706 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 707 $w -= List::Util::max 0, $self->border * 2;
637 708
709 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
710 if $self->{title};
711
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 712 $self->child->configure ($self->border, $self->border, $w, $h);
639} 713}
640 714
641sub button_down { 715sub button_down {
642 my ($self, $ev, $x, $y) = @_; 716 my ($self, $ev, $x, $y) = @_;
643 717
718 my $border = $self->border;
719
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 720 if ($x < $self->{w} && $x >= $self->{w} - $border
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 721 && $y < $self->{h} && $y >= $self->{h} - $border) {
646 722
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 723 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 724 my ($bw, $bh) = ($self->{w}, $self->{h});
649 725
650 $self->{motion} = sub { 726 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 727 my ($ev, $x, $y) = @_;
652 728
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 729 ($x, $y) = ($ev->{x}, $ev->{y});
654 730
655 $self->{user_w} = $bw + $x - $ox; 731 $self->{user_w} = $bw + $x - $ox;
656 $self->{user_h} = $bh + $y - $oy; 732 $self->{user_h} = $bh + $y - $oy;
657 $self->check_size; 733 $self->check_size;
658 }; 734 };
659 735
660 } elsif ($x >= 0 && $x < $self->{w} 736 } elsif ($x >= 0 && $x < $self->{w}
661 && $y >= 0 && $y < $self->{border}) { 737 && $y >= 0 && $y < $border) {
662 738
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 739 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 740 my ($bx, $by) = ($self->{x}, $self->{y});
665 741
666 $self->{motion} = sub { 742 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 743 my ($ev, $x, $y) = @_;
668 744
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 745 ($x, $y) = ($ev->{x}, $ev->{y});
670 746
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 747 $self->move ($bx + $x - $ox, $by + $y - $oy);
672 $self->update; 748 $self->update;
673 }; 749 };
674 } 750 }
… …
695 glEnable GL_BLEND; 771 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 772 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 773 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 774 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 775
776 my $border = $self->border;
777
700 glColor @{ $self->{border_bg} }; 778 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 779 $tex[1]->draw_quad (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 780 $tex[3]->draw_quad (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 781 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 782 $tex[4]->draw_quad (0, $h - $border, $w, $border);
705 783
706 my $bg = $tex[0]; 784 my $bg = $tex[0];
707 785
708 # TODO: repeat texture not scale 786 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 787 my $rep_x = $cw / $bg->{w};
… …
712 glColor @{ $self->{bg} }; 790 glColor @{ $self->{bg} };
713 791
714 $bg->{s} = $rep_x; 792 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y; 793 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1; 794 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 795 $bg->draw_quad ($border, $border, $cw, $ch);
718 796
719 glDisable GL_TEXTURE_2D; 797 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 798 glDisable GL_BLEND;
721 799
800 $self->{title}->draw if $self->{title};
722 $self->child->draw; 801 $self->child->draw;
723} 802}
724 803
725############################################################################# 804#############################################################################
726 805
… …
728 807
729our @ISA = CFClient::UI::Base::; 808our @ISA = CFClient::UI::Base::;
730 809
731use List::Util qw(max sum); 810use List::Util qw(max sum);
732 811
733use SDL::OpenGL; 812use CFClient::OpenGL;
734 813
735sub new { 814sub new {
736 my $class = shift; 815 my $class = shift;
737 816
738 $class->SUPER::new ( 817 $class->SUPER::new (
… …
745 my ($self, $x, $y, $child) = @_; 824 my ($self, $x, $y, $child) = @_;
746 825
747 $child->set_parent ($self); 826 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 827 $self->{children}[$y][$x] = $child;
749 828
750 $self->{w} = $self->{h} = -1;
751
752 $child->check_size; 829 $child->check_size;
753} 830}
754 831
755# TODO: move to container class maybe? send childs a signal on removal? 832# TODO: move to container class maybe? send childs a signal on removal?
756sub clear { 833sub clear {
… …
770 or next; 847 or next;
771 848
772 for my $x (0 .. $#$row) { 849 for my $x (0 .. $#$row) {
773 my $widget = $row->[$x] 850 my $widget = $row->[$x]
774 or next; 851 or next;
775 my ($w, $h) = $widget->size_request; 852 my ($w, $h) = @$widget{qw(req_w req_h)};
776 853
777 $w[$x] = max $w[$x], $w; 854 $w[$x] = max $w[$x], $w;
778 $h[$y] = max $h[$y], $h; 855 $h[$y] = max $h[$y], $h;
779 } 856 }
780 } 857 }
… …
885 962
886 ($h, $w) = ($w, $h); 963 ($h, $w) = ($w, $h);
887 964
888 my $children = $self->{children}; 965 my $children = $self->{children};
889 966
890 my @h = map +($_->size_request)[0], @$children; 967 my @h = map $_->{req_w}, @$children;
891 968
892 my $req_h = List::Util::sum @h; 969 my $req_h = List::Util::sum @h;
893 970
894 if ($req_h > $h) { 971 if ($req_h > $h) {
895 # ah well, not enough space 972 # ah well, not enough space
… …
943sub size_allocate { 1020sub size_allocate {
944 my ($self, $w, $h) = @_; 1021 my ($self, $w, $h) = @_;
945 1022
946 my $children = $self->{children}; 1023 my $children = $self->{children};
947 1024
948 my @h = map +($_->size_request)[1], @$children; 1025 my @h = map $_->{req_h}, @$children;
949 1026
950 my $req_h = List::Util::sum @h; 1027 my $req_h = List::Util::sum @h;
951 1028
952 if ($req_h > $h) { 1029 if ($req_h > $h) {
953 # ah well, not enough space 1030 # ah well, not enough space
… …
981 1058
982package CFClient::UI::Label; 1059package CFClient::UI::Label;
983 1060
984our @ISA = CFClient::UI::Base::; 1061our @ISA = CFClient::UI::Base::;
985 1062
986use SDL::OpenGL; 1063use CFClient::OpenGL;
987 1064
988sub new { 1065sub new {
989 my ($class, %arg) = @_; 1066 my ($class, %arg) = @_;
990 1067
991 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1069 fg => [1, 1, 1],
993 fontsize => $::FONTSIZE, 1070 fontsize => 1,
994 text => "", 1071 text => "",
995 align => -1, 1072 align => -1,
996 valign => -1, 1073 valign => -1,
997 padding => 2, 1074 padding => 2,
998 layout => new CFClient::Layout, 1075 layout => new CFClient::Layout,
1076 can_events => 0,
999 %arg 1077 %arg
1000 ); 1078 );
1001 1079
1002 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1080 if (exists $self->{template}) {
1081 my $layout = new CFClient::Layout;
1082 $layout->set_text (delete $self->{template});
1083 $self->{template} = $layout;
1084 }
1003 1085
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1086 $self->set_text (delete $self->{text}) if exists $self->{text};
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1087 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006 1088
1007 $self 1089 $self
… …
1021 my ($self, $text) = @_; 1103 my ($self, $text) = @_;
1022 1104
1023 $self->{layout}->set_text ($text); 1105 $self->{layout}->set_text ($text);
1024 1106
1025 delete $self->{texture}; 1107 delete $self->{texture};
1108 $self->check_size;
1026 $self->update; 1109 $self->update;
1027} 1110}
1028 1111
1029sub set_markup { 1112sub set_markup {
1030 my ($self, $markup) = @_; 1113 my ($self, $markup) = @_;
1031 1114
1032 $self->{layout}->set_markup ($markup); 1115 $self->{layout}->set_markup ($markup);
1033 1116
1034 delete $self->{texture}; 1117 delete $self->{texture};
1118 $self->check_size;
1035 $self->update; 1119 $self->update;
1036} 1120}
1037 1121
1038sub size_request { 1122sub size_request {
1039 my ($self) = @_; 1123 my ($self) = @_;
1040 1124
1041 $self->{layout}->set_width; 1125 $self->{layout}->set_width;
1042 $self->{layout}->set_height ($self->{fontsize}); 1126 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1127
1044 my ($w, $h) = $self->{layout}->size; 1128 my ($w, $h) = $self->{layout}->size;
1129
1130 if (exists $self->{template}) {
1131 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1132
1133 my ($w2, $h2) = $self->{template}->size;
1134
1135 $w = List::Util::max $w, $w2;
1136 $h = List::Util::max $h, $h2;
1137 }
1045 1138
1046 ( 1139 (
1047 $w + $self->{padding} * 2, 1140 $w + $self->{padding} * 2,
1048 $h + $self->{padding} * 2, 1141 $h + $self->{padding} * 2,
1049 ) 1142 )
… …
1053 my ($self, $w, $h) = @_; 1146 my ($self, $w, $h) = @_;
1054 1147
1055 delete $self->{texture}; 1148 delete $self->{texture};
1056} 1149}
1057 1150
1058sub update { 1151sub set_fontsize {
1059 my ($self) = @_; 1152 my ($self, $fontsize) = @_;
1060 1153
1061 delete $self->{texture}; 1154 $self->{fontsize} = $fontsize;
1062 $self->SUPER::update; 1155 $self->check_size;
1063} 1156}
1064 1157
1065sub _draw { 1158sub _draw {
1066 my ($self) = @_; 1159 my ($self) = @_;
1067 1160
1068 my $tex = $self->{texture} ||= do { 1161 my $tex = $self->{texture} ||= do {
1069 $self->{layout}->set_width ($self->{w}); 1162 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1163 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071 new_from_layout CFClient::Texture $self->{layout} 1164 new_from_layout CFClient::Texture $self->{layout}
1072 }; 1165 };
1073 1166
1074 glEnable GL_BLEND; 1167 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1168 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1100 1193
1101package CFClient::UI::EntryBase; 1194package CFClient::UI::EntryBase;
1102 1195
1103our @ISA = CFClient::UI::Label::; 1196our @ISA = CFClient::UI::Label::;
1104 1197
1105use SDL; 1198use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1199
1108sub new { 1200sub new {
1109 my $class = shift; 1201 my $class = shift;
1110 1202
1111 $class->SUPER::new ( 1203 $class->SUPER::new (
… …
1114 active_bg => [1, 1, 1, 0.5], 1206 active_bg => [1, 1, 1, 0.5],
1115 active_fg => [0, 0, 0], 1207 active_fg => [0, 0, 0],
1116 can_hover => 1, 1208 can_hover => 1,
1117 can_focus => 1, 1209 can_focus => 1,
1118 valign => 0, 1210 valign => 0,
1211 can_events => 1,
1119 @_ 1212 @_
1120 ) 1213 )
1121} 1214}
1122 1215
1123sub _set_text { 1216sub _set_text {
… …
1125 1218
1126 delete $self->{cur_h}; 1219 delete $self->{cur_h};
1127 1220
1128 return if $self->{text} eq $text; 1221 return if $self->{text} eq $text;
1129 1222
1223 delete $self->{texture};
1224
1130 $self->{last_activity} = $::NOW; 1225 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1226 $self->{text} = $text;
1132 1227
1133 $text =~ s/./*/g if $self->{hidden}; 1228 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1229 $self->{layout}->set_text ("$text ");
… …
1149} 1244}
1150 1245
1151sub size_allocate { 1246sub size_allocate {
1152 my ($self, $w, $h) = @_; 1247 my ($self, $w, $h) = @_;
1153 1248
1154 $self->_set_text ($self->{text}); 1249 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155} 1250}
1156 1251
1157sub set_text { 1252sub set_text {
1158 my ($self, $text) = @_; 1253 my ($self, $text) = @_;
1159 1254
… …
1163} 1258}
1164 1259
1165sub key_down { 1260sub key_down {
1166 my ($self, $ev) = @_; 1261 my ($self, $ev) = @_;
1167 1262
1168 my $mod = $ev->key_mod; 1263 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1264 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1265 my $uni = $ev->{unicode};
1172 1266
1173 my $text = $self->get_text; 1267 my $text = $self->get_text;
1174 1268
1175 if ($sym == SDLK_BACKSPACE) { 1269 if ($sym == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1270 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1271 } elsif ($sym == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1272 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1273 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1274 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1275 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1276 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1277 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1278 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1279 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1280 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1281 } elsif ($sym == 27) {
1188 $self->emit ('escape'); 1282 $self->emit ('escape');
1189 } elsif ($uni) { 1283 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1284 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1285 }
1192 1286
… …
1267 1361
1268package CFClient::UI::Entry; 1362package CFClient::UI::Entry;
1269 1363
1270our @ISA = CFClient::UI::EntryBase::; 1364our @ISA = CFClient::UI::EntryBase::;
1271 1365
1272use SDL; 1366use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1367
1275sub key_down { 1368sub key_down {
1276 my ($self, $ev) = @_; 1369 my ($self, $ev) = @_;
1277 1370
1278 my $sym = $ev->key_sym; 1371 my $sym = $ev->{sym};
1279 1372
1280 if ($sym == SDLK_RETURN) { 1373 if ($sym == 13) {
1281 $self->emit (activate => $self->get_text); 1374 $self->emit (activate => $self->get_text);
1282 $self->update; 1375 $self->update;
1283 1376
1284 } else { 1377 } else {
1285 $self->SUPER::key_down ($ev); 1378 $self->SUPER::key_down ($ev);
… …
1291 1384
1292package CFClient::UI::Button; 1385package CFClient::UI::Button;
1293 1386
1294our @ISA = CFClient::UI::Label::; 1387our @ISA = CFClient::UI::Label::;
1295 1388
1296use SDL; 1389use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1390
1299my @tex = 1391my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1392 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1393 qw(b1_button_active.png);
1302 1394
1303sub new { 1395sub new {
1304 my $class = shift; 1396 my $class = shift;
1305 1397
… …
1309 bg => [1, 1, 1, 0.2], 1401 bg => [1, 1, 1, 0.2],
1310 active_fg => [0, 0, 1], 1402 active_fg => [0, 0, 1],
1311 can_hover => 1, 1403 can_hover => 1,
1312 align => 0, 1404 align => 0,
1313 valign => 0, 1405 valign => 0,
1406 can_events => 1,
1314 @_ 1407 @_
1315 ) 1408 )
1316} 1409}
1317 1410
1318sub button_up { 1411sub button_up {
… …
1352package CFClient::UI::CheckBox; 1445package CFClient::UI::CheckBox;
1353 1446
1354our @ISA = CFClient::UI::DrawBG::; 1447our @ISA = CFClient::UI::DrawBG::;
1355 1448
1356my @tex = 1449my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1451 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359 1452
1360use SDL; 1453use CFClient::OpenGL;
1361use SDL::OpenGL;
1362 1454
1363sub new { 1455sub new {
1364 my $class = shift; 1456 my $class = shift;
1365 1457
1366 $class->SUPER::new ( 1458 $class->SUPER::new (
… …
1412 glDisable GL_BLEND; 1504 glDisable GL_BLEND;
1413} 1505}
1414 1506
1415############################################################################# 1507#############################################################################
1416 1508
1417package CFClient::UI::VGauge; 1509package CFClient::UI::Image;
1418 1510
1419our @ISA = CFClient::UI::Base::; 1511our @ISA = CFClient::UI::Base::;
1420 1512
1421use SDL::OpenGL; 1513use CFClient::OpenGL;
1514use Carp qw/confess/;
1422 1515
1423my %tex = ( 1516our %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 1517
1442# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new { 1518sub new {
1444 my $class = shift; 1519 my $class = shift;
1445 1520
1446 my $self = $class->SUPER::new (gauge => 'food', @_); 1521 my $self = $class->SUPER::new (can_events => 0, @_);
1522
1523 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1524
1525 $loaded_images{$self->{image}} ||=
1526 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1527
1528 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1529
1530 Scalar::Util::weaken $loaded_images{$self->{image}};
1531
1532 $self->{aspect} = $tex->{w} / $tex->{h};
1447 1533
1448 $self 1534 $self
1449} 1535}
1450 1536
1451sub size_request { 1537sub size_request {
1452 my ($self) = @_; 1538 my ($self) = @_;
1453 1539
1454 my $tex = $tex{$self->{gauge}}[0]; 1540 ($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} 1541}
1476 1542
1477sub _draw { 1543sub _draw {
1478 my ($self) = @_; 1544 my ($self) = @_;
1479 1545
1480 my $tex = $tex{$self->{gauge}}; 1546 my $tex = $self->{tex};
1481 1547
1482 my ($w, $h) = ($self->{w}, $self->{h}); 1548 my ($w, $h) = ($self->{w}, $self->{h});
1483 1549
1484 my $ycut = $self->{val} / ($self->{max_val} || 1); 1550 if ($self->{rot90}) {
1485 $ycut = 1 if $self->{val} > $self->{max_val}; 1551 glRotate 90, 0, 0, 1;
1552 glTranslate 0, -$self->{w}, 0;
1486 1553
1487 my $t1 = $tex->[0]; 1554 ($w, $h) = ($h, $w);
1488 my $t2 = $tex->[1]; 1555 }
1489 1556
1490 glEnable GL_BLEND; 1557 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1558 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1559 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1561
1562 $tex->draw_quad (0, 0, $w, $h);
1563
1564 glDisable GL_BLEND;
1565 glDisable GL_TEXTURE_2D;
1566}
1567
1568#############################################################################
1569
1570package CFClient::UI::VGauge;
1571
1572our @ISA = CFClient::UI::Base::;
1573
1574use CFClient::OpenGL;
1575
1576my %tex = (
1577 food => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1580 ],
1581 grace => [
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1583 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1584 ],
1585 hp => [
1586 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1587 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1588 ],
1589 mana => [
1590 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1591 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1592 ],
1593);
1594
1595# eg. VGauge->new (gauge => 'food'), default gauge: food
1596sub new {
1597 my $class = shift;
1598
1599 my $self = $class->SUPER::new (
1600 type => 'food',
1601 @_
1602 );
1603
1604 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1605
1606 $self
1607}
1608
1609sub size_request {
1610 my ($self) = @_;
1611
1612 #my $tex = $tex{$self->{type}}[0];
1613 #@$tex{qw(w h)}
1614 (0, 0)
1615}
1616
1617sub set_max {
1618 my ($self, $max) = @_;
1619
1620 $self->{max_val} = $max;
1621}
1622
1623sub set_value {
1624 my ($self, $val, $max) = @_;
1625
1626 $self->set_max ($max)
1627 if defined $max;
1628
1629 $max = $self->{max_val};
1630 $self->{val} = $val;
1631
1632 $self->update;
1633}
1634
1635sub _draw {
1636 my ($self) = @_;
1637
1638 my $tex = $tex{$self->{type}};
1639
1640 my ($w, $h) = ($self->{w}, $self->{h});
1641
1642 if ($self->{vertical}) {
1643 glRotate 90, 0, 0, 1;
1644 glTranslate 0, -$self->{w}, 0;
1645
1646 ($w, $h) = ($h, $w);
1647 }
1648
1649 my $ycut = $self->{val} / ($self->{max_val} || 1);
1650 $ycut = 1 if $self->{val} > $self->{max_val};
1651
1652 my $t1 = $tex->[0];
1653 my $t2 = $tex->[1];
1654
1655 glEnable GL_BLEND;
1656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1657 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659
1495 my $h1 = $self->{h} - $ycut * $self->{h}; 1660 my $h1 = $self->{h} - $ycut * $self->{h};
1496 my $h2 = $ycut * $self->{h}; 1661 my $h2 = $ycut * $self->{h};
1497 1662
1498 my $yp = 0;
1499
1500 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1663 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS; 1664 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp; 1665 glTexCoord 0 , 0; glVertex 0 , 0;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1666 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1667 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1668 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506 glEnd; 1669 glEnd;
1507
1508 $yp += $h1;
1509 1670
1510 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1671 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS; 1672 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1673 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1674 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1514 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2; 1675 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1515 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1676 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1516 glEnd; 1677 glEnd;
1517 1678
1518 glDisable GL_BLEND; 1679 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1520} 1681}
1521 1682
1522############################################################################# 1683#############################################################################
1523 1684
1685package CFClient::UI::Gauge;
1686
1687our @ISA = CFClient::UI::VBox::;
1688
1689sub new {
1690 my ($class, %arg) = shift;
1691
1692 my $self = $class->SUPER::new (
1693 @_,
1694 );
1695
1696 $self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999";
1697 $self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999";
1698 $self->add ($self->{value});
1699 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1700 $self->add ($self->{max});
1701
1702 $self
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707 (($self->{max}->size_request)[0], 0)
1708}
1709
1710sub set_fontsize {
1711 my ($self, $fsize) = @_;
1712
1713 $self->{value}->set_fontsize ($fsize);
1714 $self->{max} ->set_fontsize ($fsize);
1715}
1716
1717sub set_value {
1718 my ($self, $val, $max) = @_;
1719
1720 $self->set_max ($max)
1721 if defined $max;
1722
1723 $self->{gauge}->set_value ($val, $max);
1724 $self->{value}->set_text ($val);
1725}
1726
1727sub set_max {
1728 my ($self, $max) = @_;
1729
1730 $self->{gauge}->set_max ($max);
1731 $self->{max}->set_text ($max);
1732}
1733
1734#############################################################################
1735
1524package CFClient::UI::Slider; 1736package CFClient::UI::Slider;
1525 1737
1526use strict; 1738use strict;
1527 1739
1528use SDL::OpenGL; 1740use CFClient::OpenGL;
1529 1741
1530our @ISA = CFClient::UI::DrawBG::; 1742our @ISA = CFClient::UI::DrawBG::;
1531 1743
1532my @tex = 1744my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1745 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1543 # TODO: calculations are off 1755 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 1756 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 1757 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 1758 active_fg => [0, 0, 0],
1547 range => [0, 0, 100, 10], 1759 range => [0, 0, 100, 10],
1548 req_w => 40, 1760 req_w => 20,
1549 req_h => 13, 1761 req_h => 20,
1550 vertical => 0, 1762 vertical => 0,
1551 can_hover => 1, 1763 can_hover => 1,
1552 inner_pad => 5, 1764 inner_pad => 5,
1553 @_ 1765 @_
1554 ); 1766 );
… …
1658 1870
1659package CFClient::UI::TextView; 1871package CFClient::UI::TextView;
1660 1872
1661our @ISA = CFClient::UI::HBox::; 1873our @ISA = CFClient::UI::HBox::;
1662 1874
1663use SDL::OpenGL; 1875use CFClient::OpenGL;
1664 1876
1665sub new { 1877sub new {
1666 my $class = shift; 1878 my $class = shift;
1667 1879
1668 my $self = $class->SUPER::new ( 1880 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6,
1670 req_h => $::HEIGHT / 6,
1671 fontsize => $::FONTSIZE, 1881 fontsize => 1,
1672 @_, 1882 @_,
1673 1883
1674 layout => (new CFClient::Layout), 1884 layout => (new CFClient::Layout),
1675 par => [], 1885 par => [],
1676 height => 0, 1886 height => 0,
… …
1697sub text_height { 1907sub text_height {
1698 my ($self, $text) = @_; 1908 my ($self, $text) = @_;
1699 1909
1700 my $layout = $self->{layout}; 1910 my $layout = $self->{layout};
1701 1911
1702 $layout->set_height ($self->{fontsize}); 1912 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 1913 $layout->set_width ($self->{w});
1704 $layout->set_text ($text); 1914 $layout->set_text ($text);
1705 1915
1706 ($layout->size)[1] 1916 ($layout->size)[1]
1707} 1917}
… …
1711 1921
1712 $self->{need_reflow}++; 1922 $self->{need_reflow}++;
1713 $self->update; 1923 $self->update;
1714} 1924}
1715 1925
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate { 1926sub size_allocate {
1723 my ($self, $w, $h) = @_; 1927 my ($self, $w, $h) = @_;
1724 1928
1929 $self->SUPER::size_allocate ($w, $h);
1930
1725 $self->{layout}->set_height ($self->{fontsize}); 1931 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726 $self->{layout}->set_width ($self->{w}); 1932 $self->{layout}->set_width ($self->{children}[0]{w});
1727 1933
1728 $self->reflow; 1934 $self->reflow;
1729 $self->update;
1730} 1935}
1731 1936
1732sub add_paragraph { 1937sub add_paragraph {
1733 my ($self, $color, $text) = @_; 1938 my ($self, $color, $text) = @_;
1734 1939
… …
1819 2024
1820} 2025}
1821 2026
1822############################################################################# 2027#############################################################################
1823 2028
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; 2029package CFClient::UI::Animator;
2061 2030
2062use SDL::OpenGL; 2031use CFClient::OpenGL;
2063 2032
2064our @ISA = CFClient::UI::Bin::; 2033our @ISA = CFClient::UI::Bin::;
2065 2034
2066sub moveto { 2035sub moveto {
2067 my ($self, $x, $y) = @_; 2036 my ($self, $x, $y) = @_;
… …
2107 my $class = shift; 2076 my $class = shift;
2108 2077
2109 my $self = $class->SUPER::new ( 2078 my $self = $class->SUPER::new (
2110 state => 0, 2079 state => 0,
2111 connect_activate => \&toggle_flopper, 2080 connect_activate => \&toggle_flopper,
2081 can_events => 1,
2112 @_ 2082 @_
2113 ); 2083 );
2114 2084
2115 if ($self->{state}) { 2085 if ($self->{state}) {
2116 $self->{state} = 0; 2086 $self->{state} = 0;
… …
2140 2110
2141package CFClient::UI::Root; 2111package CFClient::UI::Root;
2142 2112
2143our @ISA = CFClient::UI::Container::; 2113our @ISA = CFClient::UI::Container::;
2144 2114
2145use SDL::OpenGL; 2115use CFClient::OpenGL;
2146 2116
2147sub check_size { 2117sub check_size {
2148 my ($self) = @_; 2118 my ($self) = @_;
2149 2119
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 2120 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2151} 2121}
2152 2122
2153sub size_request { 2123sub size_request {
2154 ($::WIDTH, $::HEIGHT) 2124 ($::WIDTH, $::HEIGHT)
2155} 2125}
… …
2157sub configure { 2127sub configure {
2158 my ($self, $x, $y, $w, $h) = @_; 2128 my ($self, $x, $y, $w, $h) = @_;
2159 2129
2160 $self->SUPER::configure ($x, $y, $w, $h); 2130 $self->SUPER::configure ($x, $y, $w, $h);
2161 2131
2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2163 for @{$self->{children}}; 2132 for my $child (@{$self->{children}}) {
2133 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2134
2135 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2136 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2137 $child->configure ($X, $Y, $W,$H);
2138 }
2164} 2139}
2165 2140
2166sub _topleft { 2141sub _topleft {
2167 my ($self, $x, $y) = @_; 2142 my ($self, $x, $y) = @_;
2168 2143
… …
2176 ::refresh (); 2151 ::refresh ();
2177} 2152}
2178 2153
2179sub add { 2154sub add {
2180 my ($self, $child) = @_; 2155 my ($self, $child) = @_;
2156
2157 # integerize window positions
2158 $child->{x} = int $child->{x};
2159 $child->{y} = int $child->{y};
2181 2160
2182 $self->SUPER::add ($child); 2161 $self->SUPER::add ($child);
2183} 2162}
2184 2163
2185sub on_refresh { 2164sub on_refresh {

Diff Legend

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