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.155 by root, Sun Apr 23 02:22:54 2006 UTC vs.
Revision 1.201 by root, Sat May 13 23:17:49 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
14our $BUTTON_STATE; 15our $BUTTON_STATE;
15 16
16sub check_tooltip { 17sub check_tooltip {
17 if (!$GRAB) { 18 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 20 if (length $widget->{tooltip}) {
20 21
21 if ($TOOLTIP->{owner} != $widget) { 22 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 23 $TOOLTIP->{owner} = $widget;
23 24
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_text ($widget->{tooltip}); 29 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
31 } 41 }
32 42
33 return; 43 return;
34 } 44 }
35 } 45 }
… …
39 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
40} 50}
41 51
42# class methods for events 52# class methods for events
43sub feed_sdl_key_down_event { 53sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
55 if $FOCUS;
45} 56}
46 57
47sub feed_sdl_key_up_event { 58sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
60 if $FOCUS;
49} 61}
50 62
51sub feed_sdl_button_down_event { 63sub feed_sdl_button_down_event {
52 my ($ev) = @_; 64 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 65 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 73 check_tooltip;
62 } 74 }
63 75
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 76 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 77
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 78 if ($GRAB) {
79 ($x, $y) = $GRAB->coord2local ($x, $y);
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
67} 82}
68 83
69sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
70 my ($ev) = @_; 85 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
72 87
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 89
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 91
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 92 if ($GRAB) {
93 ($x, $y) = $GRAB->coord2local ($x, $y);
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
78 96
79 if (!$BUTTON_STATE) { 97 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 98 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 99 $grab->update if $grab;
82 $GRAB->update if $GRAB; 100 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 116 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 117
100 check_tooltip; 118 check_tooltip;
101 } 119 }
102 120
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
124 }
104} 125}
105 126
106# convert position array to integers 127# convert position array to integers
107sub harmonize { 128sub harmonize {
108 my ($vals) = @_; 129 my ($vals) = @_;
… …
126 147
127sub new { 148sub new {
128 my $class = shift; 149 my $class = shift;
129 150
130 my $self = bless { 151 my $self = bless {
131 x => 0, 152 x => 0,
132 y => 0, 153 y => 0,
133 z => 0, 154 z => 0,
134 can_events => 1, 155 can_events => 1,
135 @_ 156 @_
136 }, $class; 157 }, $class;
137 158
138 for (keys %$self) { 159 for (keys %$self) {
… …
142 } 163 }
143 164
144 $self 165 $self
145} 166}
146 167
168sub destroy {
169 my ($self) = @_;
170
171 $self->hide;
172 %$self = ();
173}
174
147sub show { 175sub show {
148 my ($self) = @_; 176 my ($self) = @_;
149 177
150 return if $self->{parent}; 178 return if $self->{parent};
151 179
… …
153} 181}
154 182
155sub hide { 183sub hide {
156 my ($self) = @_; 184 my ($self) = @_;
157 185
158 return unless $self->{parent}; 186 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self;
159 188
160 $self->{parent}->remove ($self); 189 $self->{parent}->remove ($self)
190 if $self->{parent};
161} 191}
162 192
163sub move { 193sub move {
164 my ($self, $x, $y, $z) = @_; 194 my ($self, $x, $y, $z) = @_;
165 195
… …
168 $self->{z} = $z if defined $z; 198 $self->{z} = $z if defined $z;
169 199
170 $self->update; 200 $self->update;
171} 201}
172 202
173sub needs_redraw { 203sub set_size {
174 0 204 my ($self, $w, $h) = @_;
205
206 $self->{user_w} = $w;
207 $self->{user_h} = $h;
208
209 $self->check_size;
175} 210}
176 211
177sub size_request { 212sub size_request {
178 require Carp; 213 require Carp;
179 Carp::confess "size_request is abstract"; 214 Carp::confess "size_request is abstract";
… …
199 $self->{y} = $y; 234 $self->{y} = $y;
200 $self->update; 235 $self->update;
201 } 236 }
202 237
203 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
204 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
205 $self->{h} = $h;
206
207 $self->size_allocate ($w, $h);
208 $self->update;
209 } 240 }
210} 241}
211 242
212sub size_allocate { 243sub size_allocate {
213 # nothing to be done 244 # nothing to be done
214} 245}
215 246
216# return top left coordinates 247sub children {
217sub _topleft { 248}
249
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259}
260
261sub set_max_size {
218 my ($self, $x, $y) = @_; 262 my ($self, $w, $h) = @_;
219 263
220 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h;
221} 266}
222 267
223# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
224sub coord2local { 269sub coord2local {
225 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
226 271
227 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
228 ($x - $X, $y - $Y)
229} 273}
230 274
231# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
232sub coord2global { 276sub coord2global {
233 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
234 278
235 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
236 ($x + $X, $y + $Y)
237} 280}
238 281
239sub focus_in { 282sub focus_in {
240 my ($self) = @_; 283 my ($self) = @_;
241 284
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
303 glEnd; 346 glEnd;
304 glDisable GL_BLEND; 347 glDisable GL_BLEND;
305 } 348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0;
356 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h};
359 glEnd;
360 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 }
306} 363}
307 364
308sub _draw { 365sub _draw {
309 my ($self) = @_; 366 my ($self) = @_;
310 367
… …
325 382
326sub set_parent { 383sub set_parent {
327 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
328 385
329 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
330} 391}
331 392
332sub check_size { 393sub check_size {
333 my ($self) = @_; 394 my ($self, $forced) = @_;
334 395
335 return unless $self->{parent}; 396 $self->{force_alloc} = 1 if $forced;
336 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
337 my ($w, $h) = $self->size_request;
338
339 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w;
341 $self->{req_h} = $h;
342
343 $self->{parent}->check_size;
344 }
345} 398}
346 399
347sub update { 400sub update {
348 my ($self) = @_; 401 my ($self) = @_;
349 402
… …
358} 411}
359 412
360sub emit { 413sub emit {
361 my ($self, $signal, @args) = @_; 414 my ($self, $signal, @args) = @_;
362 415
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
364 $cb->($self, @args);
365 }
366} 417}
367 418
368sub DESTROY { 419sub DESTROY {
369 my ($self) = @_; 420 my ($self) = @_;
370 421
… …
437sub new { 488sub new {
438 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
439 490
440 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
441 492
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 493 my $self = $class->SUPER::new (
494 children => [],
495 can_events => 0,
496 %arg,
497 );
443 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
444 499
445 $self 500 $self
446} 501}
447 502
448sub add { 503sub add {
449 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
450 505
451 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
452 508
453 use sort 'stable'; 509 use sort 'stable';
454 510
455 $self->{children} = [ 511 $self->{children} = [
456 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
457 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
458 ]; 514 ];
459 515
460 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
461} 522}
462 523
463sub remove { 524sub remove {
464 my ($self, $child) = @_; 525 my ($self, $child) = @_;
465 526
466 delete $child->{parent}; 527 delete $child->{parent};
528 $child->hide;
467 529
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531
532 $self->check_size;
533 $self->update;
534}
535
536sub clear {
537 my ($self) = @_;
538
539 my $children = delete $self->{children};
540 $self->{children} = [];
541
542 for (@$children) {
543 delete $_->{parent};
544 $_->hide;
545 }
469 546
470 $self->check_size; 547 $self->check_size;
471 $self->update; 548 $self->update;
472} 549}
473 550
… …
551} 628}
552 629
553sub update { 630sub update {
554 my ($self) = @_; 631 my ($self) = @_;
555 632
556 # we want to do this delayed... 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
557 $self->render_chld;
558 $self->SUPER::update; 634 $self->SUPER::update;
559}
560
561sub render_chld {
562 my ($self) = @_;
563
564 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
565 glClearColor 0, 0, 0, 1;
566 glClear GL_COLOR_BUFFER_BIT;
567 $self->child->draw;
568 };
569} 635}
570 636
571sub size_allocate { 637sub size_allocate {
572 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
573 639
574 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
575 643
644sub _render {
645 $_[0]{children}[0]->draw;
646}
647
648sub render_child {
649 my ($self) = @_;
650
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT;
654
576 $self->render_chld; 655 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 };
577} 664}
578 665
579sub _draw { 666sub _draw {
580 my ($self) = @_; 667 my ($self) = @_;
581 668
582 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
583 670
584 my $tex = $self->{texture} 671 my $tex = $self->{texture}
585 or return; 672 or return;
586 673
587 glEnable GL_BLEND;
588 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
589 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1;
591 677
592 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
593 679
594 glDisable GL_BLEND;
595 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
596} 681}
597 682
598############################################################################# 683#############################################################################
599 684
600package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
601 686
602our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
603 688
604sub new { die }
605
606sub size_request { 689sub size_request {
607 my ($self) = @_; 690 my ($self) = @_;
608 691
609 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
610 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
611 694
612 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
613} 696}
614 697
615sub _draw { 698sub size_allocate {
616 my ($self) = @_; 699 my ($self, $w, $h) = @_;
617 700
618 $self->{children}[1]->draw; 701 $self->update;
619} 702}
620 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
621 706
622############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
623 709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
624package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
625 752
626our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
627
628use CFClient::OpenGL;
629 754
630sub new { 755sub new {
631 my $class = shift; 756 my $class = shift;
632 757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
633 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
634 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
635 border_bg => [1, 1, 1, 1], 770 slider => $slider,
636 border => 0.8,
637 @_ 771 @_,
638 ); 772 );
639 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
640 $self 778 $self
641} 779}
642 780
643sub set_size { 781#TODO# update range on size_allocate depending on child
644 my ($self, $w, $h) = @_; 782# update viewport offset on scroll
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648}
649 783
650sub size_request { 784#############################################################################
651 my ($self) = @_;
652 ($self->{req_w}, $self->{req_h})
653}
654 785
655sub size_allocate { 786package CFClient::UI::Frame;
656 my ($self, $w, $h) = @_; 787
657 $self->{w} = $w; 788our @ISA = CFClient::UI::Bin::;
658 $self->{h} = $h; 789
659 $self->child->configure (0, 0, $w, $h); 790use CFClient::OpenGL;
791
792sub new {
793 my $class = shift;
794
795 $class->SUPER::new (
796 bg => undef,
797 @_,
798 )
660} 799}
661 800
662sub _draw { 801sub _draw {
663 my ($self) = @_; 802 my ($self) = @_;
664 803
665 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
666 806
667 glEnable GL_BLEND; 807 glEnable GL_BLEND;
668 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
669 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
670 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
671 810
672# glBegin GL_QUADS; 811 glBegin GL_QUADS;
673# glColor 0, 0, 0, 0;
674# glVertex 0 , 0; 812 glVertex 0 , 0;
675# glVertex 0 , $h; 813 glVertex 0 , $h;
676# glVertex $w, $h; 814 glVertex $w, $h;
677# glVertex $w, 0; 815 glVertex $w, 0;
678# glEnd; 816 glEnd;
679 817
680
681 $self->child->draw;
682 glDisable GL_BLEND; 818 glDisable GL_BLEND;
683 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
684} 822}
685 823
686############################################################################# 824#############################################################################
687 825
688package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
699 my $class = shift; 837 my $class = shift;
700 838
701 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
702 840
703 my $self = $class->SUPER::new ( 841 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
706 border => 0.8, 844 border => 0.6,
707 can_events => 1, 845 can_events => 1,
708 @_ 846 @_
709 ); 847 );
710 848
711 $self->{title} &&= new CFClient::UI::Label 849 $self->{title} &&= new CFClient::UI::Label
712 align => 0, 850 align => 0,
713 valign => 1, 851 valign => 1,
714 text => $self->{title}, 852 text => $self->{title},
715 fontsize => 1; 853 fontsize => $self->{border};
716 854
717 $self 855 $self
718} 856}
719 857
720sub border { 858sub border {
721 int $_[0]{border} * $::FONTSIZE 859 int $_[0]{border} * $::FONTSIZE
722} 860}
723 861
724sub size_request { 862sub size_request {
725 my ($self) = @_; 863 my ($self) = @_;
726
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728 864
729 my ($w, $h) = $self->SUPER::size_request; 865 my ($w, $h) = $self->SUPER::size_request;
730 866
731 ( 867 (
732 $w + $self->border * 2, 868 $w + $self->border * 2,
… …
747} 883}
748 884
749sub button_down { 885sub button_down {
750 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
751 887
888 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 889 my $border = $self->border;
753 890
754 if ($x < $self->{w} && $x >= $self->{w} - $border 891 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 892 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 893
894 if ($lr & $td) {
895 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 897 my ($bw, $bh) = ($self->{w}, $self->{h});
759 898
899 my $mx = $x < $border;
900 my $my = $y < $border;
901
760 $self->{motion} = sub { 902 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
762 904
763 ($x, $y) = ($ev->{x}, $ev->{y}); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
764 907
765 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
766 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
767 $self->check_size; 911 $self->check_size;
768 }; 912 };
769 913
770 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
775 917
776 $self->{motion} = sub { 918 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
… …
800 my ($self) = @_; 942 my ($self) = @_;
801 943
802 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
803 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
804 946
805 glEnable GL_BLEND;
806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
807 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
809 949
810 my $border = $self->border; 950 my $border = $self->border;
811 951
812 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
813 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
817 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
818 my $bg = $tex[0]; 959 my $bg = $tex[0];
819 960
820 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
822 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
823 964
824 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
825 966
826 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
827 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
828 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
829 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
830 972
831 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND;
833 974
834 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
976
835 $self->child->draw; 977 $self->child->draw;
836} 978}
837 979
838############################################################################# 980#############################################################################
839 981
… …
861 $self->{children}[$y][$x] = $child; 1003 $self->{children}[$y][$x] = $child;
862 1004
863 $child->check_size; 1005 $child->check_size;
864} 1006}
865 1007
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010}
1011
866# TODO: move to container class maybe? send childs a signal on removal? 1012# TODO: move to container class maybe? send childs a signal on removal?
867sub clear { 1013sub clear {
868 my ($self) = @_; 1014 my ($self) = @_;
869 1015
1016 my @children = $self->children;
870 delete $self->{children}; 1017 delete $self->{children};
1018
1019 for (@children) {
1020 delete $_->{parent};
1021 $_->hide;
1022 }
1023
871 $self->update; 1024 $self->update;
872} 1025}
873 1026
874sub get_wh { 1027sub get_wh {
875 my ($self) = @_; 1028 my ($self) = @_;
… …
1052} 1205}
1053 1206
1054sub size_allocate { 1207sub size_allocate {
1055 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1056 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1057 my $children = $self->{children}; 1212 my $children = $self->{children};
1058 1213
1059 my @h = map $_->{req_h}, @$children; 1214 my @h = map $_->{req_h}, @$children;
1060 1215
1061 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
… …
1098 1253
1099sub new { 1254sub new {
1100 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1101 1256
1102 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1104 fontsize => 1, 1263 fontsize => 1,
1105 text => "",
1106 align => -1, 1264 align => -1,
1107 valign => -1, 1265 valign => -1,
1108 padding => 2, 1266 padding => 2,
1109 layout => new CFClient::Layout,
1110 can_events => 0, 1267 can_events => 0,
1111 %arg 1268 %arg
1112 ); 1269 );
1113 1270
1114 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1115 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1116 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1117 $self->{template} = $layout; 1274 $self->{template} = $layout;
1118 } 1275 }
1119 1276
1120 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1278 $self->set_markup (delete $self->{markup});
1279 } else {
1280 $self->set_text (delete $self->{text});
1281 }
1122 1282
1123 $self 1283 $self
1124} 1284}
1125 1285
1126sub escape_text { 1286sub escape {
1127 local $_ = $_[1]; 1287 local $_ = $_[1];
1128 1288
1129 s/&/&amp;/g; 1289 s/&/&amp;/g;
1130 s/>/&gt;/g; 1290 s/>/&gt;/g;
1131 s/</&lt;/g; 1291 s/</&lt;/g;
1132 1292
1133 $_[1] 1293 $_[1]
1134} 1294}
1135 1295
1296sub update {
1297 my ($self) = @_;
1298
1299 delete $self->{texture};
1300 $self->SUPER::update;
1301}
1302
1136sub set_text { 1303sub set_text {
1137 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1138 1305
1306 return if $self->{text} eq "T$text";
1307 $self->{text} = "T$text";
1308
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1139 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1140 1311
1141 delete $self->{texture}; 1312 $self->update;
1142 $self->check_size; 1313 $self->check_size;
1143 $self->update;
1144} 1314}
1145 1315
1146sub set_markup { 1316sub set_markup {
1147 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1148 1318
1319 return if $self->{text} eq "M$markup";
1320 $self->{text} = "M$markup";
1321
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1149 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1150 1326
1151 delete $self->{texture}; 1327 $self->update;
1152 $self->check_size; 1328 $self->check_size;
1153 $self->update;
1154} 1329}
1155 1330
1156sub size_request { 1331sub size_request {
1157 my ($self) = @_; 1332 my ($self) = @_;
1158 1333
1159 $self->{layout}->set_width; 1334 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1);
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1337
1162 my ($w, $h) = $self->{layout}->size; 1338 my ($w, $h) = $self->{layout}->size;
1163 1339
1164 if (exists $self->{template}) { 1340 if (exists $self->{template}) {
1341 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1342 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1343
1167 my ($w2, $h2) = $self->{template}->size; 1344 my ($w2, $h2) = $self->{template}->size;
1168 1345
1169 $w = List::Util::max $w, $w2; 1346 $w = List::Util::max $w, $w2;
… …
1185sub set_fontsize { 1362sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1187 1364
1188 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1190 $self->check_size; 1369 $self->check_size;
1191 $self->update;
1192} 1370}
1193 1371
1194sub _draw { 1372sub _draw {
1195 my ($self) = @_; 1373 my ($self) = @_;
1196 1374
1197 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1380
1200 new_from_layout CFClient::Texture $self->{layout} 1381 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1201 }; 1392 };
1202 1393
1203 glEnable GL_BLEND;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1207 1396
1397 if ($tex->{format} == GL_ALPHA) {
1208 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1209
1210 $self->{ox} = int (
1211 $self->{align} < 0 ? $self->{padding}
1212 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1213 : ($self->{w} - $tex->{w}) * 0.5
1214 );
1215
1216 $self->{oy} = int (
1217 $self->{valign} < 0 ? $self->{padding}
1218 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1219 : ($self->{h} - $tex->{h}) * 0.5
1220 );
1221
1222 $tex->draw_quad ($self->{ox}, $self->{oy}); 1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1400 } else {
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1402 }
1223 1403
1224 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1225 glDisable GL_BLEND;
1226} 1405}
1227 1406
1228############################################################################# 1407#############################################################################
1229 1408
1230package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1235 1414
1236sub new { 1415sub new {
1237 my $class = shift; 1416 my $class = shift;
1238 1417
1239 $class->SUPER::new ( 1418 $class->SUPER::new (
1240 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1244 can_hover => 1, 1423 can_hover => 1,
1245 can_focus => 1, 1424 can_focus => 1,
1246 valign => 0, 1425 valign => 0,
1247 can_events => 1, 1426 can_events => 1,
1248 @_ 1427 @_
1249 ) 1428 )
1250} 1429}
1251 1430
… …
1265 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1266 1445
1267 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1268} 1447}
1269 1448
1449sub set_text {
1450 my ($self, $text) = @_;
1451
1452 $self->{cursor} = length $text;
1453 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456}
1457
1270sub get_text { 1458sub get_text {
1271 $_[0]{text} 1459 $_[0]{text}
1272} 1460}
1273 1461
1274sub size_request { 1462sub size_request {
… …
1281 1469
1282sub size_allocate { 1470sub size_allocate {
1283 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1284 1472
1285 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1286}
1287
1288sub set_text {
1289 my ($self, $text) = @_;
1290
1291 $self->{cursor} = length $text;
1292 $self->_set_text ($text);
1293 $self->update;
1294} 1474}
1295 1475
1296sub key_down { 1476sub key_down {
1297 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1298 1478
… …
1300 my $sym = $ev->{sym}; 1480 my $sym = $ev->{sym};
1301 my $uni = $ev->{unicode}; 1481 my $uni = $ev->{unicode};
1302 1482
1303 my $text = $self->get_text; 1483 my $text = $self->get_text;
1304 1484
1305 if ($sym == 8) { 1485 if ($uni == 8) {
1306 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1307 } elsif ($sym == 127) { 1487 } elsif ($uni == 127) {
1308 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1309 } elsif ($sym == CFClient::SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1310 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1311 } elsif ($sym == CFClient::SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1312 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1313 } elsif ($sym == CFClient::SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1314 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1315 } elsif ($sym == CFClient::SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1316 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1317 } elsif ($sym == 27) { 1497 } elsif ($uni == 27) {
1318 $self->emit ('escape'); 1498 $self->emit ('escape');
1319 } elsif ($uni) { 1499 } elsif ($uni) {
1320 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1321 } 1501 }
1322 1502
… …
1405 my ($self, $ev) = @_; 1585 my ($self, $ev) = @_;
1406 1586
1407 my $sym = $ev->{sym}; 1587 my $sym = $ev->{sym};
1408 1588
1409 if ($sym == 13) { 1589 if ($sym == 13) {
1590 unshift @{$self->{history}},
1591 my $txt = $self->get_text;
1592 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1594 $self->emit (activate => $txt);
1411 $self->update; 1595 $self->update;
1596
1597 } elsif ($sym == CFClient::SDLK_UP) {
1598 if ($self->{history_pointer} < 0) {
1599 $self->{history_saveback} = $self->get_text;
1600 }
1601 if (@{$self->{history} || []} > 0) {
1602 $self->{history_pointer}++;
1603 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1604 $self->{history_pointer} = @{$self->{history} || []} - 1;
1605 }
1606 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1607 }
1608
1609 } elsif ($sym == CFClient::SDLK_DOWN) {
1610 $self->{history_pointer}--;
1611 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1612
1613 if ($self->{history_pointer} >= 0) {
1614 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1615 } else {
1616 $self->set_text ($self->{history_saveback});
1617 }
1412 1618
1413 } else { 1619 } else {
1414 $self->SUPER::key_down ($ev); 1620 $self->SUPER::key_down ($ev);
1415 } 1621 }
1416 1622
… …
1430 1636
1431sub new { 1637sub new {
1432 my $class = shift; 1638 my $class = shift;
1433 1639
1434 $class->SUPER::new ( 1640 $class->SUPER::new (
1435 padding => 4, 1641 padding => 4,
1436 fg => [1, 1, 1], 1642 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2], 1643 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1644 active_fg => [0, 0, 1],
1439 can_hover => 1, 1645 can_hover => 1,
1440 align => 0, 1646 align => 0,
1441 valign => 0, 1647 valign => 0,
1442 can_events => 1, 1648 can_events => 1,
1443 @_ 1649 @_
1444 ) 1650 )
1445} 1651}
1446 1652
… …
1460 1666
1461 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1462 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1463 } 1669 }
1464 1670
1465 glEnable GL_BLEND;
1466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1467 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1470 1674
1471 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1472 1676
1473 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1474 glDisable GL_BLEND;
1475 1678
1476 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1477} 1680}
1478 1681
1479############################################################################# 1682#############################################################################
… …
1526 1729
1527 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1528 1731
1529 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1530 1733
1531 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1532 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1533 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1534
1535 my $tex = $self->{state} ? $tex[1] : $tex[0];
1536
1537 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1538
1539 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541} 1739}
1542 1740
1543############################################################################# 1741#############################################################################
1544 1742
1545package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1588 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1589 1787
1590 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1591 } 1789 }
1592 1790
1593 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1597 1793
1598 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1599 1795
1600 glDisable GL_BLEND;
1601 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1602} 1797}
1603 1798
1604############################################################################# 1799#############################################################################
1605 1800
1606package CFClient::UI::VGauge; 1801package CFClient::UI::VGauge;
1607 1802
1608our @ISA = CFClient::UI::Base::; 1803our @ISA = CFClient::UI::Base::;
1804
1805use List::Util qw(min max);
1609 1806
1610use CFClient::OpenGL; 1807use CFClient::OpenGL;
1611 1808
1612my %tex = ( 1809my %tex = (
1613 food => [ 1810 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1811 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1812 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1813 ],
1617 grace => [ 1814 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1815 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1816 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1817 ],
1621 hp => [ 1818 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1819 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1820 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1821 ],
1625 mana => [ 1822 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1824 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1825 ],
1629); 1826);
1630 1827
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1828# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1829sub new {
… …
1651} 1848}
1652 1849
1653sub set_max { 1850sub set_max {
1654 my ($self, $max) = @_; 1851 my ($self, $max) = @_;
1655 1852
1853 return if $self->{max_val} == $max;
1854
1656 $self->{max_val} = $max; 1855 $self->{max_val} = $max;
1856 $self->update;
1657} 1857}
1658 1858
1659sub set_value { 1859sub set_value {
1660 my ($self, $val, $max) = @_; 1860 my ($self, $val, $max) = @_;
1661 1861
1662 $self->set_max ($max) 1862 $self->set_max ($max)
1663 if defined $max; 1863 if defined $max;
1664 1864
1665 $max = $self->{max_val}; 1865 return if $self->{val} == $val;
1866
1666 $self->{val} = $val; 1867 $self->{val} = $val;
1667
1668 $self->update; 1868 $self->update;
1669} 1869}
1670 1870
1671sub _draw { 1871sub _draw {
1672 my ($self) = @_; 1872 my ($self) = @_;
1673 1873
1674 my $tex = $tex{$self->{type}}; 1874 my $tex = $tex{$self->{type}};
1875 my ($t1, $t2, $t3) = @$tex;
1675 1876
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1877 my ($w, $h) = ($self->{w}, $self->{h});
1677 1878
1678 if ($self->{vertical}) { 1879 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1880 glRotate 90, 0, 0, 1;
… …
1681 1882
1682 ($w, $h) = ($h, $w); 1883 ($w, $h) = ($h, $w);
1683 } 1884 }
1684 1885
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1886 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1887
1688 my $t1 = $tex->[0]; 1888 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 1889 my $ycut2 = max 0, min 1, $ycut - 1;
1890
1891 my $h1 = $self->{h} * (1 - $ycut1);
1892 my $h2 = $self->{h} * (1 - $ycut2);
1690 1893
1691 glEnable GL_BLEND; 1894 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1896 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1897 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1898
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1899 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1900 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1901 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1902 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1903 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1904 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1905 glEnd;
1706 1906
1907 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1908 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1909 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1910 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1911 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1912 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1913 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 1914 glEnd;
1915
1916 if ($t3) {
1917 glBindTexture GL_TEXTURE_2D, $t3->{name};
1918 glBegin GL_QUADS;
1919 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1920 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1921 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1922 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1923 glEnd;
1924 }
1714 1925
1715 glDisable GL_BLEND; 1926 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1927 glDisable GL_TEXTURE_2D;
1717} 1928}
1718 1929
… …
1724 1935
1725sub new { 1936sub new {
1726 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1727 1938
1728 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 1940 tooltip => $arg{type},
1941 can_hover => 1,
1942 can_events => 1,
1730 %arg, 1943 %arg,
1731 ); 1944 );
1732 1945
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1946 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1734 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1947 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1735 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1948 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 1949
1737 $self 1950 $self
1738} 1951}
1739 1952
… …
1742 1955
1743 $self->{value}->set_fontsize ($fsize); 1956 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 1957 $self->{max} ->set_fontsize ($fsize);
1745} 1958}
1746 1959
1960sub set_max {
1961 my ($self, $max) = @_;
1962
1963 $self->{gauge}->set_max ($max);
1964 $self->{max}->set_text ($max);
1965}
1966
1747sub set_value { 1967sub set_value {
1748 my ($self, $val, $max) = @_; 1968 my ($self, $val, $max) = @_;
1749 1969
1750 $self->set_max ($max) 1970 $self->set_max ($max)
1751 if defined $max; 1971 if defined $max;
1752 1972
1753 $self->{gauge}->set_value ($val, $max); 1973 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 1974 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762} 1975}
1763 1976
1764############################################################################# 1977#############################################################################
1765 1978
1766package CFClient::UI::Slider; 1979package CFClient::UI::Slider;
… …
1785 # TODO: calculations are off 1998 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1789 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1790 req_w => 20, 2003 req_w => $::WIDTH / 80,
1791 req_h => 20, 2004 req_h => $::WIDTH / 80,
1792 vertical => 0, 2005 vertical => 0,
1793 can_hover => 1, 2006 can_hover => 1,
1794 inner_pad => 5, 2007 inner_pad => 5,
1795 @_ 2008 @_
1796 ); 2009 );
… …
1879 $page ||= 2; 2092 $page ||= 2;
1880 2093
1881 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1882 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1883 2096
1884 glEnable GL_BLEND;
1885 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1886 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 2099
1889 # draw background 2100 # draw background
1890 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1891 2102
1892 # draw handle 2103 # draw handle
1893 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1894 2105
1895 glDisable GL_BLEND;
1896 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
1897} 2107}
1898 2108
1899############################################################################# 2109#############################################################################
1900 2110
… …
1906 2116
1907sub new { 2117sub new {
1908 my $class = shift; 2118 my $class = shift;
1909 2119
1910 my $self = $class->SUPER::new ( 2120 my $self = $class->SUPER::new (
1911 fontsize => 1, 2121 fontsize => 1,
2122 can_events => 0,
2123 #font => default_font
1912 @_, 2124 @_,
1913 2125
1914 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
1915 par => [], 2127 par => [],
1916 height => 0, 2128 height => 0,
1917 children => [ 2129 children => [
1918 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
1920 ], 2132 ],
1921 ); 2133 );
1922 2134
1923 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2136
1927 $self 2137 $self
1928} 2138}
1929 2139
1930sub set_fontsize { 2140sub set_fontsize {
… …
1938 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
1939 2149
1940 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
1941 2151
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
1944 $layout->set_text ($text); 2154 $layout->set_markup ($text);
1945 2155
1946 ($layout->size)[1] 2156 ($layout->size)[1]
1947} 2157}
1948 2158
1949sub reflow { 2159sub reflow {
… …
1956sub size_allocate { 2166sub size_allocate {
1957 my ($self, $w, $h) = @_; 2167 my ($self, $w, $h) = @_;
1958 2168
1959 $self->SUPER::size_allocate ($w, $h); 2169 $self->SUPER::size_allocate ($w, $h);
1960 2170
2171 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1962 $self->{layout}->set_width ($self->{children}[0]{w}); 2173 $self->{layout}->set_width ($self->{children}[0]{w});
1963 2174
1964 $self->reflow; 2175 $self->reflow;
1965} 2176}
… …
1986 2197
1987 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
1988 2199
1989 delete $self->{texture}; 2200 delete $self->{texture};
1990 2201
1991 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
1992 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
1993 my $height = 0; 2204 my $height = 0;
1994 2205
1995 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
1996 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2001 2212
2002 delete $self->{texture}; 2213 delete $self->{texture};
2003 } 2214 }
2004 2215
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2006 glClearColor 0, 0, 0, 1; 2217 glClearColor 0, 0, 0, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
2008 2219
2009 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2222
2014 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
2015 2224
… …
2018 2227
2019 my $y = 0; 2228 my $y = 0;
2020 2229
2021 my $layout = $self->{layout}; 2230 my $layout = $self->{layout};
2022 2231
2232 $layout->set_font ($self->{font}) if $self->{font};
2233
2023 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2235 my $h = $par->[0];
2025 2236
2026 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2027 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
2028 2240
2029 glColor @{ $par->[1] };
2030 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
2031 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2032 } 2243 }
2033 2244
2034 $y += $h; 2245 $y += $h;
2035 } 2246 }
2036 2247
2037 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2038 glDisable GL_BLEND;
2039 }; 2249 };
2040 }); 2250 });
2041} 2251}
2042 2252
2043sub _draw { 2253sub _draw {
2044 my ($self) = @_; 2254 my ($self) = @_;
2045 2255
2046 if ($self->{texture}) {
2047 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2258 glColor 1, 1, 1, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2051 }
2052 2261
2053 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2054 2263
2055} 2264}
2056 2265
… …
2104 2313
2105sub new { 2314sub new {
2106 my $class = shift; 2315 my $class = shift;
2107 2316
2108 my $self = $class->SUPER::new ( 2317 my $self = $class->SUPER::new (
2109 state => 0, 2318 state => 0,
2110 connect_activate => \&toggle_flopper, 2319 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2320 @_
2113 ); 2321 );
2114 2322
2115 if ($self->{state}) { 2323 if ($self->{state}) {
2116 $self->{state} = 0; 2324 $self->{state} = 0;
… …
2151 @_, 2359 @_,
2152 can_events => 0, 2360 can_events => 0,
2153 ) 2361 )
2154} 2362}
2155 2363
2156sub set_text { 2364sub set_tooltip_from {
2157 my ($self, $text) = @_; 2365 my ($self, $widget) = @_;
2158 2366
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2367 $self->add (new CFClient::UI::Label
2160 $self->{label}->set_text ($text); 2368 markup => $widget->{tooltip},
2161 $self->add ($self->{label}); 2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8,
2371 fg => [0, 0, 0, 1],
2372 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 );
2162} 2374}
2163 2375
2164sub size_request { 2376sub size_request {
2165 my ($self) = @_; 2377 my ($self) = @_;
2166 2378
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2380
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2381 ($w + 4, $h + 4)
2173} 2382}
2174 2383
2384sub size_allocate {
2385 my ($self, $w, $h) = @_;
2386
2387 $self->SUPER::size_allocate ($w - 4, $h - 4);
2388}
2389
2175sub _draw { 2390sub _draw {
2176 my ($self) = @_; 2391 my ($self) = @_;
2177 2392
2178 glPushMatrix;
2179 glTranslate 0.375, 0.375; 2393 glTranslate 0.375, 0.375;
2180 2394
2181 my ($w, $h) = @$self{qw(w h)}; 2395 my ($w, $h) = @$self{qw(w h)};
2182 2396
2183 glColor 1, 0.8, 0.4; 2397 glColor 1, 0.8, 0.4;
… …
2194 glVertex 0 , $h; 2408 glVertex 0 , $h;
2195 glVertex $w, $h; 2409 glVertex $w, $h;
2196 glVertex $w, 0; 2410 glVertex $w, 0;
2197 glEnd; 2411 glEnd;
2198 2412
2199 glPopMatrix; 2413 glTranslate 2 - 0.375, 2 - 0.375;
2200
2201 glTranslate 2, 2;
2202 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
2203} 2415}
2204 2416
2205############################################################################# 2417#############################################################################
2206 2418
2419package CFClient::UI::Face;
2420
2421our @ISA = CFClient::UI::Base::;
2422
2423use CFClient::OpenGL;
2424
2425sub new {
2426 my $class = shift;
2427
2428 $class->SUPER::new (
2429 aspect => 1,
2430 @_,
2431 )
2432}
2433
2434sub size_request {
2435 (32, 8)
2436}
2437
2438sub _draw {
2439 my ($self) = @_;
2440
2441 return unless $::CONN;#d# manage and cache textures differently
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2443
2444 # TODO animation
2445 if ($tex) {
2446 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D;
2451 }
2452}
2453
2454#############################################################################
2455
2456package CFClient::UI::InventoryItem;
2457
2458our @ISA = CFClient::UI::HBox::;
2459
2460sub new {
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_;
2539
2540 $self->{scrolled}->clear;
2541 return unless $items;
2542
2543 my @items = sort {
2544 ($a->{type} <=> $b->{type})
2545 or ($a->{name} cmp $b->{name})
2546 } @$items;
2547
2548 $self->{real_items} = \@items;
2549
2550 for my $item (@items) {
2551 my $desc = $item->{nrof} < 2
2552 ? $item->{name}
2553 : "$item->{nrof} $item->{name_pl}";
2554
2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2556 }
2557
2558 $self->{scrolled}->add (@items);
2559
2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561}
2562
2563sub size_request {
2564 my ($self) = @_;
2565 ($self->{req_w}, $self->{req_h});
2566}
2567
2568#############################################################################
2569
2570package CFClient::UI::Menu;
2571
2572our @ISA = CFClient::UI::FancyFrame::;
2573
2574use CFClient::OpenGL;
2575
2576sub new {
2577 my $class = shift;
2578
2579 my $self = $class->SUPER::new (
2580 items => [],
2581 z => 100,
2582 @_,
2583 );
2584
2585 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2586
2587 for my $item (@{ $self->{items} }) {
2588 my ($widget, $cb) = @$item;
2589
2590 # handle various types of items, only text for now
2591 if (!ref $widget) {
2592 $widget = new CFClient::UI::Label
2593 can_hover => 1,
2594 can_events => 1,
2595 text => $widget;
2596 }
2597
2598 $self->{item}{$widget} = $item;
2599
2600 $self->{vbox}->add ($widget);
2601 }
2602
2603 $self
2604}
2605
2606# popup given the event (must be a mouse button down event currently)
2607sub popup {
2608 my ($self, $ev) = @_;
2609
2610 $self->emit ("popdown");
2611
2612 # maybe save $GRAB? must be careful about events...
2613 $GRAB = $self;
2614 $self->{button} = $ev->{button};
2615
2616 $self->show;
2617 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2618}
2619
2620sub mouse_motion {
2621 my ($self, $ev, $x, $y) = @_;
2622
2623 # TODO: should use vbox->find_widget or so
2624 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2625 $self->{hover} = $self->{item}{$HOVER};
2626}
2627
2628sub button_up {
2629 my ($self, $ev, $x, $y) = @_;
2630
2631 if ($ev->{button} == $self->{button}) {
2632 undef $GRAB;
2633 $self->hide;
2634
2635 $self->emit ("popdown");
2636 $self->{hover}[1]->() if $self->{hover};
2637 }
2638}
2639
2640#############################################################################
2641
2642package CFClient::UI::Statusbox;
2643
2644our @ISA = CFClient::UI::VBox::;
2645
2646sub reorder {
2647 my ($self) = @_;
2648 my $NOW = time;
2649
2650 while (my ($k, $v) = each %{ $self->{item} }) {
2651 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2652 }
2653
2654 my @widgets;
2655
2656 my @items = sort {
2657 $a->{pri} <=> $b->{pri}
2658 or $b->{id} <=> $a->{id}
2659 } values %{ $self->{item} };
2660
2661 my $count = 10 + 1;
2662 for my $item (@items) {
2663 last unless --$count;
2664
2665 push @widgets, $item->{label} ||= do {
2666 # TODO: doesn't handle markup well (read as: at all)
2667 my $short = $item->{count} > 1
2668 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text};
2670
2671 for ($short) {
2672 s/^\s+//;
2673 s/\012.*/…/s;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 }
2677
2678 new CFClient::UI::Label
2679 markup => $short,
2680 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize},
2684 color => $item->{color},
2685 can_events => 1,
2686 can_hover => 1
2687 };
2688 }
2689
2690 $self->clear;
2691 $self->SUPER::add (reverse @widgets);
2692}
2693
2694sub add {
2695 my ($self, $text, %arg) = @_;
2696
2697 $text =~ s/^\s+//;
2698 $text =~ s/\s+$//;
2699
2700 my $timeout = time + ((delete $arg{timeout}) || 60);
2701
2702 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703
2704 if (my $item = $self->{item}{$group}) {
2705 if ($item->{text} eq $text) {
2706 $item->{count}++;
2707 } else {
2708 $item->{count} = 1;
2709 $item->{text} = $item->{tooltip} = $text;
2710 }
2711 $item->{id} = ++$self->{id};
2712 $item->{timeout} = $timeout;
2713 delete $item->{label};
2714 } else {
2715 $self->{item}{$group} = {
2716 id => ++$self->{id},
2717 text => $text,
2718 timeout => $timeout,
2719 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0,
2723 count => 1,
2724 %arg,
2725 };
2726 }
2727
2728 $self->reorder;
2729}
2730
2731#############################################################################
2732
2207package CFClient::UI::Root; 2733package CFClient::UI::Root;
2208 2734
2209our @ISA = CFClient::UI::Container::; 2735our @ISA = CFClient::UI::Container::;
2210 2736
2211use CFClient::OpenGL; 2737use CFClient::OpenGL;
2212 2738
2213sub check_size { 2739sub new {
2214 my ($self) = @_; 2740 my $class = shift;
2215 2741
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2742 $class->SUPER::new (
2217} 2743 @_,
2218 2744 )
2219sub size_request {
2220 ($::WIDTH, $::HEIGHT)
2221} 2745}
2222 2746
2223sub configure { 2747sub configure {
2224 my ($self, $x, $y, $w, $h) = @_; 2748 my ($self, $x, $y, $w, $h) = @_;
2225 2749
2226 $self->SUPER::configure ($x, $y, $w, $h); 2750 $self->{w} = $w;
2751 $self->{h} = $h;
2752}
2227 2753
2754sub check_size {
2755 my ($self) = @_;
2756
2757 $self->size_allocate ($self->{w}, $self->{h})
2758 if $self->{w};
2759}
2760
2761sub size_request {
2762 my ($self) = @_;
2763
2764 ($self->{w}, $self->{h})
2765}
2766
2767sub size_allocate {
2768 my ($self, $w, $h) = @_;
2769
2770 my $old_w = $self->{old_w};
2771 my $old_h = $self->{old_h};
2772
2773 if ($old_w && $old_h) {
2774 for my $child ($self->children) {
2775 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783 }
2784 }
2785
2228 for my $child (@{$self->{children}}) { 2786 for my $child ($self->children) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2787 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230 2788
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2789 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2790 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2233 $child->configure ($X, $Y, $W,$H); 2791 $child->configure ($X, $Y, $W, $H);
2234 } 2792 }
2235}
2236 2793
2237sub _topleft { 2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796}
2797
2798sub coord2local {
2238 my ($self, $x, $y) = @_; 2799 my ($self, $x, $y) = @_;
2239 2800
2240 ($x, $y) 2801 ($x, $y)
2241} 2802}
2242 2803
2804sub coord2global {
2805 my ($self, $x, $y) = @_;
2806
2807 ($x, $y)
2808}
2809
2243sub update { 2810sub update {
2244 my ($self) = @_; 2811 my ($self) = @_;
2245 2812
2246 $self->check_size; 2813 $self->check_size;
2247 ::refresh (); 2814 $::WANT_REFRESH++;
2248} 2815}
2249 2816
2250sub add { 2817sub add {
2251 my ($self, $child) = @_; 2818 my ($self, $child) = @_;
2252 2819
2253 # integerize window positions 2820 # integerise window positions
2254 $child->{x} = int $child->{x}; 2821 $child->{x} = int $child->{x};
2255 $child->{y} = int $child->{y}; 2822 $child->{y} = int $child->{y};
2256 2823
2257 $self->SUPER::add ($child); 2824 $self->SUPER::add ($child);
2258} 2825}
… …
2261 my ($self, $id, $cb) = @_; 2828 my ($self, $id, $cb) = @_;
2262 2829
2263 $self->{refresh_hook}{$id} = $cb; 2830 $self->{refresh_hook}{$id} = $cb;
2264} 2831}
2265 2832
2833sub on_post_alloc {
2834 my ($self, $id, $cb) = @_;
2835
2836 $self->{post_alloc_hook}{$id} = $cb;
2837}
2838
2266sub draw { 2839sub draw {
2267 my ($self) = @_; 2840 my ($self) = @_;
2268 2841
2269 while (my $rcb = delete $self->{refresh_hook}) { 2842 while ($self->{refresh_hook}) {
2270 $_->() for values %$rcb; 2843 $_->()
2844 for values %{delete $self->{refresh_hook}};
2845 }
2846
2847 if ($self->{check_size}) {
2848 my @queue = ([], []);
2849
2850 for (;;) {
2851 if ($self->{check_size}) {
2852 # heuristic: check containers last
2853 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2854 for values %{delete $self->{check_size}}
2855 }
2856
2857 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2858
2859 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2860 ? @$widget{qw(user_w user_h)}
2861 : $widget->size_request;
2862
2863 if (delete $widget->{force_alloc}
2864 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2865 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2866
2867 $widget->{req_w} = $w;
2868 $widget->{req_h} = $h;
2869
2870 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2871
2872 $widget->{parent}->check_size
2873 if $widget->{parent};
2874 }
2875 }
2876 }
2877
2878 while ($self->{size_alloc}) {
2879 for (values %{delete $self->{size_alloc}}) {
2880 my ($widget, $w, $h) = @$_;
2881
2882 $w = 0 if $w < 0;
2883 $h = 0 if $h < 0;
2884
2885 $widget->{w} = $w;
2886 $widget->{h} = $h;
2887 $widget->size_allocate ($w, $h);
2888 $widget->emit (size_allocate => $w, $h);
2889 }
2890 }
2891
2892 while ($self->{post_alloc_hook}) {
2893 $_->()
2894 for values %{delete $self->{post_alloc_hook}};
2271 } 2895 }
2272 2896
2273 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2897 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2274 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2275 glClear GL_COLOR_BUFFER_BIT; 2899 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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