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.151 by root, Sun Apr 23 00:57:39 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 $TOOLTIP->set_text ($widget->{tooltip});
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $TOOLTIP->show;
26 }
27
28 return;
29 }
30 }
31 }
32
33 $TOOLTIP->hide;
34 delete $TOOLTIP->{owner};
35}
14 36
15# class methods for events 37# class methods for events
16sub feed_sdl_key_down_event { 38sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 39 $FOCUS->key_down ($_[0]) if $FOCUS;
18} 40}
… …
21 $FOCUS->key_up ($_[0]) if $FOCUS; 43 $FOCUS->key_up ($_[0]) if $FOCUS;
22} 44}
23 45
24sub feed_sdl_button_down_event { 46sub feed_sdl_button_down_event {
25 my ($ev) = @_; 47 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 48 my ($x, $y) = ($ev->{x}, $ev->{y});
27 49
28 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 51 my $widget = $ROOT->find_widget ($x, $y);
30 52
31 $GRAB = $widget; 53 $GRAB = $widget;
32 $GRAB->update if $GRAB; 54 $GRAB->update if $GRAB;
33 }
34 55
56 check_tooltip;
57 }
58
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 59 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 60
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 62}
39 63
40sub feed_sdl_button_up_event { 64sub feed_sdl_button_up_event {
41 my ($ev) = @_; 65 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
43 67
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 68 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 69
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 71
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 73
50 if (!$BUTTON_STATE) { 74 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 75 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 76 $grab->update if $grab;
53 $GRAB->update if $GRAB; 77 $GRAB->update if $GRAB;
78
79 check_tooltip;
54 } 80 }
55} 81}
56 82
57sub feed_sdl_motion_event { 83sub feed_sdl_motion_event {
58 my ($ev) = @_; 84 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
60 86
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 88
63 if ($widget != $HOVER) { 89 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
65 91
66 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
94
95 check_tooltip;
68 } 96 }
69 97
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71} 99}
72 100
… …
87 115
88package CFClient::UI::Base; 116package CFClient::UI::Base;
89 117
90use strict; 118use strict;
91 119
92use SDL::OpenGL; 120use CFClient::OpenGL;
93 121
94sub new { 122sub new {
95 my $class = shift; 123 my $class = shift;
96 124
97 my $self = bless { 125 my $self = bless {
98 x => 0, 126 x => 0,
99 y => 0, 127 y => 0,
100 z => 0, 128 z => 0,
101 w => -1, 129 can_events => 1,
102 h => -1,
103 @_ 130 @_
104 }, $class; 131 }, $class;
105 132
106 for (keys %$self) { 133 for (keys %$self) {
107 if (/^connect_(.*)$/) { 134 if (/^connect_(.*)$/) {
… …
110 } 137 }
111 138
112 $self 139 $self
113} 140}
114 141
142sub show {
143 my ($self) = @_;
144
145 return if $self->{parent};
146
147 $CFClient::UI::ROOT->add ($self);
148}
149
150sub hide {
151 my ($self) = @_;
152
153 return unless $self->{parent};
154
155 $self->{parent}->remove ($self);
156}
157
115sub move { 158sub move {
116 my ($self, $x, $y, $z) = @_; 159 my ($self, $x, $y, $z) = @_;
117 160
118 $self->{x} = int $x; 161 $self->{x} = int $x;
119 $self->{y} = int $y; 162 $self->{y} = int $y;
… …
126 0 169 0
127} 170}
128 171
129sub size_request { 172sub size_request {
130 require Carp; 173 require Carp;
131 Carp::confess "size_request is abtract"; 174 Carp::confess "size_request is abstract";
132} 175}
133 176
134sub configure { 177sub configure {
135 my ($self, $x, $y, $w, $h) = @_; 178 my ($self, $x, $y, $w, $h) = @_;
136 179
180 if ($self->{aspect}) {
181 my $w2 = List::Util::min $w, int $h * $self->{aspect};
182 my $h2 = List::Util::min $h, int $w / $self->{aspect};
183
184 # use alignment to adjust x, y
185
186 $x += int +($w - $w2) * 0.5;
187 $y += int +($h - $h2) * 0.5;
188
189 ($w, $h) = ($w2, $h2);
190 }
191
192 if ($self->{x} != $x || $self->{y} != $y) {
137 $self->{x} = $x; 193 $self->{x} = $x;
138 $self->{y} = $y; 194 $self->{y} = $y;
195 $self->update;
196 }
139 197
140 return unless $self->{w} != $w || $self->{h} != $h; 198 if ($self->{w} != $w || $self->{h} != $h) {
141
142 $self->{w} = $w; 199 $self->{w} = $w;
143 $self->{h} = $h; 200 $self->{h} = $h;
144 201
145 $self->size_allocate ($w, $h); 202 $self->size_allocate ($w, $h);
203 $self->update;
204 }
146} 205}
147 206
148sub size_allocate { 207sub size_allocate {
149 # nothing to be done 208 # nothing to be done
150} 209}
… …
248} 307}
249 308
250sub find_widget { 309sub find_widget {
251 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
252 311
312 return () unless $self->{can_events};
313
253 return $self 314 return $self
254 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 315 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 316 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
256 317
257 () 318 ()
… …
264} 325}
265 326
266sub check_size { 327sub check_size {
267 my ($self) = @_; 328 my ($self) = @_;
268 329
330 return unless $self->{parent};
331
269 my ($w, $h) = $self->size_request; 332 my ($w, $h) = $self->size_request;
270 333
271 if ($w != $self->{req_w} || $h != $self->{req_h}) { 334 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w; 335 $self->{req_w} = $w;
273 $self->{req_h} = $h; 336 $self->{req_h} = $h;
274 337
275 $self->{parent}->check_size 338 $self->{parent}->check_size;
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 } 339 }
281} 340}
282 341
283sub update { 342sub update {
284 my ($self) = @_; 343 my ($self) = @_;
… …
312package CFClient::UI::DrawBG; 371package CFClient::UI::DrawBG;
313 372
314our @ISA = CFClient::UI::Base::; 373our @ISA = CFClient::UI::Base::;
315 374
316use strict; 375use strict;
317use SDL::OpenGL; 376use CFClient::OpenGL;
318 377
319sub new { 378sub new {
320 my $class = shift; 379 my $class = shift;
321 380
322 # range [value, low, high, page] 381 # range [value, low, high, page]
… …
351 410
352package CFClient::UI::Empty; 411package CFClient::UI::Empty;
353 412
354our @ISA = CFClient::UI::Base::; 413our @ISA = CFClient::UI::Base::;
355 414
415sub new {
416 my ($class, %arg) = @_;
417 $class->SUPER::new (can_events => 0, %arg);
418}
419
356sub size_request { 420sub size_request {
357 (0, 0) 421 (0, 0)
358} 422}
359 423
360sub draw { } 424sub draw { }
… …
368sub new { 432sub new {
369 my ($class, %arg) = @_; 433 my ($class, %arg) = @_;
370 434
371 my $children = delete $arg{children} || []; 435 my $children = delete $arg{children} || [];
372 436
373 my $self = $class->SUPER::new (children => [], %arg); 437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
374 $self->add ($_) for @$children; 438 $self->add ($_) for @$children;
375 439
376 $self 440 $self
377} 441}
378 442
… …
386 $self->{children} = [ 450 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 451 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 452 @{$self->{children}}, $child
389 ]; 453 ];
390 454
391 $self->{w} = $self->{h} = -1;
392
393 $child->check_size; 455 $child->check_size;
394} 456}
395 457
396sub remove { 458sub remove {
397 my ($self, $widget) = @_; 459 my ($self, $child) = @_;
398 460
461 delete $child->{parent};
462
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 464
401 $self->check_size; 465 $self->check_size;
466 $self->update;
402} 467}
403 468
404sub find_widget { 469sub find_widget {
405 my ($self, $x, $y) = @_; 470 my ($self, $x, $y) = @_;
406 471
… …
436 501
437 $class->SUPER::new (children => [$child], %arg) 502 $class->SUPER::new (children => [$child], %arg)
438} 503}
439 504
440sub add { 505sub add {
441 my ($self, $widget) = @_; 506 my ($self, $child) = @_;
442 507
443 $self->{children} = []; 508 $self->{children} = [];
444 509
445 $self->SUPER::add ($widget); 510 $self->SUPER::add ($child);
446} 511}
447 512
448sub remove { 513sub remove {
449 my ($self, $widget) = @_; 514 my ($self, $widget) = @_;
450 515
… …
470 535
471package CFClient::UI::Window; 536package CFClient::UI::Window;
472 537
473our @ISA = CFClient::UI::Bin::; 538our @ISA = CFClient::UI::Bin::;
474 539
475use SDL::OpenGL; 540use CFClient::OpenGL;
476 541
477sub new { 542sub new {
478 my ($class, %arg) = @_; 543 my ($class, %arg) = @_;
479 544
480 my $self = $class->SUPER::new (%arg); 545 my $self = $class->SUPER::new (%arg);
… …
534sub new { die } 599sub new { die }
535 600
536sub size_request { 601sub size_request {
537 my ($self) = @_; 602 my ($self) = @_;
538 603
539 @$self{qw(child_w child_h)} = $self->child->size_request; 604 @$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)}); 605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541 606
542 @$self{qw(child_w child_h)} 607 @$self{qw(child_w child_h)}
543} 608}
544 609
… …
553 618
554package CFClient::UI::Frame; 619package CFClient::UI::Frame;
555 620
556our @ISA = CFClient::UI::Bin::; 621our @ISA = CFClient::UI::Bin::;
557 622
558use SDL::OpenGL; 623use 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 624
606sub new { 625sub new {
607 my $class = shift; 626 my $class = shift;
608 627
609 # TODO: user_x, user_y, overwrite moveto?
610
611 $class->SUPER::new ( 628 my $self = $class->SUPER::new (
612 bg => [1, 1, 1, 1], 629 bg => [1, 1, 1, 1],
613 border_bg => [1, 1, 1, 1], 630 border_bg => [1, 1, 1, 1],
614 border => int $::FONTSIZE * 0.8, 631 border => 0.8,
615 @_ 632 @_
616 ) 633 );
634
635 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
617} 643}
618 644
619sub size_request { 645sub size_request {
620 my ($self) = @_; 646 my ($self) = @_;
621 647 ($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} 648}
631 649
632sub size_allocate { 650sub size_allocate {
633 my ($self, $w, $h) = @_; 651 my ($self, $w, $h) = @_;
652 $self->{w} = $w;
653 $self->{h} = $h;
654 $self->child->configure (0, 0, $w, $h);
655}
634 656
657sub _draw {
658 my ($self) = @_;
659
660 my ($w, $h) = ($self->{w}, $self->{h});
661
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666
667# glBegin GL_QUADS;
668# glColor 0, 0, 0, 0;
669# glVertex 0 , 0;
670# glVertex 0 , $h;
671# glVertex $w, $h;
672# glVertex $w, 0;
673# glEnd;
674
675
676 $self->child->draw;
677 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D;
679}
680
681#############################################################################
682
683package CFClient::UI::FancyFrame;
684
685our @ISA = CFClient::UI::Bin::;
686
687use CFClient::OpenGL;
688
689my @tex =
690 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
691 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
692
693sub new {
694 my $class = shift;
695
696 # TODO: user_x, user_y, overwrite moveto?
697
698 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1],
701 border => 0.8,
702 can_events => 1,
703 @_
704 );
705
706 $self->{title} &&= new CFClient::UI::Label
707 align => 0,
708 valign => 1,
709 text => $self->{title},
710 fontsize => 1;
711
712 $self
713}
714
715sub border {
716 int $_[0]{border} * $::FONTSIZE
717}
718
719sub size_request {
720 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723
724 my ($w, $h) = $self->SUPER::size_request;
725
726 (
727 $w + $self->border * 2,
728 $h + $self->border * 2,
729 )
730}
731
732sub size_allocate {
733 my ($self, $w, $h) = @_;
734
635 $h -= List::Util::max 0, $self->{border} * 2; 735 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 736 $w -= List::Util::max 0, $self->border * 2;
637 737
738 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
739 if $self->{title};
740
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 741 $self->child->configure ($self->border, $self->border, $w, $h);
639} 742}
640 743
641sub button_down { 744sub button_down {
642 my ($self, $ev, $x, $y) = @_; 745 my ($self, $ev, $x, $y) = @_;
643 746
747 my $border = $self->border;
748
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 749 if ($x < $self->{w} && $x >= $self->{w} - $border
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 750 && $y < $self->{h} && $y >= $self->{h} - $border) {
646 751
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 752 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 753 my ($bw, $bh) = ($self->{w}, $self->{h});
649 754
650 $self->{motion} = sub { 755 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 756 my ($ev, $x, $y) = @_;
652 757
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 758 ($x, $y) = ($ev->{x}, $ev->{y});
654 759
655 $self->{user_w} = $bw + $x - $ox; 760 $self->{user_w} = $bw + $x - $ox;
656 $self->{user_h} = $bh + $y - $oy; 761 $self->{user_h} = $bh + $y - $oy;
657 $self->check_size; 762 $self->check_size;
658 }; 763 };
659 764
660 } elsif ($x >= 0 && $x < $self->{w} 765 } elsif ($x >= 0 && $x < $self->{w}
661 && $y >= 0 && $y < $self->{border}) { 766 && $y >= 0 && $y < $border) {
662 767
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 768 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 769 my ($bx, $by) = ($self->{x}, $self->{y});
665 770
666 $self->{motion} = sub { 771 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 772 my ($ev, $x, $y) = @_;
668 773
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 774 ($x, $y) = ($ev->{x}, $ev->{y});
670 775
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 776 $self->move ($bx + $x - $ox, $by + $y - $oy);
672 $self->update; 777 $self->update;
673 }; 778 };
674 } 779 }
… …
695 glEnable GL_BLEND; 800 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 802 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 804
805 my $border = $self->border;
806
700 glColor @{ $self->{border_bg} }; 807 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 808 $tex[1]->draw_quad (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 809 $tex[3]->draw_quad (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 811 $tex[4]->draw_quad (0, $h - $border, $w, $border);
705 812
706 my $bg = $tex[0]; 813 my $bg = $tex[0];
707 814
708 # TODO: repeat texture not scale 815 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 816 my $rep_x = $cw / $bg->{w};
… …
712 glColor @{ $self->{bg} }; 819 glColor @{ $self->{bg} };
713 820
714 $bg->{s} = $rep_x; 821 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y; 822 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1; 823 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 824 $bg->draw_quad ($border, $border, $cw, $ch);
718 825
719 glDisable GL_TEXTURE_2D; 826 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 827 glDisable GL_BLEND;
721 828
829 $self->{title}->draw if $self->{title};
722 $self->child->draw; 830 $self->child->draw;
723} 831}
724 832
725############################################################################# 833#############################################################################
726 834
… …
728 836
729our @ISA = CFClient::UI::Base::; 837our @ISA = CFClient::UI::Base::;
730 838
731use List::Util qw(max sum); 839use List::Util qw(max sum);
732 840
733use SDL::OpenGL; 841use CFClient::OpenGL;
734 842
735sub new { 843sub new {
736 my $class = shift; 844 my $class = shift;
737 845
738 $class->SUPER::new ( 846 $class->SUPER::new (
… …
745 my ($self, $x, $y, $child) = @_; 853 my ($self, $x, $y, $child) = @_;
746 854
747 $child->set_parent ($self); 855 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 856 $self->{children}[$y][$x] = $child;
749 857
750 $self->{w} = $self->{h} = -1;
751
752 $child->check_size; 858 $child->check_size;
753} 859}
754 860
755# TODO: move to container class maybe? send childs a signal on removal? 861# TODO: move to container class maybe? send childs a signal on removal?
756sub clear { 862sub clear {
… …
770 or next; 876 or next;
771 877
772 for my $x (0 .. $#$row) { 878 for my $x (0 .. $#$row) {
773 my $widget = $row->[$x] 879 my $widget = $row->[$x]
774 or next; 880 or next;
775 my ($w, $h) = $widget->size_request; 881 my ($w, $h) = @$widget{qw(req_w req_h)};
776 882
777 $w[$x] = max $w[$x], $w; 883 $w[$x] = max $w[$x], $w;
778 $h[$y] = max $h[$y], $h; 884 $h[$y] = max $h[$y], $h;
779 } 885 }
780 } 886 }
… …
885 991
886 ($h, $w) = ($w, $h); 992 ($h, $w) = ($w, $h);
887 993
888 my $children = $self->{children}; 994 my $children = $self->{children};
889 995
890 my @h = map +($_->size_request)[0], @$children; 996 my @h = map $_->{req_w}, @$children;
891 997
892 my $req_h = List::Util::sum @h; 998 my $req_h = List::Util::sum @h;
893 999
894 if ($req_h > $h) { 1000 if ($req_h > $h) {
895 # ah well, not enough space 1001 # ah well, not enough space
… …
943sub size_allocate { 1049sub size_allocate {
944 my ($self, $w, $h) = @_; 1050 my ($self, $w, $h) = @_;
945 1051
946 my $children = $self->{children}; 1052 my $children = $self->{children};
947 1053
948 my @h = map +($_->size_request)[1], @$children; 1054 my @h = map $_->{req_h}, @$children;
949 1055
950 my $req_h = List::Util::sum @h; 1056 my $req_h = List::Util::sum @h;
951 1057
952 if ($req_h > $h) { 1058 if ($req_h > $h) {
953 # ah well, not enough space 1059 # ah well, not enough space
… …
981 1087
982package CFClient::UI::Label; 1088package CFClient::UI::Label;
983 1089
984our @ISA = CFClient::UI::Base::; 1090our @ISA = CFClient::UI::Base::;
985 1091
986use SDL::OpenGL; 1092use CFClient::OpenGL;
987 1093
988sub new { 1094sub new {
989 my ($class, %arg) = @_; 1095 my ($class, %arg) = @_;
990 1096
991 my $self = $class->SUPER::new ( 1097 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1098 fg => [1, 1, 1],
993 fontsize => $::FONTSIZE, 1099 fontsize => 1,
994 text => "", 1100 text => "",
995 align => -1, 1101 align => -1,
996 valign => -1, 1102 valign => -1,
997 padding => 2, 1103 padding => 2,
998 layout => new CFClient::Layout, 1104 layout => new CFClient::Layout,
1105 can_events => 0,
999 %arg 1106 %arg
1000 ); 1107 );
1001 1108
1002 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1109 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout;
1113 }
1003 1114
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1115 $self->set_text (delete $self->{text}) if exists $self->{text};
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006 1117
1007 $self 1118 $self
… …
1021 my ($self, $text) = @_; 1132 my ($self, $text) = @_;
1022 1133
1023 $self->{layout}->set_text ($text); 1134 $self->{layout}->set_text ($text);
1024 1135
1025 delete $self->{texture}; 1136 delete $self->{texture};
1137 $self->check_size;
1026 $self->update; 1138 $self->update;
1027} 1139}
1028 1140
1029sub set_markup { 1141sub set_markup {
1030 my ($self, $markup) = @_; 1142 my ($self, $markup) = @_;
1031 1143
1032 $self->{layout}->set_markup ($markup); 1144 $self->{layout}->set_markup ($markup);
1033 1145
1034 delete $self->{texture}; 1146 delete $self->{texture};
1147 $self->check_size;
1035 $self->update; 1148 $self->update;
1036} 1149}
1037 1150
1038sub size_request { 1151sub size_request {
1039 my ($self) = @_; 1152 my ($self) = @_;
1040 1153
1041 $self->{layout}->set_width; 1154 $self->{layout}->set_width;
1042 $self->{layout}->set_height ($self->{fontsize}); 1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1156
1044 my ($w, $h) = $self->{layout}->size; 1157 my ($w, $h) = $self->{layout}->size;
1158
1159 if (exists $self->{template}) {
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161
1162 my ($w2, $h2) = $self->{template}->size;
1163
1164 $w = List::Util::max $w, $w2;
1165 $h = List::Util::max $h, $h2;
1166 }
1045 1167
1046 ( 1168 (
1047 $w + $self->{padding} * 2, 1169 $w + $self->{padding} * 2,
1048 $h + $self->{padding} * 2, 1170 $h + $self->{padding} * 2,
1049 ) 1171 )
… …
1053 my ($self, $w, $h) = @_; 1175 my ($self, $w, $h) = @_;
1054 1176
1055 delete $self->{texture}; 1177 delete $self->{texture};
1056} 1178}
1057 1179
1058sub update { 1180sub set_fontsize {
1059 my ($self) = @_; 1181 my ($self, $fontsize) = @_;
1060 1182
1061 delete $self->{texture}; 1183 $self->{fontsize} = $fontsize;
1062 $self->SUPER::update; 1184 $self->check_size;
1063} 1185}
1064 1186
1065sub _draw { 1187sub _draw {
1066 my ($self) = @_; 1188 my ($self) = @_;
1067 1189
1068 my $tex = $self->{texture} ||= do { 1190 my $tex = $self->{texture} ||= do {
1069 $self->{layout}->set_width ($self->{w}); 1191 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1192 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071 new_from_layout CFClient::Texture $self->{layout} 1193 new_from_layout CFClient::Texture $self->{layout}
1072 }; 1194 };
1073 1195
1074 glEnable GL_BLEND; 1196 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1100 1222
1101package CFClient::UI::EntryBase; 1223package CFClient::UI::EntryBase;
1102 1224
1103our @ISA = CFClient::UI::Label::; 1225our @ISA = CFClient::UI::Label::;
1104 1226
1105use SDL; 1227use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1228
1108sub new { 1229sub new {
1109 my $class = shift; 1230 my $class = shift;
1110 1231
1111 $class->SUPER::new ( 1232 $class->SUPER::new (
… …
1114 active_bg => [1, 1, 1, 0.5], 1235 active_bg => [1, 1, 1, 0.5],
1115 active_fg => [0, 0, 0], 1236 active_fg => [0, 0, 0],
1116 can_hover => 1, 1237 can_hover => 1,
1117 can_focus => 1, 1238 can_focus => 1,
1118 valign => 0, 1239 valign => 0,
1240 can_events => 1,
1119 @_ 1241 @_
1120 ) 1242 )
1121} 1243}
1122 1244
1123sub _set_text { 1245sub _set_text {
… …
1125 1247
1126 delete $self->{cur_h}; 1248 delete $self->{cur_h};
1127 1249
1128 return if $self->{text} eq $text; 1250 return if $self->{text} eq $text;
1129 1251
1252 delete $self->{texture};
1253
1130 $self->{last_activity} = $::NOW; 1254 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1255 $self->{text} = $text;
1132 1256
1133 $text =~ s/./*/g if $self->{hidden}; 1257 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1258 $self->{layout}->set_text ("$text ");
… …
1149} 1273}
1150 1274
1151sub size_allocate { 1275sub size_allocate {
1152 my ($self, $w, $h) = @_; 1276 my ($self, $w, $h) = @_;
1153 1277
1154 $self->_set_text ($self->{text}); 1278 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155} 1279}
1156 1280
1157sub set_text { 1281sub set_text {
1158 my ($self, $text) = @_; 1282 my ($self, $text) = @_;
1159 1283
… …
1163} 1287}
1164 1288
1165sub key_down { 1289sub key_down {
1166 my ($self, $ev) = @_; 1290 my ($self, $ev) = @_;
1167 1291
1168 my $mod = $ev->key_mod; 1292 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1293 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1294 my $uni = $ev->{unicode};
1172 1295
1173 my $text = $self->get_text; 1296 my $text = $self->get_text;
1174 1297
1175 if ($sym == SDLK_BACKSPACE) { 1298 if ($sym == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1299 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1300 } elsif ($sym == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1301 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1302 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1303 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1304 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1305 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1306 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1307 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1308 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1309 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1310 } elsif ($sym == 27) {
1188 $self->emit ('escape'); 1311 $self->emit ('escape');
1189 } elsif ($uni) { 1312 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1313 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1314 }
1192 1315
… …
1267 1390
1268package CFClient::UI::Entry; 1391package CFClient::UI::Entry;
1269 1392
1270our @ISA = CFClient::UI::EntryBase::; 1393our @ISA = CFClient::UI::EntryBase::;
1271 1394
1272use SDL; 1395use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1396
1275sub key_down { 1397sub key_down {
1276 my ($self, $ev) = @_; 1398 my ($self, $ev) = @_;
1277 1399
1278 my $sym = $ev->key_sym; 1400 my $sym = $ev->{sym};
1279 1401
1280 if ($sym == SDLK_RETURN) { 1402 if ($sym == 13) {
1281 $self->emit (activate => $self->get_text); 1403 $self->emit (activate => $self->get_text);
1282 $self->update; 1404 $self->update;
1283 1405
1284 } else { 1406 } else {
1285 $self->SUPER::key_down ($ev); 1407 $self->SUPER::key_down ($ev);
… …
1291 1413
1292package CFClient::UI::Button; 1414package CFClient::UI::Button;
1293 1415
1294our @ISA = CFClient::UI::Label::; 1416our @ISA = CFClient::UI::Label::;
1295 1417
1296use SDL; 1418use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1419
1299my @tex = 1420my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1421 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1422 qw(b1_button_active.png);
1302 1423
1303sub new { 1424sub new {
1304 my $class = shift; 1425 my $class = shift;
1305 1426
… …
1309 bg => [1, 1, 1, 0.2], 1430 bg => [1, 1, 1, 0.2],
1310 active_fg => [0, 0, 1], 1431 active_fg => [0, 0, 1],
1311 can_hover => 1, 1432 can_hover => 1,
1312 align => 0, 1433 align => 0,
1313 valign => 0, 1434 valign => 0,
1435 can_events => 1,
1314 @_ 1436 @_
1315 ) 1437 )
1316} 1438}
1317 1439
1318sub button_up { 1440sub button_up {
… …
1352package CFClient::UI::CheckBox; 1474package CFClient::UI::CheckBox;
1353 1475
1354our @ISA = CFClient::UI::DrawBG::; 1476our @ISA = CFClient::UI::DrawBG::;
1355 1477
1356my @tex = 1478my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1479 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1480 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359 1481
1360use SDL; 1482use CFClient::OpenGL;
1361use SDL::OpenGL;
1362 1483
1363sub new { 1484sub new {
1364 my $class = shift; 1485 my $class = shift;
1365 1486
1366 $class->SUPER::new ( 1487 $class->SUPER::new (
… …
1412 glDisable GL_BLEND; 1533 glDisable GL_BLEND;
1413} 1534}
1414 1535
1415############################################################################# 1536#############################################################################
1416 1537
1417package CFClient::UI::VGauge; 1538package CFClient::UI::Image;
1418 1539
1419our @ISA = CFClient::UI::Base::; 1540our @ISA = CFClient::UI::Base::;
1420 1541
1421use SDL::OpenGL; 1542use CFClient::OpenGL;
1543use Carp qw/confess/;
1422 1544
1423my %tex = ( 1545our %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 1546
1442# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new { 1547sub new {
1444 my $class = shift; 1548 my $class = shift;
1445 1549
1446 my $self = $class->SUPER::new (gauge => 'food', @_); 1550 my $self = $class->SUPER::new (can_events => 0, @_);
1551
1552 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1553
1554 $loaded_images{$self->{image}} ||=
1555 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1556
1557 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1558
1559 Scalar::Util::weaken $loaded_images{$self->{image}};
1560
1561 $self->{aspect} = $tex->{w} / $tex->{h};
1447 1562
1448 $self 1563 $self
1449} 1564}
1450 1565
1451sub size_request { 1566sub size_request {
1452 my ($self) = @_; 1567 my ($self) = @_;
1453 1568
1454 my $tex = $tex{$self->{gauge}}[0]; 1569 ($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} 1570}
1476 1571
1477sub _draw { 1572sub _draw {
1478 my ($self) = @_; 1573 my ($self) = @_;
1479 1574
1480 my $tex = $tex{$self->{gauge}}; 1575 my $tex = $self->{tex};
1481 1576
1482 my ($w, $h) = ($self->{w}, $self->{h}); 1577 my ($w, $h) = ($self->{w}, $self->{h});
1483 1578
1484 my $ycut = $self->{val} / ($self->{max_val} || 1); 1579 if ($self->{rot90}) {
1485 $ycut = 1 if $self->{val} > $self->{max_val}; 1580 glRotate 90, 0, 0, 1;
1581 glTranslate 0, -$self->{w}, 0;
1486 1582
1487 my $t1 = $tex->[0]; 1583 ($w, $h) = ($h, $w);
1488 my $t2 = $tex->[1]; 1584 }
1489 1585
1490 glEnable GL_BLEND; 1586 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1587 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1588 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1589 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1590
1591 $tex->draw_quad (0, 0, $w, $h);
1592
1593 glDisable GL_BLEND;
1594 glDisable GL_TEXTURE_2D;
1595}
1596
1597#############################################################################
1598
1599package CFClient::UI::VGauge;
1600
1601our @ISA = CFClient::UI::Base::;
1602
1603use CFClient::OpenGL;
1604
1605my %tex = (
1606 food => [
1607 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1608 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1609 ],
1610 grace => [
1611 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1612 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1613 ],
1614 hp => [
1615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1616 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1617 ],
1618 mana => [
1619 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1620 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1621 ],
1622);
1623
1624# eg. VGauge->new (gauge => 'food'), default gauge: food
1625sub new {
1626 my $class = shift;
1627
1628 my $self = $class->SUPER::new (
1629 type => 'food',
1630 @_
1631 );
1632
1633 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1634
1635 $self
1636}
1637
1638sub size_request {
1639 my ($self) = @_;
1640
1641 #my $tex = $tex{$self->{type}}[0];
1642 #@$tex{qw(w h)}
1643 (0, 0)
1644}
1645
1646sub set_max {
1647 my ($self, $max) = @_;
1648
1649 $self->{max_val} = $max;
1650}
1651
1652sub set_value {
1653 my ($self, $val, $max) = @_;
1654
1655 $self->set_max ($max)
1656 if defined $max;
1657
1658 $max = $self->{max_val};
1659 $self->{val} = $val;
1660
1661 $self->update;
1662}
1663
1664sub _draw {
1665 my ($self) = @_;
1666
1667 my $tex = $tex{$self->{type}};
1668
1669 my ($w, $h) = ($self->{w}, $self->{h});
1670
1671 if ($self->{vertical}) {
1672 glRotate 90, 0, 0, 1;
1673 glTranslate 0, -$self->{w}, 0;
1674
1675 ($w, $h) = ($h, $w);
1676 }
1677
1678 my $ycut = $self->{val} / ($self->{max_val} || 1);
1679 $ycut = 1 if $self->{val} > $self->{max_val};
1680
1681 my $t1 = $tex->[0];
1682 my $t2 = $tex->[1];
1683
1684 glEnable GL_BLEND;
1685 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1686 glEnable GL_TEXTURE_2D;
1687 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1688
1495 my $h1 = $self->{h} - $ycut * $self->{h}; 1689 my $h1 = $self->{h} - $ycut * $self->{h};
1496 my $h2 = $ycut * $self->{h}; 1690 my $h2 = $ycut * $self->{h};
1497 1691
1498 my $yp = 0;
1499
1500 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1692 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS; 1693 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp; 1694 glTexCoord 0 , 0; glVertex 0 , 0;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1695 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1696 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1697 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506 glEnd; 1698 glEnd;
1507
1508 $yp += $h1;
1509 1699
1510 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1700 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS; 1701 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1702 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1703 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1514 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2; 1704 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1515 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1705 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1516 glEnd; 1706 glEnd;
1517 1707
1518 glDisable GL_BLEND; 1708 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1709 glDisable GL_TEXTURE_2D;
1520} 1710}
1521 1711
1522############################################################################# 1712#############################################################################
1523 1713
1714package CFClient::UI::Gauge;
1715
1716our @ISA = CFClient::UI::VBox::;
1717
1718sub new {
1719 my ($class, %arg) = @_;
1720
1721 my $self = $class->SUPER::new (
1722 tooltip => $arg{type},
1723 %arg,
1724 );
1725
1726 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1727 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1728 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1729
1730 $self
1731}
1732
1733sub set_fontsize {
1734 my ($self, $fsize) = @_;
1735
1736 $self->{value}->set_fontsize ($fsize);
1737 $self->{max} ->set_fontsize ($fsize);
1738}
1739
1740sub set_value {
1741 my ($self, $val, $max) = @_;
1742
1743 $self->set_max ($max)
1744 if defined $max;
1745
1746 $self->{gauge}->set_value ($val, $max);
1747 $self->{value}->set_text ($val);
1748}
1749
1750sub set_max {
1751 my ($self, $max) = @_;
1752
1753 $self->{gauge}->set_max ($max);
1754 $self->{max}->set_text ($max);
1755}
1756
1757#############################################################################
1758
1524package CFClient::UI::Slider; 1759package CFClient::UI::Slider;
1525 1760
1526use strict; 1761use strict;
1527 1762
1528use SDL::OpenGL; 1763use CFClient::OpenGL;
1529 1764
1530our @ISA = CFClient::UI::DrawBG::; 1765our @ISA = CFClient::UI::DrawBG::;
1531 1766
1532my @tex = 1767my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1768 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1543 # TODO: calculations are off 1778 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 1779 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 1780 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 1781 active_fg => [0, 0, 0],
1547 range => [0, 0, 100, 10], 1782 range => [0, 0, 100, 10],
1548 req_w => 40, 1783 req_w => 20,
1549 req_h => 13, 1784 req_h => 20,
1550 vertical => 0, 1785 vertical => 0,
1551 can_hover => 1, 1786 can_hover => 1,
1552 inner_pad => 5, 1787 inner_pad => 5,
1553 @_ 1788 @_
1554 ); 1789 );
… …
1658 1893
1659package CFClient::UI::TextView; 1894package CFClient::UI::TextView;
1660 1895
1661our @ISA = CFClient::UI::HBox::; 1896our @ISA = CFClient::UI::HBox::;
1662 1897
1663use SDL::OpenGL; 1898use CFClient::OpenGL;
1664 1899
1665sub new { 1900sub new {
1666 my $class = shift; 1901 my $class = shift;
1667 1902
1668 my $self = $class->SUPER::new ( 1903 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6,
1670 req_h => $::HEIGHT / 6,
1671 fontsize => $::FONTSIZE, 1904 fontsize => 1,
1672 @_, 1905 @_,
1673 1906
1674 layout => (new CFClient::Layout), 1907 layout => (new CFClient::Layout),
1675 par => [], 1908 par => [],
1676 height => 0, 1909 height => 0,
… …
1697sub text_height { 1930sub text_height {
1698 my ($self, $text) = @_; 1931 my ($self, $text) = @_;
1699 1932
1700 my $layout = $self->{layout}; 1933 my $layout = $self->{layout};
1701 1934
1702 $layout->set_height ($self->{fontsize}); 1935 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 1936 $layout->set_width ($self->{w});
1704 $layout->set_text ($text); 1937 $layout->set_text ($text);
1705 1938
1706 ($layout->size)[1] 1939 ($layout->size)[1]
1707} 1940}
… …
1711 1944
1712 $self->{need_reflow}++; 1945 $self->{need_reflow}++;
1713 $self->update; 1946 $self->update;
1714} 1947}
1715 1948
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate { 1949sub size_allocate {
1723 my ($self, $w, $h) = @_; 1950 my ($self, $w, $h) = @_;
1724 1951
1952 $self->SUPER::size_allocate ($w, $h);
1953
1725 $self->{layout}->set_height ($self->{fontsize}); 1954 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726 $self->{layout}->set_width ($self->{w}); 1955 $self->{layout}->set_width ($self->{children}[0]{w});
1727 1956
1728 $self->reflow; 1957 $self->reflow;
1729 $self->update;
1730} 1958}
1731 1959
1732sub add_paragraph { 1960sub add_paragraph {
1733 my ($self, $color, $text) = @_; 1961 my ($self, $color, $text) = @_;
1734 1962
… …
1819 2047
1820} 2048}
1821 2049
1822############################################################################# 2050#############################################################################
1823 2051
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; 2052package CFClient::UI::Animator;
2061 2053
2062use SDL::OpenGL; 2054use CFClient::OpenGL;
2063 2055
2064our @ISA = CFClient::UI::Bin::; 2056our @ISA = CFClient::UI::Bin::;
2065 2057
2066sub moveto { 2058sub moveto {
2067 my ($self, $x, $y) = @_; 2059 my ($self, $x, $y) = @_;
… …
2107 my $class = shift; 2099 my $class = shift;
2108 2100
2109 my $self = $class->SUPER::new ( 2101 my $self = $class->SUPER::new (
2110 state => 0, 2102 state => 0,
2111 connect_activate => \&toggle_flopper, 2103 connect_activate => \&toggle_flopper,
2104 can_events => 1,
2112 @_ 2105 @_
2113 ); 2106 );
2114 2107
2115 if ($self->{state}) { 2108 if ($self->{state}) {
2116 $self->{state} = 0; 2109 $self->{state} = 0;
… …
2140 2133
2141package CFClient::UI::Root; 2134package CFClient::UI::Root;
2142 2135
2143our @ISA = CFClient::UI::Container::; 2136our @ISA = CFClient::UI::Container::;
2144 2137
2145use SDL::OpenGL; 2138use CFClient::OpenGL;
2146 2139
2147sub check_size { 2140sub check_size {
2148 my ($self) = @_; 2141 my ($self) = @_;
2149 2142
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 2143 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2151} 2144}
2152 2145
2153sub size_request { 2146sub size_request {
2154 ($::WIDTH, $::HEIGHT) 2147 ($::WIDTH, $::HEIGHT)
2155} 2148}
… …
2157sub configure { 2150sub configure {
2158 my ($self, $x, $y, $w, $h) = @_; 2151 my ($self, $x, $y, $w, $h) = @_;
2159 2152
2160 $self->SUPER::configure ($x, $y, $w, $h); 2153 $self->SUPER::configure ($x, $y, $w, $h);
2161 2154
2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2163 for @{$self->{children}}; 2155 for my $child (@{$self->{children}}) {
2156 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2157
2158 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2159 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2160 $child->configure ($X, $Y, $W,$H);
2161 }
2164} 2162}
2165 2163
2166sub _topleft { 2164sub _topleft {
2167 my ($self, $x, $y) = @_; 2165 my ($self, $x, $y) = @_;
2168 2166
… …
2176 ::refresh (); 2174 ::refresh ();
2177} 2175}
2178 2176
2179sub add { 2177sub add {
2180 my ($self, $child) = @_; 2178 my ($self, $child) = @_;
2179
2180 # integerize window positions
2181 $child->{x} = int $child->{x};
2182 $child->{y} = int $child->{y};
2181 2183
2182 $self->SUPER::add ($child); 2184 $self->SUPER::add ($child);
2183} 2185}
2184 2186
2185sub on_refresh { 2187sub on_refresh {
… …
2211############################################################################# 2213#############################################################################
2212 2214
2213package CFClient::UI; 2215package CFClient::UI;
2214 2216
2215$ROOT = new CFClient::UI::Root; 2217$ROOT = new CFClient::UI::Root;
2218$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0;
2216 2219
22171 22201
2218 2221

Diff Legend

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