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.130 by root, Tue Apr 18 01:51:06 2006 UTC vs.
Revision 1.153 by root, Sun Apr 23 02:14:33 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) = @_;
… …
288} 347}
289 348
290sub connect { 349sub connect {
291 my ($self, $signal, $cb) = @_; 350 my ($self, $signal, $cb) = @_;
292 351
293 push @{ $self->{cb}{$signal} }, $cb; 352 push @{ $self->{signal_cb}{$signal} }, $cb;
294} 353}
295 354
296sub emit { 355sub emit {
297 my ($self, $signal, @args) = @_; 356 my ($self, $signal, @args) = @_;
298 357
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
299 $_->($self, @args) 359 $cb->($self, @args);
300 for @{$self->{cb}{$signal} || []}; 360 }
301} 361}
302 362
303sub DESTROY { 363sub DESTROY {
304 my ($self) = @_; 364 my ($self) = @_;
305 365
… …
311package CFClient::UI::DrawBG; 371package CFClient::UI::DrawBG;
312 372
313our @ISA = CFClient::UI::Base::; 373our @ISA = CFClient::UI::Base::;
314 374
315use strict; 375use strict;
316use SDL::OpenGL; 376use CFClient::OpenGL;
317 377
318sub new { 378sub new {
319 my $class = shift; 379 my $class = shift;
320 380
321 # range [value, low, high, page] 381 # range [value, low, high, page]
… …
350 410
351package CFClient::UI::Empty; 411package CFClient::UI::Empty;
352 412
353our @ISA = CFClient::UI::Base::; 413our @ISA = CFClient::UI::Base::;
354 414
415sub new {
416 my ($class, %arg) = @_;
417 $class->SUPER::new (can_events => 0, %arg);
418}
419
355sub size_request { 420sub size_request {
356 (0, 0) 421 (0, 0)
357} 422}
358 423
359sub draw { } 424sub draw { }
… …
367sub new { 432sub new {
368 my ($class, %arg) = @_; 433 my ($class, %arg) = @_;
369 434
370 my $children = delete $arg{children} || []; 435 my $children = delete $arg{children} || [];
371 436
372 my $self = $class->SUPER::new (children => [], %arg); 437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
373 $self->add ($_) for @$children; 438 $self->add ($_) for @$children;
374 439
375 $self 440 $self
376} 441}
377 442
… …
385 $self->{children} = [ 450 $self->{children} = [
386 sort { $a->{z} <=> $b->{z} } 451 sort { $a->{z} <=> $b->{z} }
387 @{$self->{children}}, $child 452 @{$self->{children}}, $child
388 ]; 453 ];
389 454
390 $self->{w} = $self->{h} = -1;
391
392 $child->check_size; 455 $child->check_size;
393} 456}
394 457
395sub remove { 458sub remove {
396 my ($self, $widget) = @_; 459 my ($self, $child) = @_;
397 460
461 delete $child->{parent};
462
398 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
399 464
400 $self->check_size; 465 $self->check_size;
466 $self->update;
401} 467}
402 468
403sub find_widget { 469sub find_widget {
404 my ($self, $x, $y) = @_; 470 my ($self, $x, $y) = @_;
405 471
… …
435 501
436 $class->SUPER::new (children => [$child], %arg) 502 $class->SUPER::new (children => [$child], %arg)
437} 503}
438 504
439sub add { 505sub add {
440 my ($self, $widget) = @_; 506 my ($self, $child) = @_;
441 507
442 $self->{children} = []; 508 $self->{children} = [];
443 509
444 $self->SUPER::add ($widget); 510 $self->SUPER::add ($child);
445} 511}
446 512
447sub remove { 513sub remove {
448 my ($self, $widget) = @_; 514 my ($self, $widget) = @_;
449 515
… …
469 535
470package CFClient::UI::Window; 536package CFClient::UI::Window;
471 537
472our @ISA = CFClient::UI::Bin::; 538our @ISA = CFClient::UI::Bin::;
473 539
474use SDL::OpenGL; 540use CFClient::OpenGL;
475 541
476sub new { 542sub new {
477 my ($class, %arg) = @_; 543 my ($class, %arg) = @_;
478 544
479 my $self = $class->SUPER::new (%arg); 545 my $self = $class->SUPER::new (%arg);
… …
533sub new { die } 599sub new { die }
534 600
535sub size_request { 601sub size_request {
536 my ($self) = @_; 602 my ($self) = @_;
537 603
538 @$self{qw(child_w child_h)} = $self->child->size_request; 604 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
539 $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)});
540 606
541 @$self{qw(child_w child_h)} 607 @$self{qw(child_w child_h)}
542} 608}
543 609
… …
552 618
553package CFClient::UI::Frame; 619package CFClient::UI::Frame;
554 620
555our @ISA = CFClient::UI::Bin::; 621our @ISA = CFClient::UI::Bin::;
556 622
557use SDL::OpenGL; 623use CFClient::OpenGL;
558
559sub size_request {
560 my ($self) = @_;
561 my $chld = $self->child
562 or return (0, 0);
563
564 $chld->move (2, 2);
565
566 map { $_ + 4 } $chld->size_request;
567}
568
569sub size_allocate {
570 my ($self, $x, $y, $w, $h) = @_;
571
572 $self->child->configure (2, 2, $w - 4, $h - 4);
573}
574
575sub _draw {
576 my ($self) = @_;
577
578 my $chld = $self->child;
579
580 my ($w, $h) = $chld->size_request;
581
582 glBegin GL_QUADS;
583 glColor 0, 0, 0;
584 glVertex 0 , 0;
585 glVertex 0 , $h + 4;
586 glVertex $w + 4 , $h + 4;
587 glVertex $w + 4 , 0;
588 glEnd;
589
590 $chld->draw;
591}
592
593#############################################################################
594
595package CFClient::UI::FancyFrame;
596
597our @ISA = CFClient::UI::Bin::;
598
599use SDL::OpenGL;
600
601my @tex =
602 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
603 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
604 624
605sub new { 625sub new {
606 my $class = shift; 626 my $class = shift;
607 627
608 # TODO: user_x, user_y, overwrite moveto?
609
610 $class->SUPER::new ( 628 my $self = $class->SUPER::new (
611 bg => [1, 1, 1, 1], 629 bg => [1, 1, 1, 1],
612 border_bg => [1, 1, 1, 1], 630 border_bg => [1, 1, 1, 1],
613 border => int $::FONTSIZE * 0.8, 631 border => 0.8,
614 @_ 632 @_
615 ) 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;
616} 643}
617 644
618sub size_request { 645sub size_request {
619 my ($self) = @_; 646 my ($self) = @_;
620 647 ($self->{req_w}, $self->{req_h})
621 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
622
623 my ($w, $h) = $self->SUPER::size_request;
624
625 (
626 $w + $self->{border} * 2,
627 $h + $self->{border} * 2,
628 )
629} 648}
630 649
631sub size_allocate { 650sub size_allocate {
632 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}
633 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
634 $h -= List::Util::max 0, $self->{border} * 2; 735 $h -= List::Util::max 0, $self->border * 2;
635 $w -= List::Util::max 0, $self->{border} * 2; 736 $w -= List::Util::max 0, $self->border * 2;
636 737
738 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
739 if $self->{title};
740
637 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 741 $self->child->configure ($self->border, $self->border, $w, $h);
638} 742}
639 743
640sub button_down { 744sub button_down {
641 my ($self, $ev, $x, $y) = @_; 745 my ($self, $ev, $x, $y) = @_;
642 746
747 my $border = $self->border;
748
643 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 749 if ($x < $self->{w} && $x >= $self->{w} - $border
644 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 750 && $y < $self->{h} && $y >= $self->{h} - $border) {
645 751
646 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 752 my ($ox, $oy) = ($ev->{x}, $ev->{y});
647 my ($bw, $bh) = ($self->{w}, $self->{h}); 753 my ($bw, $bh) = ($self->{w}, $self->{h});
648 754
649 $self->{motion} = sub { 755 $self->{motion} = sub {
650 my ($ev, $x, $y) = @_; 756 my ($ev, $x, $y) = @_;
651 757
652 ($x, $y) = ($ev->motion_x, $ev->motion_y); 758 ($x, $y) = ($ev->{x}, $ev->{y});
653 759
654 $self->{user_w} = $bw + $x - $ox; 760 $self->{user_w} = $bw + $x - $ox;
655 $self->{user_h} = $bh + $y - $oy; 761 $self->{user_h} = $bh + $y - $oy;
656 $self->check_size; 762 $self->check_size;
657 }; 763 };
658 764
659 } elsif ($x >= 0 && $x < $self->{w} 765 } elsif ($x >= 0 && $x < $self->{w}
660 && $y >= 0 && $y < $self->{border}) { 766 && $y >= 0 && $y < $border) {
661 767
662 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 768 my ($ox, $oy) = ($ev->{x}, $ev->{y});
663 my ($bx, $by) = ($self->{x}, $self->{y}); 769 my ($bx, $by) = ($self->{x}, $self->{y});
664 770
665 $self->{motion} = sub { 771 $self->{motion} = sub {
666 my ($ev, $x, $y) = @_; 772 my ($ev, $x, $y) = @_;
667 773
668 ($x, $y) = ($ev->motion_x, $ev->motion_y); 774 ($x, $y) = ($ev->{x}, $ev->{y});
669 775
670 $self->move ($bx + $x - $ox, $by + $y - $oy); 776 $self->move ($bx + $x - $ox, $by + $y - $oy);
671 $self->update; 777 $self->update;
672 }; 778 };
673 } 779 }
… …
694 glEnable GL_BLEND; 800 glEnable GL_BLEND;
695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
696 glEnable GL_TEXTURE_2D; 802 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
698 804
805 my $border = $self->border;
806
699 glColor @{ $self->{border_bg} }; 807 glColor @{ $self->{border_bg} };
700 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 808 $tex[1]->draw_quad (0, 0, $w, $border);
701 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 809 $tex[3]->draw_quad (0, $border, $border, $ch);
702 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
703 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 811 $tex[4]->draw_quad (0, $h - $border, $w, $border);
704 812
705 my $bg = $tex[0]; 813 my $bg = $tex[0];
706 814
707 # TODO: repeat texture not scale 815 # TODO: repeat texture not scale
708 my $rep_x = $cw / $bg->{w}; 816 my $rep_x = $cw / $bg->{w};
… …
711 glColor @{ $self->{bg} }; 819 glColor @{ $self->{bg} };
712 820
713 $bg->{s} = $rep_x; 821 $bg->{s} = $rep_x;
714 $bg->{t} = $rep_y; 822 $bg->{t} = $rep_y;
715 $bg->{wrap_mode} = 1; 823 $bg->{wrap_mode} = 1;
716 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 824 $bg->draw_quad ($border, $border, $cw, $ch);
717 825
718 glDisable GL_TEXTURE_2D; 826 glDisable GL_TEXTURE_2D;
719 glDisable GL_BLEND; 827 glDisable GL_BLEND;
720 828
829 $self->{title}->draw if $self->{title};
721 $self->child->draw; 830 $self->child->draw;
722} 831}
723 832
724############################################################################# 833#############################################################################
725 834
… …
727 836
728our @ISA = CFClient::UI::Base::; 837our @ISA = CFClient::UI::Base::;
729 838
730use List::Util qw(max sum); 839use List::Util qw(max sum);
731 840
732use SDL::OpenGL; 841use CFClient::OpenGL;
733 842
734sub new { 843sub new {
735 my $class = shift; 844 my $class = shift;
736 845
737 $class->SUPER::new ( 846 $class->SUPER::new (
… …
744 my ($self, $x, $y, $child) = @_; 853 my ($self, $x, $y, $child) = @_;
745 854
746 $child->set_parent ($self); 855 $child->set_parent ($self);
747 $self->{children}[$y][$x] = $child; 856 $self->{children}[$y][$x] = $child;
748 857
749 $self->{w} = $self->{h} = -1;
750
751 $child->check_size; 858 $child->check_size;
752} 859}
753 860
754# 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?
755sub clear { 862sub clear {
… …
769 or next; 876 or next;
770 877
771 for my $x (0 .. $#$row) { 878 for my $x (0 .. $#$row) {
772 my $widget = $row->[$x] 879 my $widget = $row->[$x]
773 or next; 880 or next;
774 my ($w, $h) = $widget->size_request; 881 my ($w, $h) = @$widget{qw(req_w req_h)};
775 882
776 $w[$x] = max $w[$x], $w; 883 $w[$x] = max $w[$x], $w;
777 $h[$y] = max $h[$y], $h; 884 $h[$y] = max $h[$y], $h;
778 } 885 }
779 } 886 }
… …
884 991
885 ($h, $w) = ($w, $h); 992 ($h, $w) = ($w, $h);
886 993
887 my $children = $self->{children}; 994 my $children = $self->{children};
888 995
889 my @h = map +($_->size_request)[0], @$children; 996 my @h = map $_->{req_w}, @$children;
890 997
891 my $req_h = List::Util::sum @h; 998 my $req_h = List::Util::sum @h;
892 999
893 if ($req_h > $h) { 1000 if ($req_h > $h) {
894 # ah well, not enough space 1001 # ah well, not enough space
… …
942sub size_allocate { 1049sub size_allocate {
943 my ($self, $w, $h) = @_; 1050 my ($self, $w, $h) = @_;
944 1051
945 my $children = $self->{children}; 1052 my $children = $self->{children};
946 1053
947 my @h = map +($_->size_request)[1], @$children; 1054 my @h = map $_->{req_h}, @$children;
948 1055
949 my $req_h = List::Util::sum @h; 1056 my $req_h = List::Util::sum @h;
950 1057
951 if ($req_h > $h) { 1058 if ($req_h > $h) {
952 # ah well, not enough space 1059 # ah well, not enough space
… …
980 1087
981package CFClient::UI::Label; 1088package CFClient::UI::Label;
982 1089
983our @ISA = CFClient::UI::Base::; 1090our @ISA = CFClient::UI::Base::;
984 1091
985use SDL::OpenGL; 1092use CFClient::OpenGL;
986 1093
987sub new { 1094sub new {
988 my ($class, %arg) = @_; 1095 my ($class, %arg) = @_;
989 1096
990 my $self = $class->SUPER::new ( 1097 my $self = $class->SUPER::new (
991 fg => [1, 1, 1], 1098 fg => [1, 1, 1],
992 fontsize => $::FONTSIZE, 1099 fontsize => 1,
993 text => "", 1100 text => "",
994 align => -1, 1101 align => -1,
995 valign => -1, 1102 valign => -1,
996 padding => 2, 1103 padding => 2,
997 layout => new CFClient::Layout, 1104 layout => new CFClient::Layout,
1105 can_events => 0,
998 %arg 1106 %arg
999 ); 1107 );
1000 1108
1001 $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 }
1002 1114
1003 $self->set_text (delete $self->{text}) if exists $self->{text}; 1115 $self->set_text (delete $self->{text}) if exists $self->{text};
1004 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1005 1117
1006 $self 1118 $self
… …
1020 my ($self, $text) = @_; 1132 my ($self, $text) = @_;
1021 1133
1022 $self->{layout}->set_text ($text); 1134 $self->{layout}->set_text ($text);
1023 1135
1024 delete $self->{texture}; 1136 delete $self->{texture};
1137 $self->check_size;
1025 $self->update; 1138 $self->update;
1026} 1139}
1027 1140
1028sub set_markup { 1141sub set_markup {
1029 my ($self, $markup) = @_; 1142 my ($self, $markup) = @_;
1030 1143
1031 $self->{layout}->set_markup ($markup); 1144 $self->{layout}->set_markup ($markup);
1032 1145
1033 delete $self->{texture}; 1146 delete $self->{texture};
1147 $self->check_size;
1034 $self->update; 1148 $self->update;
1035} 1149}
1036 1150
1037sub size_request { 1151sub size_request {
1038 my ($self) = @_; 1152 my ($self) = @_;
1039 1153
1040 $self->{layout}->set_width; 1154 $self->{layout}->set_width;
1041 $self->{layout}->set_height ($self->{fontsize}); 1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1042 1156
1043 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 }
1044 1167
1045 ( 1168 (
1046 $w + $self->{padding} * 2, 1169 $w + $self->{padding} * 2,
1047 $h + $self->{padding} * 2, 1170 $h + $self->{padding} * 2,
1048 ) 1171 )
… …
1052 my ($self, $w, $h) = @_; 1175 my ($self, $w, $h) = @_;
1053 1176
1054 delete $self->{texture}; 1177 delete $self->{texture};
1055} 1178}
1056 1179
1057sub update { 1180sub set_fontsize {
1058 my ($self) = @_; 1181 my ($self, $fontsize) = @_;
1059 1182
1183 $self->{fontsize} = $fontsize;
1060 delete $self->{texture}; 1184 delete $self->{texture};
1185 $self->check_size;
1061 $self->SUPER::update; 1186 $self->update;
1062} 1187}
1063 1188
1064sub _draw { 1189sub _draw {
1065 my ($self) = @_; 1190 my ($self) = @_;
1066 1191
1067 my $tex = $self->{texture} ||= do { 1192 my $tex = $self->{texture} ||= do {
1068 $self->{layout}->set_width ($self->{w}); 1193 $self->{layout}->set_width ($self->{w});
1069 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1194 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1070 new_from_layout CFClient::Texture $self->{layout} 1195 new_from_layout CFClient::Texture $self->{layout}
1071 }; 1196 };
1072 1197
1073 glEnable GL_BLEND; 1198 glEnable GL_BLEND;
1074 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1199 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1099 1224
1100package CFClient::UI::EntryBase; 1225package CFClient::UI::EntryBase;
1101 1226
1102our @ISA = CFClient::UI::Label::; 1227our @ISA = CFClient::UI::Label::;
1103 1228
1104use SDL; 1229use CFClient::OpenGL;
1105use SDL::OpenGL;
1106 1230
1107sub new { 1231sub new {
1108 my $class = shift; 1232 my $class = shift;
1109 1233
1110 $class->SUPER::new ( 1234 $class->SUPER::new (
… …
1113 active_bg => [1, 1, 1, 0.5], 1237 active_bg => [1, 1, 1, 0.5],
1114 active_fg => [0, 0, 0], 1238 active_fg => [0, 0, 0],
1115 can_hover => 1, 1239 can_hover => 1,
1116 can_focus => 1, 1240 can_focus => 1,
1117 valign => 0, 1241 valign => 0,
1242 can_events => 1,
1118 @_ 1243 @_
1119 ) 1244 )
1120} 1245}
1121 1246
1122sub _set_text { 1247sub _set_text {
… …
1124 1249
1125 delete $self->{cur_h}; 1250 delete $self->{cur_h};
1126 1251
1127 return if $self->{text} eq $text; 1252 return if $self->{text} eq $text;
1128 1253
1254 delete $self->{texture};
1255
1129 $self->{last_activity} = $::NOW; 1256 $self->{last_activity} = $::NOW;
1130 $self->{text} = $text; 1257 $self->{text} = $text;
1131 1258
1132 $text =~ s/./*/g if $self->{hidden}; 1259 $text =~ s/./*/g if $self->{hidden};
1133 $self->{layout}->set_text ("$text "); 1260 $self->{layout}->set_text ("$text ");
… …
1148} 1275}
1149 1276
1150sub size_allocate { 1277sub size_allocate {
1151 my ($self, $w, $h) = @_; 1278 my ($self, $w, $h) = @_;
1152 1279
1153 $self->_set_text ($self->{text}); 1280 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1154} 1281}
1155 1282
1156sub set_text { 1283sub set_text {
1157 my ($self, $text) = @_; 1284 my ($self, $text) = @_;
1158 1285
… …
1162} 1289}
1163 1290
1164sub key_down { 1291sub key_down {
1165 my ($self, $ev) = @_; 1292 my ($self, $ev) = @_;
1166 1293
1167 my $mod = $ev->key_mod; 1294 my $mod = $ev->{mod};
1168 my $sym = $ev->key_sym; 1295 my $sym = $ev->{sym};
1169
1170 my $uni = $ev->key_unicode; 1296 my $uni = $ev->{unicode};
1171 1297
1172 my $text = $self->get_text; 1298 my $text = $self->get_text;
1173 1299
1174 if ($sym == SDLK_BACKSPACE) { 1300 if ($sym == 8) {
1175 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1301 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1176 } elsif ($sym == SDLK_DELETE) { 1302 } elsif ($sym == 127) {
1177 substr $text, $self->{cursor}, 1, ""; 1303 substr $text, $self->{cursor}, 1, "";
1178 } elsif ($sym == SDLK_LEFT) { 1304 } elsif ($sym == CFClient::SDLK_LEFT) {
1179 --$self->{cursor} if $self->{cursor}; 1305 --$self->{cursor} if $self->{cursor};
1180 } elsif ($sym == SDLK_RIGHT) { 1306 } elsif ($sym == CFClient::SDLK_RIGHT) {
1181 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1307 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1182 } elsif ($sym == SDLK_HOME) { 1308 } elsif ($sym == CFClient::SDLK_HOME) {
1183 $self->{cursor} = 0; 1309 $self->{cursor} = 0;
1184 } elsif ($sym == SDLK_END) { 1310 } elsif ($sym == CFClient::SDLK_END) {
1185 $self->{cursor} = length $text; 1311 $self->{cursor} = length $text;
1186 } elsif ($sym == SDLK_ESCAPE) { 1312 } elsif ($sym == 27) {
1187 $self->emit ('escape'); 1313 $self->emit ('escape');
1188 } elsif ($uni) { 1314 } elsif ($uni) {
1189 substr $text, $self->{cursor}++, 0, chr $uni; 1315 substr $text, $self->{cursor}++, 0, chr $uni;
1190 } 1316 }
1191 1317
… …
1266 1392
1267package CFClient::UI::Entry; 1393package CFClient::UI::Entry;
1268 1394
1269our @ISA = CFClient::UI::EntryBase::; 1395our @ISA = CFClient::UI::EntryBase::;
1270 1396
1271use SDL; 1397use CFClient::OpenGL;
1272use SDL::OpenGL;
1273 1398
1274sub key_down { 1399sub key_down {
1275 my ($self, $ev) = @_; 1400 my ($self, $ev) = @_;
1276 1401
1277 my $sym = $ev->key_sym; 1402 my $sym = $ev->{sym};
1278 1403
1279 if ($sym == SDLK_RETURN) { 1404 if ($sym == 13) {
1280 $self->emit (activate => $self->get_text); 1405 $self->emit (activate => $self->get_text);
1281 $self->update; 1406 $self->update;
1282 1407
1283 } else { 1408 } else {
1284 $self->SUPER::key_down ($ev); 1409 $self->SUPER::key_down ($ev);
… …
1290 1415
1291package CFClient::UI::Button; 1416package CFClient::UI::Button;
1292 1417
1293our @ISA = CFClient::UI::Label::; 1418our @ISA = CFClient::UI::Label::;
1294 1419
1295use SDL; 1420use CFClient::OpenGL;
1296use SDL::OpenGL;
1297 1421
1298my @tex = 1422my @tex =
1299 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1423 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1300 qw(b1_button_active.png); 1424 qw(b1_button_active.png);
1301 1425
1302sub new { 1426sub new {
1303 my $class = shift; 1427 my $class = shift;
1304 1428
… …
1308 bg => [1, 1, 1, 0.2], 1432 bg => [1, 1, 1, 0.2],
1309 active_fg => [0, 0, 1], 1433 active_fg => [0, 0, 1],
1310 can_hover => 1, 1434 can_hover => 1,
1311 align => 0, 1435 align => 0,
1312 valign => 0, 1436 valign => 0,
1437 can_events => 1,
1313 @_ 1438 @_
1314 ) 1439 )
1315} 1440}
1316 1441
1317sub button_up { 1442sub button_up {
… …
1351package CFClient::UI::CheckBox; 1476package CFClient::UI::CheckBox;
1352 1477
1353our @ISA = CFClient::UI::DrawBG::; 1478our @ISA = CFClient::UI::DrawBG::;
1354 1479
1355my @tex = 1480my @tex =
1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1357 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1482 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1358 1483
1359use SDL; 1484use CFClient::OpenGL;
1360use SDL::OpenGL;
1361 1485
1362sub new { 1486sub new {
1363 my $class = shift; 1487 my $class = shift;
1364 1488
1365 $class->SUPER::new ( 1489 $class->SUPER::new (
… …
1411 glDisable GL_BLEND; 1535 glDisable GL_BLEND;
1412} 1536}
1413 1537
1414############################################################################# 1538#############################################################################
1415 1539
1416package CFClient::UI::VGauge; 1540package CFClient::UI::Image;
1417 1541
1418our @ISA = CFClient::UI::Base::; 1542our @ISA = CFClient::UI::Base::;
1419 1543
1420use SDL::OpenGL; 1544use CFClient::OpenGL;
1545use Carp qw/confess/;
1421 1546
1422my %tex = ( 1547our %loaded_images;
1423 food => [
1424 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1425 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1426 ],
1427 grace => [
1428 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1429 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1430 ],
1431 hp => [
1432 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1433 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1434 ],
1435 mana => [
1436 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1437 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1438 ],
1439);
1440 1548
1441# eg. VGauge->new (gauge => 'food'), default gauge: food
1442sub new { 1549sub new {
1443 my $class = shift; 1550 my $class = shift;
1444 1551
1445 my $self = $class->SUPER::new (gauge => 'food', @_); 1552 my $self = $class->SUPER::new (can_events => 0, @_);
1553
1554 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1555
1556 $loaded_images{$self->{image}} ||=
1557 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1558
1559 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1560
1561 Scalar::Util::weaken $loaded_images{$self->{image}};
1562
1563 $self->{aspect} = $tex->{w} / $tex->{h};
1446 1564
1447 $self 1565 $self
1448} 1566}
1449 1567
1450sub size_request { 1568sub size_request {
1451 my ($self) = @_; 1569 my ($self) = @_;
1452 1570
1453 my $tex = $tex{$self->{gauge}}[0]; 1571 ($self->{tex}->{w}, $self->{tex}->{h})
1454
1455 @$tex{qw(w h)}
1456}
1457
1458sub set_max {
1459 my ($self, $max) = @_;
1460
1461 $self->{max_val} = $max;
1462}
1463
1464sub set_value {
1465 my ($self, $val, $max) = @_;
1466
1467 $self->set_max ($max)
1468 if defined $max;
1469
1470 $max = $self->{max_val};
1471 $self->{val} = $val;
1472
1473 $self->update;
1474} 1572}
1475 1573
1476sub _draw { 1574sub _draw {
1477 my ($self) = @_; 1575 my ($self) = @_;
1478 1576
1479 my $tex = $tex{$self->{gauge}}; 1577 my $tex = $self->{tex};
1480 1578
1481 my ($w, $h) = ($self->{w}, $self->{h}); 1579 my ($w, $h) = ($self->{w}, $self->{h});
1482 1580
1483 my $ycut = $self->{val} / ($self->{max_val} || 1); 1581 if ($self->{rot90}) {
1484 $ycut = 1 if $self->{val} > $self->{max_val}; 1582 glRotate 90, 0, 0, 1;
1583 glTranslate 0, -$self->{w}, 0;
1485 1584
1486 my $t1 = $tex->[0]; 1585 ($w, $h) = ($h, $w);
1487 my $t2 = $tex->[1]; 1586 }
1488 1587
1489 glEnable GL_BLEND; 1588 glEnable GL_BLEND;
1490 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1491 glEnable GL_TEXTURE_2D; 1590 glEnable GL_TEXTURE_2D;
1492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1493 1592
1593 $tex->draw_quad (0, 0, $w, $h);
1594
1595 glDisable GL_BLEND;
1596 glDisable GL_TEXTURE_2D;
1597}
1598
1599#############################################################################
1600
1601package CFClient::UI::VGauge;
1602
1603our @ISA = CFClient::UI::Base::;
1604
1605use CFClient::OpenGL;
1606
1607my %tex = (
1608 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ],
1612 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1615 ],
1616 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ],
1620 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1623 ],
1624);
1625
1626# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new {
1628 my $class = shift;
1629
1630 my $self = $class->SUPER::new (
1631 type => 'food',
1632 @_
1633 );
1634
1635 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1636
1637 $self
1638}
1639
1640sub size_request {
1641 my ($self) = @_;
1642
1643 #my $tex = $tex{$self->{type}}[0];
1644 #@$tex{qw(w h)}
1645 (0, 0)
1646}
1647
1648sub set_max {
1649 my ($self, $max) = @_;
1650
1651 $self->{max_val} = $max;
1652}
1653
1654sub set_value {
1655 my ($self, $val, $max) = @_;
1656
1657 $self->set_max ($max)
1658 if defined $max;
1659
1660 $max = $self->{max_val};
1661 $self->{val} = $val;
1662
1663 $self->update;
1664}
1665
1666sub _draw {
1667 my ($self) = @_;
1668
1669 my $tex = $tex{$self->{type}};
1670
1671 my ($w, $h) = ($self->{w}, $self->{h});
1672
1673 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1;
1675 glTranslate 0, -$self->{w}, 0;
1676
1677 ($w, $h) = ($h, $w);
1678 }
1679
1680 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682
1683 my $t1 = $tex->[0];
1684 my $t2 = $tex->[1];
1685
1686 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690
1494 my $h1 = $self->{h} - $ycut * $self->{h}; 1691 my $h1 = $self->{h} - $ycut * $self->{h};
1495 my $h2 = $ycut * $self->{h}; 1692 my $h2 = $ycut * $self->{h};
1496 1693
1497 my $yp = 0;
1498
1499 glBindTexture (GL_TEXTURE_2D, $t1->{name}); 1694 glBindTexture GL_TEXTURE_2D, $t1->{name};
1500 glBegin (GL_QUADS); 1695 glBegin GL_QUADS;
1501 glTexCoord (0, 0); glVertex (0 , $yp); 1696 glTexCoord 0 , 0; glVertex 0 , 0;
1502 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1); 1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1503 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1); 1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1504 glTexCoord (1, 0); glVertex (0 + $w, $yp); 1699 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1505 glEnd (); 1700 glEnd;
1506 1701
1507 $yp += $h1;
1508
1509 glBindTexture (GL_TEXTURE_2D, $t2->{name}); 1702 glBindTexture GL_TEXTURE_2D, $t2->{name};
1510 glBegin (GL_QUADS); 1703 glBegin GL_QUADS;
1511 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp); 1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1512 glTexCoord (0, 1); glVertex (0 , $yp + $h2); 1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1513 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2); 1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1514 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp); 1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1515 glEnd (); 1708 glEnd;
1516 1709
1517 glDisable GL_BLEND; 1710 glDisable GL_BLEND;
1518 glDisable GL_TEXTURE_2D; 1711 glDisable GL_TEXTURE_2D;
1519} 1712}
1520 1713
1521############################################################################# 1714#############################################################################
1522 1715
1716package CFClient::UI::Gauge;
1717
1718our @ISA = CFClient::UI::VBox::;
1719
1720sub new {
1721 my ($class, %arg) = @_;
1722
1723 my $self = $class->SUPER::new (
1724 tooltip => $arg{type},
1725 %arg,
1726 );
1727
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1729 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1730 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731
1732 $self
1733}
1734
1735sub set_fontsize {
1736 my ($self, $fsize) = @_;
1737
1738 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize);
1740}
1741
1742sub set_value {
1743 my ($self, $val, $max) = @_;
1744
1745 $self->set_max ($max)
1746 if defined $max;
1747
1748 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757}
1758
1759#############################################################################
1760
1523package CFClient::UI::Slider; 1761package CFClient::UI::Slider;
1524 1762
1525use strict; 1763use strict;
1526 1764
1527use SDL::OpenGL; 1765use CFClient::OpenGL;
1528 1766
1529our @ISA = CFClient::UI::DrawBG::; 1767our @ISA = CFClient::UI::DrawBG::;
1530 1768
1531my @tex = 1769my @tex =
1532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1770 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1542 # TODO: calculations are off 1780 # TODO: calculations are off
1543 my $self = $class->SUPER::new ( 1781 my $self = $class->SUPER::new (
1544 fg => [1, 1, 1], 1782 fg => [1, 1, 1],
1545 active_fg => [0, 0, 0], 1783 active_fg => [0, 0, 0],
1546 range => [0, 0, 100, 10], 1784 range => [0, 0, 100, 10],
1547 req_w => 40, 1785 req_w => 20,
1548 req_h => 13, 1786 req_h => 20,
1549 vertical => 0, 1787 vertical => 0,
1550 can_hover => 1, 1788 can_hover => 1,
1551 inner_pad => 5, 1789 inner_pad => 5,
1552 @_ 1790 @_
1553 ); 1791 );
… …
1657 1895
1658package CFClient::UI::TextView; 1896package CFClient::UI::TextView;
1659 1897
1660our @ISA = CFClient::UI::HBox::; 1898our @ISA = CFClient::UI::HBox::;
1661 1899
1662use SDL::OpenGL; 1900use CFClient::OpenGL;
1663 1901
1664sub new { 1902sub new {
1665 my $class = shift; 1903 my $class = shift;
1666 1904
1667 my $self = $class->SUPER::new ( 1905 my $self = $class->SUPER::new (
1668 req_w => $::WIDTH / 6,
1669 req_h => $::HEIGHT / 6,
1670 fontsize => $::FONTSIZE, 1906 fontsize => 1,
1671 @_, 1907 @_,
1672 1908
1673 layout => (new CFClient::Layout), 1909 layout => (new CFClient::Layout),
1674 par => [], 1910 par => [],
1675 height => 0, 1911 height => 0,
… …
1696sub text_height { 1932sub text_height {
1697 my ($self, $text) = @_; 1933 my ($self, $text) = @_;
1698 1934
1699 my $layout = $self->{layout}; 1935 my $layout = $self->{layout};
1700 1936
1701 $layout->set_height ($self->{fontsize}); 1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1702 $layout->set_width ($self->{w}); 1938 $layout->set_width ($self->{w});
1703 $layout->set_text ($text); 1939 $layout->set_text ($text);
1704 1940
1705 ($layout->size)[1] 1941 ($layout->size)[1]
1706} 1942}
… …
1710 1946
1711 $self->{need_reflow}++; 1947 $self->{need_reflow}++;
1712 $self->update; 1948 $self->update;
1713} 1949}
1714 1950
1715sub size_request {
1716 my ($self) = @_;
1717
1718 ($self->{req_w}, $self->{req_h})
1719}
1720
1721sub size_allocate { 1951sub size_allocate {
1722 my ($self, $w, $h) = @_; 1952 my ($self, $w, $h) = @_;
1723 1953
1954 $self->SUPER::size_allocate ($w, $h);
1955
1724 $self->{layout}->set_height ($self->{fontsize}); 1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1725 $self->{layout}->set_width ($self->{w}); 1957 $self->{layout}->set_width ($self->{children}[0]{w});
1726 1958
1727 $self->reflow; 1959 $self->reflow;
1728 $self->update;
1729} 1960}
1730 1961
1731sub add_paragraph { 1962sub add_paragraph {
1732 my ($self, $color, $text) = @_; 1963 my ($self, $color, $text) = @_;
1733 1964
… …
1818 2049
1819} 2050}
1820 2051
1821############################################################################# 2052#############################################################################
1822 2053
1823package CFClient::UI::MapWidget;
1824
1825use strict;
1826
1827use List::Util qw(min max);
1828
1829use SDL;
1830use SDL::OpenGL;
1831
1832our @ISA = CFClient::UI::Base::;
1833
1834sub new {
1835 my $class = shift;
1836
1837 $class->SUPER::new (
1838 z => -1,
1839 can_focus => 1,
1840 list => (glGenLists 1),
1841 @_
1842 )
1843}
1844
1845sub key_down {
1846 print "MAPKEYDOWN\n";
1847}
1848
1849sub key_up {
1850}
1851
1852sub button_down {
1853 my ($self, $ev, $x, $y) = @_;
1854
1855 $self->focus_in;
1856
1857 if ($ev->button == 2) {
1858 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1859 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1860
1861 $self->{motion} = sub {
1862 my ($ev, $x, $y) = @_;
1863
1864 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1865
1866 $::CFG->{map_shift_x} = $bw + $x - $ox;
1867 $::CFG->{map_shift_y} = $bh + $y - $oy;
1868
1869 $self->update;
1870 };
1871 }
1872}
1873
1874sub button_up {
1875 my ($self, $ev, $x, $y) = @_;
1876
1877 delete $self->{motion};
1878}
1879
1880sub mouse_motion {
1881 my ($self, $ev, $x, $y) = @_;
1882
1883 $self->{motion}->($ev, $x, $y) if $self->{motion};
1884}
1885
1886sub size_request {
1887 (
1888 1 + 32 * int $::WIDTH / 32,
1889 1 + 32 * int $::HEIGHT / 32,
1890 )
1891}
1892
1893sub update {
1894 my ($self) = @_;
1895
1896 $self->{need_update} = 1;
1897 $self->SUPER::update;
1898}
1899
1900sub draw {
1901 my ($self) = @_;
1902
1903 if (delete $self->{need_update}) {
1904 glNewList $self->{list}, GL_COMPILE;
1905
1906 if ($::MAP) {
1907 my $sw = int $::WIDTH / 32;
1908 my $sh = int $::HEIGHT / 32;
1909
1910 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1911 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1912
1913 glTranslate $sx0 - 32, $sy0 - 32, 0;
1914
1915 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1916
1917 if ($::CFG->{fow_enable}) {
1918 if ($::CFG->{fow_smooth}) { # smooth fog of war
1919 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1920 glConvolutionFilter2D (
1921 GL_CONVOLUTION_2D,
1922 GL_ALPHA,
1923 3, 3,
1924 GL_ALPHA, GL_FLOAT,
1925 pack "f*",
1926 0.1, 0.1, 0.1,
1927 0.1, 0.2, 0.1,
1928 0.1, 0.1, 0.1,
1929 );
1930 glEnable GL_CONVOLUTION_2D;
1931 }
1932
1933 $self->{fow_texture} = new CFClient::Texture
1934 w => $w,
1935 h => $h,
1936 data => $data,
1937 internalformat => GL_ALPHA,
1938 format => GL_ALPHA;
1939
1940 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1941
1942 glEnable GL_BLEND;
1943 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1944 glEnable GL_TEXTURE_2D;
1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1946
1947 glColor +($::CFG->{fow_intensity}) x 3, 1;
1948 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1949
1950 glDisable GL_TEXTURE_2D;
1951 glDisable GL_BLEND;
1952 }
1953
1954 # HACK BEGIN
1955 {
1956 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1957 my ($w, $h) = (250, 250);
1958
1959 glEnable GL_BLEND;
1960 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961 glEnable GL_TEXTURE_2D;
1962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963
1964 $self->{mapmap_texture} =
1965 new CFClient::Texture
1966 w => $w,
1967 h => $h,
1968 data => $::MAP->mapmap ($w, $h),
1969 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1970
1971 $self->{mapmap_texture}->draw_quad (100, 100);
1972
1973 glDisable GL_TEXTURE_2D;
1974 glDisable GL_BLEND;
1975 }
1976 # HACK END
1977 }
1978
1979 glEndList;
1980 }
1981
1982 glPushMatrix;
1983 glCallList $self->{list};
1984 glPopMatrix;
1985
1986 if ($FOCUS != $self) {
1987 glColor 64/255, 64/255, 64/255;
1988 glLogicOp GL_AND;
1989 glEnable GL_COLOR_LOGIC_OP;
1990 glBegin GL_QUADS;
1991 glVertex 0, 0;
1992 glVertex 0, $::HEIGHT;
1993 glVertex $::WIDTH, $::HEIGHT;
1994 glVertex $::WIDTH, 0;
1995 glEnd;
1996 glDisable GL_COLOR_LOGIC_OP;
1997 }
1998}
1999
2000my %DIR = (
2001 SDLK_KP8, [1, "north"],
2002 SDLK_KP9, [2, "northeast"],
2003 SDLK_KP6, [3, "east"],
2004 SDLK_KP3, [4, "southeast"],
2005 SDLK_KP2, [5, "south"],
2006 SDLK_KP1, [6, "southwest"],
2007 SDLK_KP4, [7, "west"],
2008 SDLK_KP7, [8, "northwest"],
2009
2010 SDLK_UP, [1, "north"],
2011 SDLK_RIGHT, [3, "east"],
2012 SDLK_DOWN, [5, "south"],
2013 SDLK_LEFT, [7, "west"],
2014);
2015
2016sub key_down {
2017 my ($self, $ev) = @_;
2018
2019 my $mod = $ev->key_mod;
2020 my $sym = $ev->key_sym;
2021
2022 if ($sym == SDLK_KP5) {
2023 $::CONN->user_send ("stay fire");
2024 } elsif ($sym == SDLK_a) {
2025 $::CONN->user_send ("apply");
2026 } elsif ($sym == SDLK_QUOTE) {
2027 $self->emit ('activate_console');
2028 } elsif ($sym == SDLK_SLASH) {
2029 $self->emit ('activate_console' => '/');
2030 } elsif (exists $DIR{$sym}) {
2031 if ($mod & KMOD_SHIFT) {
2032 $self->{shft}++;
2033 $::CONN->user_send ("fire $DIR{$sym}[0]");
2034 } elsif ($mod & KMOD_CTRL) {
2035 $self->{ctrl}++;
2036 $::CONN->user_send ("run $DIR{$sym}[0]");
2037 } else {
2038 $::CONN->user_send ("$DIR{$sym}[1]");
2039 }
2040 }
2041}
2042
2043sub key_up {
2044 my ($self, $ev) = @_;
2045
2046 my $mod = $ev->key_mod;
2047 my $sym = $ev->key_sym;
2048
2049 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2050 $::CONN->user_send ("fire_stop");
2051 }
2052 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2053 $::CONN->user_send ("run_stop");
2054 }
2055}
2056
2057#############################################################################
2058
2059package CFClient::UI::Animator; 2054package CFClient::UI::Animator;
2060 2055
2061use SDL::OpenGL; 2056use CFClient::OpenGL;
2062 2057
2063our @ISA = CFClient::UI::Bin::; 2058our @ISA = CFClient::UI::Bin::;
2064 2059
2065sub moveto { 2060sub moveto {
2066 my ($self, $x, $y) = @_; 2061 my ($self, $x, $y) = @_;
… …
2106 my $class = shift; 2101 my $class = shift;
2107 2102
2108 my $self = $class->SUPER::new ( 2103 my $self = $class->SUPER::new (
2109 state => 0, 2104 state => 0,
2110 connect_activate => \&toggle_flopper, 2105 connect_activate => \&toggle_flopper,
2106 can_events => 1,
2111 @_ 2107 @_
2112 ); 2108 );
2113 2109
2114 if ($self->{state}) { 2110 if ($self->{state}) {
2115 $self->{state} = 0; 2111 $self->{state} = 0;
… …
2135 $self->emit (changed => $self->{state}); 2131 $self->emit (changed => $self->{state});
2136} 2132}
2137 2133
2138############################################################################# 2134#############################################################################
2139 2135
2136package CFClient::UI::Tooltip;
2137
2138our @ISA = CFClient::UI::Bin::;
2139
2140use CFClient::OpenGL;
2141
2142sub new {
2143 my $class = shift;
2144
2145 $class->SUPER::new (
2146 @_,
2147 can_events => 0,
2148 )
2149}
2150
2151sub set_text {
2152 my ($self, $text) = @_;
2153
2154 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8;
2155 $self->{label}->set_text ($text);
2156 $self->add ($self->{label});
2157}
2158
2159sub size_request {
2160 my ($self) = @_;
2161
2162 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2163
2164 $w = List::Util::min $::WIDTH * 0.2, $w;
2165
2166 ($w, $h)
2167}
2168
2169#############################################################################
2170
2140package CFClient::UI::Root; 2171package CFClient::UI::Root;
2141 2172
2142our @ISA = CFClient::UI::Container::; 2173our @ISA = CFClient::UI::Container::;
2143 2174
2144use SDL::OpenGL; 2175use CFClient::OpenGL;
2145 2176
2146sub check_size { 2177sub check_size {
2147 my ($self) = @_; 2178 my ($self) = @_;
2148 2179
2149 $self->configure (0, 0, $::WITH, $::HEIGHT); 2180 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2150} 2181}
2151 2182
2152sub size_request { 2183sub size_request {
2153 ($::WIDTH, $::HEIGHT) 2184 ($::WIDTH, $::HEIGHT)
2154} 2185}
… …
2156sub configure { 2187sub configure {
2157 my ($self, $x, $y, $w, $h) = @_; 2188 my ($self, $x, $y, $w, $h) = @_;
2158 2189
2159 $self->SUPER::configure ($x, $y, $w, $h); 2190 $self->SUPER::configure ($x, $y, $w, $h);
2160 2191
2161 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2162 for @{$self->{children}}; 2192 for my $child (@{$self->{children}}) {
2193 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2194
2195 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2196 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2197 $child->configure ($X, $Y, $W,$H);
2198 }
2163} 2199}
2164 2200
2165sub _topleft { 2201sub _topleft {
2166 my ($self, $x, $y) = @_; 2202 my ($self, $x, $y) = @_;
2167 2203
… …
2175 ::refresh (); 2211 ::refresh ();
2176} 2212}
2177 2213
2178sub add { 2214sub add {
2179 my ($self, $child) = @_; 2215 my ($self, $child) = @_;
2216
2217 # integerize window positions
2218 $child->{x} = int $child->{x};
2219 $child->{y} = int $child->{y};
2180 2220
2181 $self->SUPER::add ($child); 2221 $self->SUPER::add ($child);
2182} 2222}
2183 2223
2184sub on_refresh { 2224sub on_refresh {
… …
2210############################################################################# 2250#############################################################################
2211 2251
2212package CFClient::UI; 2252package CFClient::UI;
2213 2253
2214$ROOT = new CFClient::UI::Root; 2254$ROOT = new CFClient::UI::Root;
2255$TOOLTIP = new CFClient::UI::Tooltip;
2215 2256
22161 22571
2217 2258

Diff Legend

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