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

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

Diff Legend

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