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.157 by root, Sun Apr 23 21:47:32 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
247sub children {
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
216sub set_max_size { 261sub set_max_size {
217 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
218 263
219 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
220 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
221}
222
223# return top left coordinates
224sub _topleft {
225 my ($self, $x, $y) = @_;
226
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
228} 266}
229 267
230# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
231sub coord2local { 269sub coord2local {
232 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
233 271
234 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
235 ($x - $X, $y - $Y)
236} 273}
237 274
238# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
239sub coord2global { 276sub coord2global {
240 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
241 278
242 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
243 ($x + $X, $y + $Y)
244} 280}
245 281
246sub focus_in { 282sub focus_in {
247 my ($self) = @_; 283 my ($self) = @_;
248 284
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
310 glEnd; 346 glEnd;
311 glDisable GL_BLEND; 347 glDisable GL_BLEND;
312 } 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 }
313} 363}
314 364
315sub _draw { 365sub _draw {
316 my ($self) = @_; 366 my ($self) = @_;
317 367
… …
332 382
333sub set_parent { 383sub set_parent {
334 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
335 385
336 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};
337} 391}
338 392
339sub check_size { 393sub check_size {
340 my ($self) = @_; 394 my ($self, $forced) = @_;
341 395
342 return unless $self->{parent}; 396 $self->{force_alloc} = 1 if $forced;
343 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
344 my ($w, $h) = $self->size_request;
345
346 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w;
348 $self->{req_h} = $h;
349
350 $self->{parent}->check_size;
351 }
352} 398}
353 399
354sub update { 400sub update {
355 my ($self) = @_; 401 my ($self) = @_;
356 402
… …
365} 411}
366 412
367sub emit { 413sub emit {
368 my ($self, $signal, @args) = @_; 414 my ($self, $signal, @args) = @_;
369 415
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 417}
374 418
375sub DESTROY { 419sub DESTROY {
376 my ($self) = @_; 420 my ($self) = @_;
377 421
… …
444sub new { 488sub new {
445 my ($class, %arg) = @_; 489 my ($class, %arg) = @_;
446 490
447 my $children = delete $arg{children} || []; 491 my $children = delete $arg{children} || [];
448 492
449 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 );
450 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
451 499
452 $self 500 $self
453} 501}
454 502
455sub add { 503sub add {
456 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
457 505
458 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
459 508
460 use sort 'stable'; 509 use sort 'stable';
461 510
462 $self->{children} = [ 511 $self->{children} = [
463 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
464 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
465 ]; 514 ];
466 515
467 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
468} 522}
469 523
470sub remove { 524sub remove {
471 my ($self, $child) = @_; 525 my ($self, $child) = @_;
472 526
473 delete $child->{parent}; 527 delete $child->{parent};
528 $child->hide;
474 529
475 $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 }
476 546
477 $self->check_size; 547 $self->check_size;
478 $self->update; 548 $self->update;
479} 549}
480 550
… …
558} 628}
559 629
560sub update { 630sub update {
561 my ($self) = @_; 631 my ($self) = @_;
562 632
563 # we want to do this delayed... 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
564 $self->render_chld;
565 $self->SUPER::update; 634 $self->SUPER::update;
566}
567
568sub render_chld {
569 my ($self) = @_;
570
571 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
572 glClearColor 0, 0, 0, 1;
573 glClear GL_COLOR_BUFFER_BIT;
574 $self->child->draw;
575 };
576} 635}
577 636
578sub size_allocate { 637sub size_allocate {
579 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
580 639
581 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
582 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
583 $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 };
584} 664}
585 665
586sub _draw { 666sub _draw {
587 my ($self) = @_; 667 my ($self) = @_;
588 668
589 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
590 670
591 my $tex = $self->{texture} 671 my $tex = $self->{texture}
592 or return; 672 or return;
593 673
594 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
596 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
597 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;
598 677
599 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
600 679
601 glDisable GL_BLEND;
602 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
603} 681}
604 682
605############################################################################# 683#############################################################################
606 684
607package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
608 686
609our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
610 688
611sub new { die }
612
613sub size_request { 689sub size_request {
614 my ($self) = @_; 690 my ($self) = @_;
615 691
616 @$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)};
617 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
618 694
619 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
620} 696}
621 697
622sub _draw { 698sub size_allocate {
623 my ($self) = @_; 699 my ($self, $w, $h) = @_;
624 700
625 $self->{children}[1]->draw; 701 $self->update;
626} 702}
627 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
628 706
629############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
630 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
631package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
632 752
633our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
634
635use CFClient::OpenGL;
636 754
637sub new { 755sub new {
638 my $class = shift; 756 my $class = shift;
639 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
640 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
641 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
642 border_bg => [1, 1, 1, 1], 770 slider => $slider,
643 border => 0.8,
644 @_ 771 @_,
645 ); 772 );
646 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
647 $self 778 $self
648} 779}
649 780
650sub set_size { 781#TODO# update range on size_allocate depending on child
651 my ($self, $w, $h) = @_; 782# update viewport offset on scroll
652 $self->{req_w} = $w;
653 $self->{req_h} = $h;
654 $self->check_size;
655}
656 783
657sub size_request { 784#############################################################################
658 my ($self) = @_;
659 ($self->{req_w}, $self->{req_h})
660}
661 785
662sub size_allocate { 786package CFClient::UI::Frame;
663 my ($self, $w, $h) = @_; 787
664 $self->{w} = $w; 788our @ISA = CFClient::UI::Bin::;
665 $self->{h} = $h; 789
666 $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 )
667} 799}
668 800
669sub _draw { 801sub _draw {
670 my ($self) = @_; 802 my ($self) = @_;
671 803
672 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
673 806
674 glEnable GL_BLEND; 807 glEnable GL_BLEND;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
678 810
679# glBegin GL_QUADS; 811 glBegin GL_QUADS;
680# glColor 0, 0, 0, 0;
681# glVertex 0 , 0; 812 glVertex 0 , 0;
682# glVertex 0 , $h; 813 glVertex 0 , $h;
683# glVertex $w, $h; 814 glVertex $w, $h;
684# glVertex $w, 0; 815 glVertex $w, 0;
685# glEnd; 816 glEnd;
686 817
687
688 $self->child->draw;
689 glDisable GL_BLEND; 818 glDisable GL_BLEND;
690 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
691} 822}
692 823
693############################################################################# 824#############################################################################
694 825
695package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
706 my $class = shift; 837 my $class = shift;
707 838
708 # TODO: user_x, user_y, overwrite moveto? 839 # TODO: user_x, user_y, overwrite moveto?
709 840
710 my $self = $class->SUPER::new ( 841 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 842 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
713 border => 0.8, 844 border => 0.6,
714 can_events => 1, 845 can_events => 1,
715 @_ 846 @_
716 ); 847 );
717 848
718 $self->{title} &&= new CFClient::UI::Label 849 $self->{title} &&= new CFClient::UI::Label
719 align => 0, 850 align => 0,
720 valign => 1, 851 valign => 1,
721 text => $self->{title}, 852 text => $self->{title},
722 fontsize => 1; 853 fontsize => $self->{border};
723 854
724 $self 855 $self
725} 856}
726 857
727sub border { 858sub border {
728 int $_[0]{border} * $::FONTSIZE 859 int $_[0]{border} * $::FONTSIZE
729} 860}
730 861
731sub size_request { 862sub size_request {
732 my ($self) = @_; 863 my ($self) = @_;
733
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735 864
736 my ($w, $h) = $self->SUPER::size_request; 865 my ($w, $h) = $self->SUPER::size_request;
737 866
738 ( 867 (
739 $w + $self->border * 2, 868 $w + $self->border * 2,
… …
754} 883}
755 884
756sub button_down { 885sub button_down {
757 my ($self, $ev, $x, $y) = @_; 886 my ($self, $ev, $x, $y) = @_;
758 887
888 my ($w, $h) = @$self{qw(w h)};
759 my $border = $self->border; 889 my $border = $self->border;
760 890
761 if ($x < $self->{w} && $x >= $self->{w} - $border 891 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762 && $y < $self->{h} && $y >= $self->{h} - $border) { 892 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763 893
894 if ($lr & $td) {
895 my ($wx, $wy) = ($self->{x}, $self->{y});
764 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 896 my ($ox, $oy) = ($ev->{x}, $ev->{y});
765 my ($bw, $bh) = ($self->{w}, $self->{h}); 897 my ($bw, $bh) = ($self->{w}, $self->{h});
766 898
899 my $mx = $x < $border;
900 my $my = $y < $border;
901
767 $self->{motion} = sub { 902 $self->{motion} = sub {
768 my ($ev, $x, $y) = @_; 903 my ($ev, $x, $y) = @_;
769 904
770 ($x, $y) = ($ev->{x}, $ev->{y}); 905 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy;
771 907
772 $self->{user_w} = $bw + $x - $ox; 908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
773 $self->{user_h} = $bh + $y - $oy; 909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
774 $self->check_size; 911 $self->check_size;
775 }; 912 };
776 913
777 } elsif ($x >= 0 && $x < $self->{w} 914 } elsif ($lr ^ $td) {
778 && $y >= 0 && $y < $border) {
779
780 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 915 my ($ox, $oy) = ($ev->{x}, $ev->{y});
781 my ($bx, $by) = ($self->{x}, $self->{y}); 916 my ($bx, $by) = ($self->{x}, $self->{y});
782 917
783 $self->{motion} = sub { 918 $self->{motion} = sub {
784 my ($ev, $x, $y) = @_; 919 my ($ev, $x, $y) = @_;
… …
807 my ($self) = @_; 942 my ($self) = @_;
808 943
809 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
810 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
811 946
812 glEnable GL_BLEND;
813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
814 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
816 949
817 my $border = $self->border; 950 my $border = $self->border;
818 951
819 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
820 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
821 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
822 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
823 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
824 957
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
825 my $bg = $tex[0]; 959 my $bg = $tex[0];
826 960
827 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
828 my $rep_x = $cw / $bg->{w}; 962 my $rep_x = $cw / $bg->{w};
829 my $rep_y = $ch / $bg->{h}; 963 my $rep_y = $ch / $bg->{h};
830 964
831 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
832 966
833 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
834 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
835 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
836 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
837 972
838 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
839 glDisable GL_BLEND;
840 974
841 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
976
842 $self->child->draw; 977 $self->child->draw;
843} 978}
844 979
845############################################################################# 980#############################################################################
846 981
… …
868 $self->{children}[$y][$x] = $child; 1003 $self->{children}[$y][$x] = $child;
869 1004
870 $child->check_size; 1005 $child->check_size;
871} 1006}
872 1007
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010}
1011
873# 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?
874sub clear { 1013sub clear {
875 my ($self) = @_; 1014 my ($self) = @_;
876 1015
1016 my @children = $self->children;
877 delete $self->{children}; 1017 delete $self->{children};
1018
1019 for (@children) {
1020 delete $_->{parent};
1021 $_->hide;
1022 }
1023
878 $self->update; 1024 $self->update;
879} 1025}
880 1026
881sub get_wh { 1027sub get_wh {
882 my ($self) = @_; 1028 my ($self) = @_;
… …
1059} 1205}
1060 1206
1061sub size_allocate { 1207sub size_allocate {
1062 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1063 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1064 my $children = $self->{children}; 1212 my $children = $self->{children};
1065 1213
1066 my @h = map $_->{req_h}, @$children; 1214 my @h = map $_->{req_h}, @$children;
1067 1215
1068 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
… …
1105 1253
1106sub new { 1254sub new {
1107 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1108 1256
1109 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1111 #font => default_font 1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1112 fontsize => 1, 1263 fontsize => 1,
1113 text => "",
1114 align => -1, 1264 align => -1,
1115 valign => -1, 1265 valign => -1,
1116 padding => 2, 1266 padding => 2,
1117 layout => new CFClient::Layout,
1118 can_events => 0, 1267 can_events => 0,
1119 %arg 1268 %arg
1120 ); 1269 );
1121 1270
1122 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1123 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1124 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1125 $self->{template} = $layout; 1274 $self->{template} = $layout;
1126 } 1275 }
1127 1276
1128 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1129 $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 }
1130 1282
1131 $self 1283 $self
1132} 1284}
1133 1285
1134sub escape_text { 1286sub escape {
1135 local $_ = $_[1]; 1287 local $_ = $_[1];
1136 1288
1137 s/&/&amp;/g; 1289 s/&/&amp;/g;
1138 s/>/&gt;/g; 1290 s/>/&gt;/g;
1139 s/</&lt;/g; 1291 s/</&lt;/g;
1140 1292
1141 $_[1] 1293 $_[1]
1142} 1294}
1143 1295
1296sub update {
1297 my ($self) = @_;
1298
1299 delete $self->{texture};
1300 $self->SUPER::update;
1301}
1302
1144sub set_text { 1303sub set_text {
1145 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1146 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;
1147 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1148 1311
1149 delete $self->{texture}; 1312 $self->update;
1150 $self->check_size; 1313 $self->check_size;
1151 $self->update;
1152} 1314}
1153 1315
1154sub set_markup { 1316sub set_markup {
1155 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1156 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;
1157 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1158 1326
1159 delete $self->{texture}; 1327 $self->update;
1160 $self->check_size; 1328 $self->check_size;
1161 $self->update;
1162} 1329}
1163 1330
1164sub size_request { 1331sub size_request {
1165 my ($self) = @_; 1332 my ($self) = @_;
1166 1333
… …
1195sub set_fontsize { 1362sub set_fontsize {
1196 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1197 1364
1198 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1199 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1200 $self->check_size; 1369 $self->check_size;
1201 $self->update;
1202} 1370}
1203 1371
1204sub _draw { 1372sub _draw {
1205 my ($self) = @_; 1373 my ($self) = @_;
1206 1374
1207 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1208 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1209 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1210 $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
1211 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
1212 }; 1392 };
1213 1393
1214 glEnable GL_BLEND;
1215 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1216 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1217 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1218 1396
1397 if ($tex->{format} == GL_ALPHA) {
1219 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1220
1221 $self->{ox} = int (
1222 $self->{align} < 0 ? $self->{padding}
1223 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1224 : ($self->{w} - $tex->{w}) * 0.5
1225 );
1226
1227 $self->{oy} = int (
1228 $self->{valign} < 0 ? $self->{padding}
1229 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1230 : ($self->{h} - $tex->{h}) * 0.5
1231 );
1232
1233 $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 }
1234 1403
1235 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1236 glDisable GL_BLEND;
1237} 1405}
1238 1406
1239############################################################################# 1407#############################################################################
1240 1408
1241package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1246 1414
1247sub new { 1415sub new {
1248 my $class = shift; 1416 my $class = shift;
1249 1417
1250 $class->SUPER::new ( 1418 $class->SUPER::new (
1251 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1255 can_hover => 1, 1423 can_hover => 1,
1256 can_focus => 1, 1424 can_focus => 1,
1257 valign => 0, 1425 valign => 0,
1258 can_events => 1, 1426 can_events => 1,
1259 @_ 1427 @_
1260 ) 1428 )
1261} 1429}
1262 1430
… …
1276 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1277 1445
1278 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1279} 1447}
1280 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
1281sub get_text { 1458sub get_text {
1282 $_[0]{text} 1459 $_[0]{text}
1283} 1460}
1284 1461
1285sub size_request { 1462sub size_request {
… …
1292 1469
1293sub size_allocate { 1470sub size_allocate {
1294 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1295 1472
1296 $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
1297}
1298
1299sub set_text {
1300 my ($self, $text) = @_;
1301
1302 $self->{cursor} = length $text;
1303 $self->_set_text ($text);
1304 $self->update;
1305} 1474}
1306 1475
1307sub key_down { 1476sub key_down {
1308 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1309 1478
… …
1311 my $sym = $ev->{sym}; 1480 my $sym = $ev->{sym};
1312 my $uni = $ev->{unicode}; 1481 my $uni = $ev->{unicode};
1313 1482
1314 my $text = $self->get_text; 1483 my $text = $self->get_text;
1315 1484
1316 if ($sym == 8) { 1485 if ($uni == 8) {
1317 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1318 } elsif ($sym == 127) { 1487 } elsif ($uni == 127) {
1319 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1320 } elsif ($sym == CFClient::SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1321 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1322 } elsif ($sym == CFClient::SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1323 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1324 } elsif ($sym == CFClient::SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1325 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1326 } elsif ($sym == CFClient::SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1327 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1328 } elsif ($sym == 27) { 1497 } elsif ($uni == 27) {
1329 $self->emit ('escape'); 1498 $self->emit ('escape');
1330 } elsif ($uni) { 1499 } elsif ($uni) {
1331 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1332 } 1501 }
1333 1502
… …
1416 my ($self, $ev) = @_; 1585 my ($self, $ev) = @_;
1417 1586
1418 my $sym = $ev->{sym}; 1587 my $sym = $ev->{sym};
1419 1588
1420 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} = '';
1421 $self->emit (activate => $self->get_text); 1594 $self->emit (activate => $txt);
1422 $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 }
1423 1618
1424 } else { 1619 } else {
1425 $self->SUPER::key_down ($ev); 1620 $self->SUPER::key_down ($ev);
1426 } 1621 }
1427 1622
… …
1441 1636
1442sub new { 1637sub new {
1443 my $class = shift; 1638 my $class = shift;
1444 1639
1445 $class->SUPER::new ( 1640 $class->SUPER::new (
1446 padding => 4, 1641 padding => 4,
1447 fg => [1, 1, 1], 1642 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2], 1643 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1644 active_fg => [0, 0, 1],
1450 can_hover => 1, 1645 can_hover => 1,
1451 align => 0, 1646 align => 0,
1452 valign => 0, 1647 valign => 0,
1453 can_events => 1, 1648 can_events => 1,
1454 @_ 1649 @_
1455 ) 1650 )
1456} 1651}
1457 1652
… …
1471 1666
1472 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1473 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1474 } 1669 }
1475 1670
1476 glEnable GL_BLEND;
1477 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1478 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1479 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1480 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1481 1674
1482 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1483 1676
1484 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1485 glDisable GL_BLEND;
1486 1678
1487 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1488} 1680}
1489 1681
1490############################################################################# 1682#############################################################################
… …
1537 1729
1538 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;
1539 1731
1540 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1541 1733
1542 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1543 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1544 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1545
1546 my $tex = $self->{state} ? $tex[1] : $tex[0];
1547
1548 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1549
1550 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1551 glDisable GL_BLEND;
1552} 1739}
1553 1740
1554############################################################################# 1741#############################################################################
1555 1742
1556package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1599 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1600 1787
1601 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1602 } 1789 }
1603 1790
1604 glEnable GL_BLEND;
1605 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1606 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1608 1793
1609 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1610 1795
1611 glDisable GL_BLEND;
1612 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1613} 1797}
1614 1798
1615############################################################################# 1799#############################################################################
1616 1800
1617package CFClient::UI::VGauge; 1801package CFClient::UI::VGauge;
1618 1802
1619our @ISA = CFClient::UI::Base::; 1803our @ISA = CFClient::UI::Base::;
1804
1805use List::Util qw(min max);
1620 1806
1621use CFClient::OpenGL; 1807use CFClient::OpenGL;
1622 1808
1623my %tex = ( 1809my %tex = (
1624 food => [ 1810 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1811 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1812 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1813 ],
1628 grace => [ 1814 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1815 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 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/
1631 ], 1817 ],
1632 hp => [ 1818 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1819 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1820 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1821 ],
1636 mana => [ 1822 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 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/
1639 ], 1825 ],
1640); 1826);
1641 1827
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1828# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1829sub new {
… …
1662} 1848}
1663 1849
1664sub set_max { 1850sub set_max {
1665 my ($self, $max) = @_; 1851 my ($self, $max) = @_;
1666 1852
1853 return if $self->{max_val} == $max;
1854
1667 $self->{max_val} = $max; 1855 $self->{max_val} = $max;
1856 $self->update;
1668} 1857}
1669 1858
1670sub set_value { 1859sub set_value {
1671 my ($self, $val, $max) = @_; 1860 my ($self, $val, $max) = @_;
1672 1861
1673 $self->set_max ($max) 1862 $self->set_max ($max)
1674 if defined $max; 1863 if defined $max;
1675 1864
1676 $max = $self->{max_val}; 1865 return if $self->{val} == $val;
1866
1677 $self->{val} = $val; 1867 $self->{val} = $val;
1678
1679 $self->update; 1868 $self->update;
1680} 1869}
1681 1870
1682sub _draw { 1871sub _draw {
1683 my ($self) = @_; 1872 my ($self) = @_;
1684 1873
1685 my $tex = $tex{$self->{type}}; 1874 my $tex = $tex{$self->{type}};
1875 my ($t1, $t2, $t3) = @$tex;
1686 1876
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1877 my ($w, $h) = ($self->{w}, $self->{h});
1688 1878
1689 if ($self->{vertical}) { 1879 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1880 glRotate 90, 0, 0, 1;
… …
1692 1882
1693 ($w, $h) = ($h, $w); 1883 ($w, $h) = ($h, $w);
1694 } 1884 }
1695 1885
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1886 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1887
1699 my $t1 = $tex->[0]; 1888 my $ycut1 = max 0, min 1, $ycut;
1700 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);
1701 1893
1702 glEnable GL_BLEND; 1894 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1896 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1897 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1898
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1899 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1900 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1901 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1902 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1903 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1904 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1905 glEnd;
1717 1906
1907 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1908 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1909 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1910 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1911 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1912 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1913 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 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 }
1725 1925
1726 glDisable GL_BLEND; 1926 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1927 glDisable GL_TEXTURE_2D;
1728} 1928}
1729 1929
… …
1735 1935
1736sub new { 1936sub new {
1737 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1738 1938
1739 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1940 tooltip => $arg{type},
1941 can_hover => 1,
1942 can_events => 1,
1741 %arg, 1943 %arg,
1742 ); 1944 );
1743 1945
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1946 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1947 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 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); 1948 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 1949
1748 $self 1950 $self
1749} 1951}
1750 1952
1751sub set_fontsize { 1953sub set_fontsize {
… …
1753 1955
1754 $self->{value}->set_fontsize ($fsize); 1956 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 1957 $self->{max} ->set_fontsize ($fsize);
1756} 1958}
1757 1959
1960sub set_max {
1961 my ($self, $max) = @_;
1962
1963 $self->{gauge}->set_max ($max);
1964 $self->{max}->set_text ($max);
1965}
1966
1758sub set_value { 1967sub set_value {
1759 my ($self, $val, $max) = @_; 1968 my ($self, $val, $max) = @_;
1760 1969
1761 $self->set_max ($max) 1970 $self->set_max ($max)
1762 if defined $max; 1971 if defined $max;
1763 1972
1764 $self->{gauge}->set_value ($val, $max); 1973 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 1974 $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} 1975}
1774 1976
1775############################################################################# 1977#############################################################################
1776 1978
1777package CFClient::UI::Slider; 1979package CFClient::UI::Slider;
… …
1796 # TODO: calculations are off 1998 # TODO: calculations are off
1797 my $self = $class->SUPER::new ( 1999 my $self = $class->SUPER::new (
1798 fg => [1, 1, 1], 2000 fg => [1, 1, 1],
1799 active_fg => [0, 0, 0], 2001 active_fg => [0, 0, 0],
1800 range => [0, 0, 100, 10], 2002 range => [0, 0, 100, 10],
1801 req_w => 20, 2003 req_w => $::WIDTH / 80,
1802 req_h => 20, 2004 req_h => $::WIDTH / 80,
1803 vertical => 0, 2005 vertical => 0,
1804 can_hover => 1, 2006 can_hover => 1,
1805 inner_pad => 5, 2007 inner_pad => 5,
1806 @_ 2008 @_
1807 ); 2009 );
… …
1890 $page ||= 2; 2092 $page ||= 2;
1891 2093
1892 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1893 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1894 2096
1895 glEnable GL_BLEND;
1896 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1897 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
1898 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1899 2099
1900 # draw background 2100 # draw background
1901 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1902 2102
1903 # draw handle 2103 # draw handle
1904 $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);
1905 2105
1906 glDisable GL_BLEND;
1907 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
1908} 2107}
1909 2108
1910############################################################################# 2109#############################################################################
1911 2110
… …
1917 2116
1918sub new { 2117sub new {
1919 my $class = shift; 2118 my $class = shift;
1920 2119
1921 my $self = $class->SUPER::new ( 2120 my $self = $class->SUPER::new (
1922 fontsize => 1, 2121 fontsize => 1,
2122 can_events => 0,
1923 #font => default_font 2123 #font => default_font
1924 @_, 2124 @_,
1925 2125
1926 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
1927 par => [], 2127 par => [],
1928 height => 0, 2128 height => 0,
1929 children => [ 2129 children => [
1930 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
1932 ], 2132 ],
1933 ); 2133 );
1934 2134
1935 $self->{children}[1]->connect (changed => sub { 2135 $self->{children}[1]->connect (changed => sub { $self->update });
1936 $self->update;
1937 });
1938 2136
1939 $self 2137 $self
1940} 2138}
1941 2139
1942sub set_fontsize { 2140sub set_fontsize {
… …
1950 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
1951 2149
1952 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
1953 2151
1954 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $layout->set_width ($self->{w}); 2153 $layout->set_width ($self->{children}[0]{w});
1956 $layout->set_text ($text); 2154 $layout->set_markup ($text);
1957 2155
1958 ($layout->size)[1] 2156 ($layout->size)[1]
1959} 2157}
1960 2158
1961sub reflow { 2159sub reflow {
… …
1999 2197
2000 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
2001 2199
2002 delete $self->{texture}; 2200 delete $self->{texture};
2003 2201
2004 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
2005 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
2006 my $height = 0; 2204 my $height = 0;
2007 2205
2008 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
2009 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
2013 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2014 2212
2015 delete $self->{texture}; 2213 delete $self->{texture};
2016 } 2214 }
2017 2215
2018 $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 {
2019 glClearColor 0, 0, 0, 1; 2217 glClearColor 0, 0, 0, 0;
2020 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
2021 2219
2022 glEnable GL_BLEND;
2023 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2024 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026 2222
2027 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
2028 2224
… …
2037 2233
2038 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
2039 my $h = $par->[0]; 2235 my $h = $par->[0];
2040 2236
2041 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2042 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
2043 2240
2044 glColor @{ $par->[1] };
2045 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
2046 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);
2047 } 2243 }
2048 2244
2049 $y += $h; 2245 $y += $h;
2050 } 2246 }
2051 2247
2052 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2053 glDisable GL_BLEND;
2054 }; 2249 };
2055 }); 2250 });
2056} 2251}
2057 2252
2058sub _draw { 2253sub _draw {
2059 my ($self) = @_; 2254 my ($self) = @_;
2060 2255
2061 if ($self->{texture}) {
2062 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2064 $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});
2065 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2066 }
2067 2261
2068 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2069 2263
2070} 2264}
2071 2265
… …
2119 2313
2120sub new { 2314sub new {
2121 my $class = shift; 2315 my $class = shift;
2122 2316
2123 my $self = $class->SUPER::new ( 2317 my $self = $class->SUPER::new (
2124 state => 0, 2318 state => 0,
2125 connect_activate => \&toggle_flopper, 2319 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2320 @_
2128 ); 2321 );
2129 2322
2130 if ($self->{state}) { 2323 if ($self->{state}) {
2131 $self->{state} = 0; 2324 $self->{state} = 0;
… …
2166 @_, 2359 @_,
2167 can_events => 0, 2360 can_events => 0,
2168 ) 2361 )
2169} 2362}
2170 2363
2171sub set_text { 2364sub set_tooltip_from {
2172 my ($self, $text) = @_; 2365 my ($self, $widget) = @_;
2173 2366
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2367 $self->add (new CFClient::UI::Label
2175 $self->{label}->set_text ($text); 2368 markup => $widget->{tooltip},
2176 $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 );
2177} 2374}
2178 2375
2179sub size_request { 2376sub size_request {
2180 my ($self) = @_; 2377 my ($self) = @_;
2181 2378
2182 $self->child->set_max_size ($::WIDTH * 0.2);
2183
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2380
2186 ($w + 4, $h + 4) 2381 ($w + 4, $h + 4)
2187} 2382}
2188 2383
2384sub size_allocate {
2385 my ($self, $w, $h) = @_;
2386
2387 $self->SUPER::size_allocate ($w - 4, $h - 4);
2388}
2389
2189sub _draw { 2390sub _draw {
2190 my ($self) = @_; 2391 my ($self) = @_;
2191 2392
2192 glPushMatrix;
2193 glTranslate 0.375, 0.375; 2393 glTranslate 0.375, 0.375;
2194 2394
2195 my ($w, $h) = @$self{qw(w h)}; 2395 my ($w, $h) = @$self{qw(w h)};
2196 2396
2197 glColor 1, 0.8, 0.4; 2397 glColor 1, 0.8, 0.4;
… …
2208 glVertex 0 , $h; 2408 glVertex 0 , $h;
2209 glVertex $w, $h; 2409 glVertex $w, $h;
2210 glVertex $w, 0; 2410 glVertex $w, 0;
2211 glEnd; 2411 glEnd;
2212 2412
2213 glPopMatrix; 2413 glTranslate 2 - 0.375, 2 - 0.375;
2214
2215 glTranslate 2, 2;
2216 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
2217} 2415}
2218 2416
2219############################################################################# 2417#############################################################################
2220 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
2221package CFClient::UI::Root; 2733package CFClient::UI::Root;
2222 2734
2223our @ISA = CFClient::UI::Container::; 2735our @ISA = CFClient::UI::Container::;
2224 2736
2225use CFClient::OpenGL; 2737use CFClient::OpenGL;
2226 2738
2227sub check_size { 2739sub new {
2228 my ($self) = @_; 2740 my $class = shift;
2229 2741
2230 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2742 $class->SUPER::new (
2231} 2743 @_,
2232 2744 )
2233sub size_request {
2234 ($::WIDTH, $::HEIGHT)
2235} 2745}
2236 2746
2237sub configure { 2747sub configure {
2238 my ($self, $x, $y, $w, $h) = @_; 2748 my ($self, $x, $y, $w, $h) = @_;
2239 2749
2240 $self->SUPER::configure ($x, $y, $w, $h); 2750 $self->{w} = $w;
2751 $self->{h} = $h;
2752}
2241 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
2242 for my $child (@{$self->{children}}) { 2786 for my $child ($self->children) {
2243 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)};
2244 2788
2245 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2789 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2246 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2790 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2247 $child->configure ($X, $Y, $W,$H); 2791 $child->configure ($X, $Y, $W, $H);
2248 } 2792 }
2249}
2250 2793
2251sub _topleft { 2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796}
2797
2798sub coord2local {
2252 my ($self, $x, $y) = @_; 2799 my ($self, $x, $y) = @_;
2253 2800
2254 ($x, $y) 2801 ($x, $y)
2255} 2802}
2256 2803
2804sub coord2global {
2805 my ($self, $x, $y) = @_;
2806
2807 ($x, $y)
2808}
2809
2257sub update { 2810sub update {
2258 my ($self) = @_; 2811 my ($self) = @_;
2259 2812
2260 $self->check_size; 2813 $self->check_size;
2261 ::refresh (); 2814 $::WANT_REFRESH++;
2262} 2815}
2263 2816
2264sub add { 2817sub add {
2265 my ($self, $child) = @_; 2818 my ($self, $child) = @_;
2266 2819
2267 # integerize window positions 2820 # integerise window positions
2268 $child->{x} = int $child->{x}; 2821 $child->{x} = int $child->{x};
2269 $child->{y} = int $child->{y}; 2822 $child->{y} = int $child->{y};
2270 2823
2271 $self->SUPER::add ($child); 2824 $self->SUPER::add ($child);
2272} 2825}
… …
2275 my ($self, $id, $cb) = @_; 2828 my ($self, $id, $cb) = @_;
2276 2829
2277 $self->{refresh_hook}{$id} = $cb; 2830 $self->{refresh_hook}{$id} = $cb;
2278} 2831}
2279 2832
2833sub on_post_alloc {
2834 my ($self, $id, $cb) = @_;
2835
2836 $self->{post_alloc_hook}{$id} = $cb;
2837}
2838
2280sub draw { 2839sub draw {
2281 my ($self) = @_; 2840 my ($self) = @_;
2282 2841
2283 while (my $rcb = delete $self->{refresh_hook}) { 2842 while ($self->{refresh_hook}) {
2284 $_->() 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}};
2285 } 2895 }
2286 2896
2287 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2897 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2288 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2289 glClear GL_COLOR_BUFFER_BIT; 2899 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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