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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.208 by root, Mon May 15 22:52:17 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
… …
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
15 16
17our %WIDGET; # all widgets, weak-referenced
18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
20 23
21 if ($TOOLTIP->{owner} != $widget) { 24 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 25 $TOOLTIP->{owner} = $widget;
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_text ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
31 } 42 }
32 43
33 return; 44 return;
34 } 45 }
35 } 46 }
… …
39 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
40} 51}
41 52
42# class methods for events 53# class methods for events
43sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
45} 57}
46 58
47sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
49} 62}
50 63
51sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
52 my ($ev) = @_; 65 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 74 check_tooltip;
62 } 75 }
63 76
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 78
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y);
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
67} 83}
68 84
69sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
70 my ($ev) = @_; 86 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
72 88
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 90
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 92
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 93 if ($GRAB) {
94 ($x, $y) = $GRAB->coord2local ($x, $y);
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
78 97
79 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 100 $grab->update if $grab;
82 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 118
100 check_tooltip; 119 check_tooltip;
101 } 120 }
102 121
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
104} 126}
105 127
106# convert position array to integers 128# convert position array to integers
107sub harmonize { 129sub harmonize {
108 my ($vals) = @_; 130 my ($vals) = @_;
… …
114 $rem += $_ - $i; 136 $rem += $_ - $i;
115 $_ = $i; 137 $_ = $i;
116 } 138 }
117} 139}
118 140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
158 }
159}
160
119############################################################################# 161#############################################################################
120 162
121package CFClient::UI::Base; 163package CFClient::UI::Base;
122 164
123use strict; 165use strict;
… …
126 168
127sub new { 169sub new {
128 my $class = shift; 170 my $class = shift;
129 171
130 my $self = bless { 172 my $self = bless {
131 x => 0, 173 x => 0,
132 y => 0, 174 y => 0,
133 z => 0, 175 z => 0,
134 can_events => 1, 176 can_events => 1,
135 @_ 177 @_
136 }, $class; 178 }, $class;
137 179
138 for (keys %$self) { 180 for (keys %$self) {
139 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
141 } 183 }
142 } 184 }
143 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
144 $self 188 $self
145} 189}
146 190
191sub destroy {
192 my ($self) = @_;
193
194 $self->hide;
195 %$self = ();
196}
197
147sub show { 198sub show {
148 my ($self) = @_; 199 my ($self) = @_;
149 200
150 return if $self->{parent}; 201 return if $self->{parent};
151 202
… …
153} 204}
154 205
155sub hide { 206sub hide {
156 my ($self) = @_; 207 my ($self) = @_;
157 208
158 return unless $self->{parent}; 209 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self;
159 211
160 $self->{parent}->remove ($self); 212 $self->{parent}->remove ($self)
213 if $self->{parent};
161} 214}
162 215
163sub move { 216sub move {
164 my ($self, $x, $y, $z) = @_; 217 my ($self, $x, $y, $z) = @_;
165 218
… …
204 $self->{y} = $y; 257 $self->{y} = $y;
205 $self->update; 258 $self->update;
206 } 259 }
207 260
208 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
209 $self->{w} = $w; 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
210 $self->{h} = $h;
211
212 $self->size_allocate ($w, $h);
213 $self->update;
214 } 263 }
215} 264}
216 265
217sub size_allocate { 266sub size_allocate {
218 # nothing to be done 267 # nothing to be done
219} 268}
220 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children {
278}
279
221sub set_max_size { 280sub set_max_size {
222 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
223 282
224 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
225 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
226}
227
228# return top left coordinates
229sub _topleft {
230 my ($self, $x, $y) = @_;
231
232 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
233} 285}
234 286
235# translate global coordinates to local coordinate system 287# translate global coordinates to local coordinate system
236sub coord2local { 288sub coord2local {
237 my ($self, $x, $y) = @_; 289 my ($self, $x, $y) = @_;
238 290
239 my ($X, $Y) = $self->_topleft; 291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
240 ($x - $X, $y - $Y)
241} 292}
242 293
243# translate local coordinates to global coordinate system 294# translate local coordinates to global coordinate system
244sub coord2global { 295sub coord2global {
245 my ($self, $x, $y) = @_; 296 my ($self, $x, $y) = @_;
246 297
247 my ($X, $Y) = $self->_topleft; 298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
248 ($x + $X, $y + $Y)
249} 299}
250 300
251sub focus_in { 301sub focus_in {
252 my ($self) = @_; 302 my ($self) = @_;
253 303
… …
313 glVertex $x + $self->{w}, $y + $self->{h}; 363 glVertex $x + $self->{w}, $y + $self->{h};
314 glVertex $x , $y + $self->{h}; 364 glVertex $x , $y + $self->{h};
315 glEnd; 365 glEnd;
316 glDisable GL_BLEND; 366 glDisable GL_BLEND;
317 } 367 }
368
369 if ($ENV{PCLIENT_DEBUG}) {
370 glPushMatrix;
371 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0;
375 glVertex $self->{w}, 0;
376 glVertex $self->{w}, $self->{h};
377 glVertex 0 , $self->{h};
378 glEnd;
379 glPopMatrix;
380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381 }
318} 382}
319 383
320sub _draw { 384sub _draw {
321 my ($self) = @_; 385 my ($self) = @_;
322 386
… …
337 401
338sub set_parent { 402sub set_parent {
339 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
340 404
341 Scalar::Util::weaken ($self->{parent} = $parent); 405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
342} 410}
343 411
344sub check_size { 412sub check_size {
345 my ($self) = @_; 413 my ($self, $forced) = @_;
346 414
347 $self->{parent} 415 $self->{force_alloc} = 1 if $forced;
348 or return 1; 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
349
350 my ($w, $h) = $self->{user_w} && $self->{user_h}
351 ? @$self{qw(user_w user_h)}
352 : $self->size_request;
353
354 if ($w != $self->{req_w} || $h != $self->{req_h}) {
355 $self->{req_w} = $w;
356 $self->{req_h} = $h;
357
358 $self->{parent}->check_size
359 or $self->size_allocate (
360 (List::Util::max $self->{w}, $w),
361 (List::Util::max $self->{h}, $h),
362 );
363
364 1
365 } else {
366 0
367 }
368} 417}
369 418
370sub update { 419sub update {
371 my ($self) = @_; 420 my ($self) = @_;
372 421
… …
381} 430}
382 431
383sub emit { 432sub emit {
384 my ($self, $signal, @args) = @_; 433 my ($self, $signal, @args) = @_;
385 434
386 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
387 $cb->($self, @args);
388 }
389} 436}
390 437
391sub DESTROY { 438sub DESTROY {
392 my ($self) = @_; 439 my ($self) = @_;
393 440
441 delete $WIDGET{$self+0};
394 #$self->deactivate; 442 #$self->deactivate;
395} 443}
396 444
397############################################################################# 445#############################################################################
398 446
… …
460sub new { 508sub new {
461 my ($class, %arg) = @_; 509 my ($class, %arg) = @_;
462 510
463 my $children = delete $arg{children} || []; 511 my $children = delete $arg{children} || [];
464 512
465 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
466 $self->add ($_) for @$children; 518 $self->add ($_) for @$children;
467 519
468 $self 520 $self
469} 521}
470 522
471sub add { 523sub add {
472 my ($self, $child) = @_; 524 my ($self, @widgets) = @_;
473 525
474 $child->set_parent ($self); 526 $_->set_parent ($self)
527 for @widgets;
475 528
476 use sort 'stable'; 529 use sort 'stable';
477 530
478 $self->{children} = [ 531 $self->{children} = [
479 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
480 @{$self->{children}}, $child 533 @{$self->{children}}, @widgets
481 ]; 534 ];
482 535
483 $child->check_size; 536 $self->check_size (1);
537 $self->update;
538}
539
540sub children {
541 @{ $_[0]{children} }
484} 542}
485 543
486sub remove { 544sub remove {
487 my ($self, $child) = @_; 545 my ($self, $child) = @_;
488 546
489 delete $child->{parent}; 547 delete $child->{parent};
548 $child->hide;
490 549
491 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551
552 $self->check_size;
553 $self->update;
554}
555
556sub clear {
557 my ($self) = @_;
558
559 my $children = delete $self->{children};
560 $self->{children} = [];
561
562 for (@$children) {
563 delete $_->{parent};
564 $_->hide;
565 }
492 566
493 $self->check_size; 567 $self->check_size;
494 $self->update; 568 $self->update;
495} 569}
496 570
… …
574} 648}
575 649
576sub update { 650sub update {
577 my ($self) = @_; 651 my ($self) = @_;
578 652
579 # we want to do this delayed... 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
580 $self->render_chld;
581 $self->SUPER::update; 654 $self->SUPER::update;
582}
583
584sub render_chld {
585 my ($self) = @_;
586
587 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
588 glClearColor 0, 0, 0, 1;
589 glClear GL_COLOR_BUFFER_BIT;
590 $self->child->draw;
591 };
592} 655}
593 656
594sub size_allocate { 657sub size_allocate {
595 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
596 659
597 $self->child->configure (0, 0, $w, $h); 660 $self->SUPER::size_allocate ($w, $h);
661 $self->update;
662}
598 663
664sub _render {
665 $_[0]{children}[0]->draw;
666}
667
668sub render_child {
669 my ($self) = @_;
670
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT;
674
599 $self->render_chld; 675 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 };
600} 684}
601 685
602sub _draw { 686sub _draw {
603 my ($self) = @_; 687 my ($self) = @_;
604 688
605 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
606 690
607 my $tex = $self->{texture} 691 my $tex = $self->{texture}
608 or return; 692 or return;
609 693
610 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
612 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
614 697
615 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
616 699
617 glDisable GL_BLEND;
618 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
619} 701}
620 702
621############################################################################# 703#############################################################################
622 704
623package CFClient::UI::ViewPort; 705package CFClient::UI::ViewPort;
624 706
625our @ISA = CFClient::UI::Window::; 707our @ISA = CFClient::UI::Window::;
626 708
627sub new { die }
628
629sub size_request { 709sub size_request {
630 my ($self) = @_; 710 my ($self) = @_;
631 711
632 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
633 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
634 714
635 @$self{qw(child_w child_h)} 715 @$self{qw(child_w child_h)}
636} 716}
637 717
638sub _draw { 718sub size_allocate {
639 my ($self) = @_; 719 my ($self, $w, $h) = @_;
640 720
641 $self->{children}[1]->draw; 721 $self->update;
642} 722}
643 723
724sub set_offset {
725 my ($self, $x, $y) = @_;
644 726
645############################################################################# 727 $self->{view_x} = int $x;
728 $self->{view_y} = int $y;
646 729
730 $self->update;
731}
732
733# hmm, this does not work for topleft of $self... but we should not ask for that
734sub coord2local {
735 my ($self, $x, $y) = @_;
736
737 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
738}
739
740sub coord2global {
741 my ($self, $x, $y) = @_;
742
743 $x = List::Util::min $self->{w}, $x - $self->{view_x};
744 $y = List::Util::min $self->{h}, $y - $self->{view_y};
745
746 $self->SUPER::coord2global ($x, $y)
747}
748
749sub find_widget {
750 my ($self, $x, $y) = @_;
751
752 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
753 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
754 ) {
755 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
756 } else {
757 $self->CFClient::UI::Base::find_widget ($x, $y)
758 }
759}
760
761sub _render {
762 my ($self) = @_;
763
764 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
765
766 $self->SUPER::_render;
767}
768
769#############################################################################
770
647package CFClient::UI::Frame; 771package CFClient::UI::ScrolledWindow;
648 772
649our @ISA = CFClient::UI::Bin::; 773our @ISA = CFClient::UI::HBox::;
650
651use CFClient::OpenGL;
652 774
653sub new { 775sub new {
654 my $class = shift; 776 my $class = shift;
655 777
778 my $self;
779
780 my $slider = new CFClient::UI::Slider
781 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
785 },
786 ;
787
656 my $self = $class->SUPER::new ( 788 $self = $class->SUPER::new (
657 bg => [1, 1, 1, 1], 789 vp => (new CFClient::UI::ViewPort),
658 border_bg => [1, 1, 1, 1], 790 slider => $slider,
659 border => 0.8,
660 @_ 791 @_,
661 ); 792 );
662 793
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider});
797
663 $self 798 $self
664} 799}
665 800
801#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll
803
804#############################################################################
805
806package CFClient::UI::Frame;
807
808our @ISA = CFClient::UI::Bin::;
809
810use CFClient::OpenGL;
811
812sub new {
813 my $class = shift;
814
815 $class->SUPER::new (
816 bg => undef,
817 @_,
818 )
819}
820
666sub _draw { 821sub _draw {
667 my ($self) = @_; 822 my ($self) = @_;
668 823
669 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
670 826
671 glEnable GL_BLEND; 827 glEnable GL_BLEND;
672 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 830
676# glBegin GL_QUADS; 831 glBegin GL_QUADS;
677# glColor 0, 0, 0, 0;
678# glVertex 0 , 0; 832 glVertex 0 , 0;
679# glVertex 0 , $h; 833 glVertex 0 , $h;
680# glVertex $w, $h; 834 glVertex $w, $h;
681# glVertex $w, 0; 835 glVertex $w, 0;
682# glEnd; 836 glEnd;
683 837
684
685 $self->child->draw;
686 glDisable GL_BLEND; 838 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
688} 842}
689 843
690############################################################################# 844#############################################################################
691 845
692package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
703 my $class = shift; 857 my $class = shift;
704 858
705 # TODO: user_x, user_y, overwrite moveto? 859 # TODO: user_x, user_y, overwrite moveto?
706 860
707 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
708 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
709 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
710 border => 0.8, 864 border => 0.6,
865 toplevel => 1,
711 can_events => 1, 866 can_events => 1,
712 @_ 867 @_
713 ); 868 );
714 869
715 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
716 align => 0, 871 align => 0,
717 valign => 1, 872 valign => 1,
718 text => $self->{title}, 873 text => $self->{title},
719 fontsize => 1; 874 fontsize => $self->{border};
720 875
721 $self 876 $self
722} 877}
723 878
724sub border { 879sub border {
… …
740 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
741 896
742 $h -= List::Util::max 0, $self->border * 2; 897 $h -= List::Util::max 0, $self->border * 2;
743 $w -= List::Util::max 0, $self->border * 2; 898 $w -= List::Util::max 0, $self->border * 2;
744 899
745 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 900 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
746 if $self->{title}; 901 if $self->{title};
747 902
748 $self->child->configure ($self->border, $self->border, $w, $h); 903 $self->child->configure ($self->border, $self->border, $w, $h);
749} 904}
750 905
751sub button_down { 906sub button_down {
752 my ($self, $ev, $x, $y) = @_; 907 my ($self, $ev, $x, $y) = @_;
753 908
909 my ($w, $h) = @$self{qw(w h)};
754 my $border = $self->border; 910 my $border = $self->border;
755 911
756 if ($x < $self->{w} && $x >= $self->{w} - $border 912 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757 && $y < $self->{h} && $y >= $self->{h} - $border) { 913 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758 914
915 if ($lr & $td) {
916 my ($wx, $wy) = ($self->{x}, $self->{y});
759 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 917 my ($ox, $oy) = ($ev->{x}, $ev->{y});
760 my ($bw, $bh) = ($self->{w}, $self->{h}); 918 my ($bw, $bh) = ($self->{w}, $self->{h});
761 919
920 my $mx = $x < $border;
921 my $my = $y < $border;
922
762 $self->{motion} = sub { 923 $self->{motion} = sub {
763 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
764 925
765 ($x, $y) = ($ev->{x}, $ev->{y}); 926 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy;
766 928
767 $self->{user_w} = $bw + $x - $ox; 929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
768 $self->{user_h} = $bh + $y - $oy; 930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
769 $self->check_size; 932 $self->check_size;
770 }; 933 };
771 934
772 } elsif ($x >= 0 && $x < $self->{w} 935 } elsif ($lr ^ $td) {
773 && $y >= 0 && $y < $border) {
774
775 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 936 my ($ox, $oy) = ($ev->{x}, $ev->{y});
776 my ($bx, $by) = ($self->{x}, $self->{y}); 937 my ($bx, $by) = ($self->{x}, $self->{y});
777 938
778 $self->{motion} = sub { 939 $self->{motion} = sub {
779 my ($ev, $x, $y) = @_; 940 my ($ev, $x, $y) = @_;
… …
802 my ($self) = @_; 963 my ($self) = @_;
803 964
804 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
805 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
806 967
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
811 970
812 my $border = $self->border; 971 my $border = $self->border;
813 972
814 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
815 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
816 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
817 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
818 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
819 978
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
820 my $bg = $tex[0]; 980 my $bg = $tex[0];
821 981
822 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
823 my $rep_x = $cw / $bg->{w}; 983 my $rep_x = $cw / $bg->{w};
824 my $rep_y = $ch / $bg->{h}; 984 my $rep_y = $ch / $bg->{h};
825 985
826 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
827 987
828 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
829 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
830 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
831 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
832 993
833 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
834 glDisable GL_BLEND;
835 995
836 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
997
837 $self->child->draw; 998 $self->child->draw;
838} 999}
839 1000
840############################################################################# 1001#############################################################################
841 1002
… …
863 $self->{children}[$y][$x] = $child; 1024 $self->{children}[$y][$x] = $child;
864 1025
865 $child->check_size; 1026 $child->check_size;
866} 1027}
867 1028
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
868# TODO: move to container class maybe? send childs a signal on removal? 1033# TODO: move to container class maybe? send childs a signal on removal?
869sub clear { 1034sub clear {
870 my ($self) = @_; 1035 my ($self) = @_;
871 1036
1037 my @children = $self->children;
872 delete $self->{children}; 1038 delete $self->{children};
1039
1040 for (@children) {
1041 delete $_->{parent};
1042 $_->hide;
1043 }
1044
873 $self->update; 1045 $self->update;
874} 1046}
875 1047
876sub get_wh { 1048sub get_wh {
877 my ($self) = @_; 1049 my ($self) = @_;
… …
1054} 1226}
1055 1227
1056sub size_allocate { 1228sub size_allocate {
1057 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1058 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1059 my $children = $self->{children}; 1233 my $children = $self->{children};
1060 1234
1061 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1062 1236
1063 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1100 1274
1101sub new { 1275sub new {
1102 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1103 1277
1104 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1105 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1106 #font => default_font 1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1107 fontsize => 1, 1284 fontsize => 1,
1108 text => "",
1109 align => -1, 1285 align => -1,
1110 valign => -1, 1286 valign => -1,
1111 padding => 2, 1287 padding => 2,
1112 layout => new CFClient::Layout,
1113 can_events => 0, 1288 can_events => 0,
1114 %arg 1289 %arg
1115 ); 1290 );
1116 1291
1117 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1118 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1119 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1120 $self->{template} = $layout; 1295 $self->{template} = $layout;
1121 } 1296 }
1122 1297
1123 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1124 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1299 $self->set_markup (delete $self->{markup});
1300 } else {
1301 $self->set_text (delete $self->{text});
1302 }
1125 1303
1126 $self 1304 $self
1127} 1305}
1128 1306
1129sub escape_text { 1307sub escape {
1130 local $_ = $_[1]; 1308 local $_ = $_[1];
1131 1309
1132 s/&/&amp;/g; 1310 s/&/&amp;/g;
1133 s/>/&gt;/g; 1311 s/>/&gt;/g;
1134 s/</&lt;/g; 1312 s/</&lt;/g;
1135 1313
1136 $_[1] 1314 $_[1]
1137} 1315}
1138 1316
1317sub update {
1318 my ($self) = @_;
1319
1320 delete $self->{texture};
1321 $self->SUPER::update;
1322}
1323
1139sub set_text { 1324sub set_text {
1140 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1141 1326
1327 return if $self->{text} eq "T$text";
1328 $self->{text} = "T$text";
1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1143 1332
1144 delete $self->{texture}; 1333 $self->update;
1145 $self->check_size; 1334 $self->check_size;
1146 $self->update;
1147} 1335}
1148 1336
1149sub set_markup { 1337sub set_markup {
1150 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1151 1339
1340 return if $self->{text} eq "M$markup";
1341 $self->{text} = "M$markup";
1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1153 1347
1154 delete $self->{texture}; 1348 $self->update;
1155 $self->check_size; 1349 $self->check_size;
1156 $self->update;
1157} 1350}
1158 1351
1159sub size_request { 1352sub size_request {
1160 my ($self) = @_; 1353 my ($self) = @_;
1161 1354
… …
1190sub set_fontsize { 1383sub set_fontsize {
1191 my ($self, $fontsize) = @_; 1384 my ($self, $fontsize) = @_;
1192 1385
1193 $self->{fontsize} = $fontsize; 1386 $self->{fontsize} = $fontsize;
1194 delete $self->{texture}; 1387 delete $self->{texture};
1388
1389 $self->update;
1195 $self->check_size; 1390 $self->check_size;
1196 $self->update;
1197} 1391}
1198 1392
1199sub _draw { 1393sub _draw {
1200 my ($self) = @_; 1394 my ($self) = @_;
1201 1395
1202 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1203 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1204 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1205 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1401
1206 new_from_layout CFClient::Texture $self->{layout} 1402 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5);
1407
1408 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5);
1411
1412 $tex
1207 }; 1413 };
1208 1414
1209 glEnable GL_BLEND;
1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213 1417
1418 if ($tex->{format} == GL_ALPHA) {
1214 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1215
1216 $self->{ox} = int (
1217 $self->{align} < 0 ? $self->{padding}
1218 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1219 : ($self->{w} - $tex->{w}) * 0.5
1220 );
1221
1222 $self->{oy} = int (
1223 $self->{valign} < 0 ? $self->{padding}
1224 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1225 : ($self->{h} - $tex->{h}) * 0.5
1226 );
1227
1228 $tex->draw_quad ($self->{ox}, $self->{oy}); 1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1421 } else {
1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1423 }
1229 1424
1230 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1231 glDisable GL_BLEND;
1232} 1426}
1233 1427
1234############################################################################# 1428#############################################################################
1235 1429
1236package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1241 1435
1242sub new { 1436sub new {
1243 my $class = shift; 1437 my $class = shift;
1244 1438
1245 $class->SUPER::new ( 1439 $class->SUPER::new (
1246 fg => [1, 1, 1], 1440 fg => [1, 1, 1],
1247 bg => [0, 0, 0, 0.2], 1441 bg => [0, 0, 0, 0.2],
1248 active_bg => [1, 1, 1, 0.5], 1442 active_bg => [1, 1, 1, 0.5],
1249 active_fg => [0, 0, 0], 1443 active_fg => [0, 0, 0],
1250 can_hover => 1, 1444 can_hover => 1,
1251 can_focus => 1, 1445 can_focus => 1,
1252 valign => 0, 1446 valign => 0,
1253 can_events => 1, 1447 can_events => 1,
1254 @_ 1448 @_
1255 ) 1449 )
1256} 1450}
1257 1451
… …
1271 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1272 1466
1273 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1274} 1468}
1275 1469
1276sub get_text {
1277 $_[0]{text}
1278}
1279
1280sub size_request {
1281 my ($self) = @_;
1282
1283 my ($w, $h) = $self->SUPER::size_request;
1284
1285 ($w + 1, $h) # add 1 for cursor
1286}
1287
1288sub size_allocate {
1289 my ($self, $w, $h) = @_;
1290
1291 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1292}
1293
1294sub set_text { 1470sub set_text {
1295 my ($self, $text) = @_; 1471 my ($self, $text) = @_;
1296 1472
1297 $self->{cursor} = length $text; 1473 $self->{cursor} = length $text;
1298 $self->_set_text ($text); 1474 $self->_set_text ($text);
1299 $self->update; 1475 $self->update;
1476 $self->check_size;
1477}
1478
1479sub get_text {
1480 $_[0]{text}
1481}
1482
1483sub size_request {
1484 my ($self) = @_;
1485
1486 my ($w, $h) = $self->SUPER::size_request;
1487
1488 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1300} 1495}
1301 1496
1302sub key_down { 1497sub key_down {
1303 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1304 1499
… …
1306 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1307 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1308 1503
1309 my $text = $self->get_text; 1504 my $text = $self->get_text;
1310 1505
1311 if ($sym == 8) { 1506 if ($uni == 8) {
1312 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1314 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1315 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1316 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1317 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1318 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1319 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1320 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1321 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1322 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1323 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1324 $self->emit ('escape'); 1519 $self->emit ('escape');
1325 } elsif ($uni) { 1520 } elsif ($uni) {
1326 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1327 } 1522 }
1328 1523
1329 $self->_set_text ($text); 1524 $self->_set_text ($text);
1330 $self->update; 1525 $self->update;
1526 $self->check_size;
1331} 1527}
1332 1528
1333sub focus_in { 1529sub focus_in {
1334 my ($self) = @_; 1530 my ($self) = @_;
1335 1531
… …
1411 my ($self, $ev) = @_; 1607 my ($self, $ev) = @_;
1412 1608
1413 my $sym = $ev->{sym}; 1609 my $sym = $ev->{sym};
1414 1610
1415 if ($sym == 13) { 1611 if ($sym == 13) {
1612 unshift @{$self->{history}},
1613 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = '';
1416 $self->emit (activate => $self->get_text); 1616 $self->emit (activate => $txt);
1417 $self->update; 1617 $self->update;
1618
1619 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text;
1622 }
1623 if (@{$self->{history} || []} > 0) {
1624 $self->{history_pointer}++;
1625 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1626 $self->{history_pointer} = @{$self->{history} || []} - 1;
1627 }
1628 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1629 }
1630
1631 } elsif ($sym == CFClient::SDLK_DOWN) {
1632 $self->{history_pointer}--;
1633 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1634
1635 if ($self->{history_pointer} >= 0) {
1636 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1637 } else {
1638 $self->set_text ($self->{history_saveback});
1639 }
1418 1640
1419 } else { 1641 } else {
1420 $self->SUPER::key_down ($ev); 1642 $self->SUPER::key_down ($ev);
1421 } 1643 }
1422 1644
… …
1436 1658
1437sub new { 1659sub new {
1438 my $class = shift; 1660 my $class = shift;
1439 1661
1440 $class->SUPER::new ( 1662 $class->SUPER::new (
1441 padding => 4, 1663 padding => 4,
1442 fg => [1, 1, 1], 1664 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2], 1665 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1666 active_fg => [0, 0, 1],
1445 can_hover => 1, 1667 can_hover => 1,
1446 align => 0, 1668 align => 0,
1447 valign => 0, 1669 valign => 0,
1448 can_events => 1, 1670 can_events => 1,
1449 @_ 1671 @_
1450 ) 1672 )
1451} 1673}
1452 1674
… …
1466 1688
1467 if ($GRAB == $self) { 1689 if ($GRAB == $self) {
1468 $self->{fg} = $self->{active_fg}; 1690 $self->{fg} = $self->{active_fg};
1469 } 1691 }
1470 1692
1471 glEnable GL_BLEND;
1472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1473 glEnable GL_TEXTURE_2D; 1693 glEnable GL_TEXTURE_2D;
1474 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475 glColor 0, 0, 0, 1; 1695 glColor 0, 0, 0, 1;
1476 1696
1477 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1697 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478 1698
1479 glDisable GL_TEXTURE_2D; 1699 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND;
1481 1700
1482 $self->SUPER::_draw; 1701 $self->SUPER::_draw;
1483} 1702}
1484 1703
1485############################################################################# 1704#############################################################################
… …
1532 1751
1533 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1534 1753
1535 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536 1755
1537 glEnable GL_BLEND; 1756 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757
1538 glEnable GL_TEXTURE_2D; 1758 glEnable GL_TEXTURE_2D;
1539 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1540
1541 my $tex = $self->{state} ? $tex[1] : $tex[0];
1542
1543 $tex->draw_quad (0, 0, $s, $s); 1759 $tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545 glDisable GL_TEXTURE_2D; 1760 glDisable GL_TEXTURE_2D;
1546 glDisable GL_BLEND;
1547} 1761}
1548 1762
1549############################################################################# 1763#############################################################################
1550 1764
1551package CFClient::UI::Image; 1765package CFClient::UI::Image;
… …
1594 glTranslate 0, -$self->{w}, 0; 1808 glTranslate 0, -$self->{w}, 0;
1595 1809
1596 ($w, $h) = ($h, $w); 1810 ($w, $h) = ($h, $w);
1597 } 1811 }
1598 1812
1599 glEnable GL_BLEND;
1600 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 1813 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603 1815
1604 $tex->draw_quad (0, 0, $w, $h); 1816 $tex->draw_quad_alpha (0, 0, $w, $h);
1605 1817
1606 glDisable GL_BLEND;
1607 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1608} 1819}
1609 1820
1610############################################################################# 1821#############################################################################
1611 1822
… …
1659} 1870}
1660 1871
1661sub set_max { 1872sub set_max {
1662 my ($self, $max) = @_; 1873 my ($self, $max) = @_;
1663 1874
1875 return if $self->{max_val} == $max;
1876
1664 $self->{max_val} = $max; 1877 $self->{max_val} = $max;
1878 $self->update;
1665} 1879}
1666 1880
1667sub set_value { 1881sub set_value {
1668 my ($self, $val, $max) = @_; 1882 my ($self, $val, $max) = @_;
1669 1883
1670 $self->set_max ($max) 1884 $self->set_max ($max)
1671 if defined $max; 1885 if defined $max;
1672 1886
1673 $max = $self->{max_val}; 1887 return if $self->{val} == $val;
1888
1674 $self->{val} = $val; 1889 $self->{val} = $val;
1675
1676 $self->update; 1890 $self->update;
1677} 1891}
1678 1892
1679sub _draw { 1893sub _draw {
1680 my ($self) = @_; 1894 my ($self) = @_;
… …
1743 1957
1744sub new { 1958sub new {
1745 my ($class, %arg) = @_; 1959 my ($class, %arg) = @_;
1746 1960
1747 my $self = $class->SUPER::new ( 1961 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 1962 tooltip => $arg{type},
1963 can_hover => 1,
1964 can_events => 1,
1749 %arg, 1965 %arg,
1750 ); 1966 );
1751 1967
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1968 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1969 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1970 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 1971
1756 $self 1972 $self
1757} 1973}
1758 1974
1759sub set_fontsize { 1975sub set_fontsize {
… …
1761 1977
1762 $self->{value}->set_fontsize ($fsize); 1978 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 1979 $self->{max} ->set_fontsize ($fsize);
1764} 1980}
1765 1981
1982sub set_max {
1983 my ($self, $max) = @_;
1984
1985 $self->{gauge}->set_max ($max);
1986 $self->{max}->set_text ($max);
1987}
1988
1766sub set_value { 1989sub set_value {
1767 my ($self, $val, $max) = @_; 1990 my ($self, $val, $max) = @_;
1768 1991
1769 $self->set_max ($max) 1992 $self->set_max ($max)
1770 if defined $max; 1993 if defined $max;
1771 1994
1772 $self->{gauge}->set_value ($val, $max); 1995 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 1996 $self->{value}->set_text ($val);
1774}
1775
1776sub set_max {
1777 my ($self, $max) = @_;
1778
1779 $self->{gauge}->set_max ($max);
1780 $self->{max}->set_text ($max);
1781} 1997}
1782 1998
1783############################################################################# 1999#############################################################################
1784 2000
1785package CFClient::UI::Slider; 2001package CFClient::UI::Slider;
… …
1795 qw(s1_slider.png s1_slider_bg.png); 2011 qw(s1_slider.png s1_slider_bg.png);
1796 2012
1797sub new { 2013sub new {
1798 my $class = shift; 2014 my $class = shift;
1799 2015
1800 # range [value, low, high, page] 2016 # range [value, low, high, page, unit]
1801 2017
1802 # TODO: 0-width page 2018 # TODO: 0-width page
1803 # TODO: req_w/h are wrong with vertical 2019 # TODO: req_w/h are wrong with vertical
1804 # TODO: calculations are off 2020 # TODO: calculations are off
1805 my $self = $class->SUPER::new ( 2021 my $self = $class->SUPER::new (
1806 fg => [1, 1, 1], 2022 fg => [1, 1, 1],
1807 active_fg => [0, 0, 0], 2023 active_fg => [0, 0, 0],
1808 range => [0, 0, 100, 10], 2024 range => [0, 0, 100, 10],
1809 req_w => 20, 2025 req_w => $::WIDTH / 80,
1810 req_h => 20, 2026 req_h => $::WIDTH / 80,
1811 vertical => 0, 2027 vertical => 0,
1812 can_hover => 1, 2028 can_hover => 1,
1813 inner_pad => 5, 2029 inner_pad => .05,
1814 @_ 2030 @_
1815 ); 2031 );
1816 2032
2033 $self->set_value ($self->{range}[0]);
2034 $self->update;
2035
1817 $self 2036 $self
2037}
2038
2039sub set_value {
2040 my ($self, $value) = @_;
2041
2042 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043
2044 $hi = $lo + 1 if $hi <= $lo;
2045
2046 $value = $lo if $value < $lo;
2047 $value = $hi if $value > $hi;
2048
2049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050 if $unit;
2051
2052 $page = $hi - $lo if $page > $hi - $lo;
2053
2054 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055
2056 if ($value != $old_value) {
2057 $self->emit (changed => $value);
2058 $self->update;
2059 }
1818} 2060}
1819 2061
1820sub size_request { 2062sub size_request {
1821 my ($self) = @_; 2063 my ($self) = @_;
1822 2064
… …
1835 2077
1836sub mouse_motion { 2078sub mouse_motion {
1837 my ($self, $ev, $x, $y) = @_; 2079 my ($self, $ev, $x, $y) = @_;
1838 2080
1839 if ($GRAB == $self) { 2081 if ($GRAB == $self) {
2082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083
2084 my (undef, $lo, $hi, $page) = @{$self->{range}};
2085
2086 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2087
2088 $self->set_value ($x * ($hi - $lo) + $lo);
2089 }
2090}
2091
2092sub update {
2093 my ($self) = @_;
2094
2095 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096 $self->set_value ($self->{range}[0]);
2097
1840 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2098 my ($value, $lo, $hi, $page) = @{$self->{range}};
1841 2099
1842 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2100 my $inner_w = 1 - 2 * $self->{inner_pad};
1843 2101
1844 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1845 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1846 2103
1847 $x -= $inner_pad_px; # substract the padding 2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1848 $x = $x * ($hi - $lo) / $inner_w + $lo; 2105 $value = $self->{scale} * ($value - $lo);
1849 $x = $lo if $x < $lo;
1850 $x = $hi - $page if $x > $hi - $page;
1851 $self->{range}[0] = $x;
1852 2106
1853 $self->emit (changed => $x); 2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
1854 $self->update; 2108
2109 $value = 0 if $value < 0;
2110 $page = 1 - $value if $value + $page > 1;
2111
2112 $self->{knob_x} = $value;
2113 $self->{knob_w} = $page;
1855 } 2114 });
1856}
1857 2115
1858# the inner_* stuff is for generating a padding for the slider handle, 2116 $self->SUPER::update;
1859# so that the handle doesn't leave the texture. This calculation isn't 100%
1860# correct propably, but it does the job for now
1861sub _calc_inner_pad_px {
1862 my ($self, $w) = @_;
1863 ($w / 100) * $self->{inner_pad} # % to pixels
1864} 2117}
1865 2118
1866sub _draw { 2119sub _draw {
1867 my ($self) = @_; 2120 my ($self) = @_;
1868 2121
1869 $self->SUPER::_draw (); 2122 $self->SUPER::_draw ();
1870 2123
1871 my ($w, $h) = @$self{qw(w h)}; 2124 glScale $self->{w}, $self->{h};
1872 2125
1873 if ($self->{vertical}) { 2126 if ($self->{vertical}) {
1874 # draw a vertical slider like a rotated horizontal slider 2127 # draw a vertical slider like a rotated horizontal slider
1875 2128
1876 glRotate 90, 0, 0, 1; 2129 glRotate 90, 0, 0, 1;
1877 glTranslate 0, -$self->{w}, 0; 2130 glTranslate 0, 1, 0;
1878
1879 ($w, $h) = ($h, $w);
1880 } 2131 }
1881 2132
1882 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1883 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1884 2135
1885 my ($value, $lo, $hi, $page) = @{$self->{range}};
1886
1887 $hi = $value + 1 if $lo == $hi;
1888
1889 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1890 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1891
1892 $page = int $page * $inner_w / ($hi - $lo);
1893 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1894
1895 $w -= $page;
1896 $page &= ~1;
1897 glTranslate $page * 0.5, 0, 0;
1898 $page ||= 2;
1899
1900 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1901 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1902
1903 glEnable GL_BLEND;
1904 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1905 glEnable GL_TEXTURE_2D; 2136 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 2138
1908 # draw background 2139 # draw background
1909 $tex[1]->draw_quad (0, 0, $w, $h); 2140 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1910 2141
1911 # draw handle 2142 # draw handle
1912 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1913 2144
1914 glDisable GL_BLEND;
1915 glDisable GL_TEXTURE_2D; 2145 glDisable GL_TEXTURE_2D;
1916} 2146}
1917 2147
1918############################################################################# 2148#############################################################################
1919 2149
… …
1925 2155
1926sub new { 2156sub new {
1927 my $class = shift; 2157 my $class = shift;
1928 2158
1929 my $self = $class->SUPER::new ( 2159 my $self = $class->SUPER::new (
1930 fontsize => 1, 2160 fontsize => 1,
2161 can_events => 0,
1931 #font => default_font 2162 #font => default_font
1932 @_, 2163 @_,
1933 2164
1934 layout => (new CFClient::Layout), 2165 layout => (new CFClient::Layout 1),
1935 par => [], 2166 par => [],
1936 height => 0, 2167 height => 0,
1937 children => [ 2168 children => [
1938 (new CFClient::UI::Empty expand => 1), 2169 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2170 (new CFClient::UI::Slider vertical => 1),
1940 ], 2171 ],
1941 ); 2172 );
1942 2173
1943 $self->{children}[1]->connect (changed => sub { 2174 $self->{children}[1]->connect (changed => sub { $self->update });
1944 $self->update;
1945 });
1946 2175
1947 $self 2176 $self
1948} 2177}
1949 2178
1950sub set_fontsize { 2179sub set_fontsize {
… …
1958 my ($self, $text) = @_; 2187 my ($self, $text) = @_;
1959 2188
1960 my $layout = $self->{layout}; 2189 my $layout = $self->{layout};
1961 2190
1962 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963 $layout->set_width ($self->{w}); 2192 $layout->set_width ($self->{children}[0]{w});
1964 $layout->set_text ($text); 2193 $layout->set_markup ($text);
1965 2194
1966 ($layout->size)[1] 2195 ($layout->size)[1]
1967} 2196}
1968 2197
1969sub reflow { 2198sub reflow {
… …
2007 2236
2008 return unless $self->{h} > 0; 2237 return unless $self->{h} > 0;
2009 2238
2010 delete $self->{texture}; 2239 delete $self->{texture};
2011 2240
2012 $ROOT->on_refresh ($self, sub { 2241 $ROOT->on_post_alloc ($self, sub {
2013 if (delete $self->{need_reflow}) { 2242 if (delete $self->{need_reflow}) {
2014 my $height = 0; 2243 my $height = 0;
2015 2244
2016 $height += $_->[0] = $self->text_height ($_->[2]) 2245 $height += $_->[0] = $self->text_height ($_->[2])
2017 for @{$self->{par}}; 2246 for @{$self->{par}};
… …
2021 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2022 2251
2023 delete $self->{texture}; 2252 delete $self->{texture};
2024 } 2253 }
2025 2254
2026 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2255 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2027 glClearColor 0, 0, 0, 1; 2256 glClearColor 0, 0, 0, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2257 glClear GL_COLOR_BUFFER_BIT;
2029 2258
2030 glEnable GL_BLEND;
2031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2032 glEnable GL_TEXTURE_2D; 2259 glEnable GL_TEXTURE_2D;
2033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2034 2261
2035 my $top = int $self->{children}[1]{range}[0]; 2262 my $top = int $self->{children}[1]{range}[0];
2036 2263
… …
2045 2272
2046 for my $par (@{$self->{par}}) { 2273 for my $par (@{$self->{par}}) {
2047 my $h = $par->[0]; 2274 my $h = $par->[0];
2048 2275
2049 if ($y0 < $y + $h && $y < $y1) { 2276 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] });
2050 $layout->set_text ($par->[2]); 2278 $layout->set_markup ($par->[2]);
2051 2279
2052 glColor @{ $par->[1] };
2053 my ($W, $H) = $layout->size; 2280 my ($W, $H) = $layout->size;
2054 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2281 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2055 } 2282 }
2056 2283
2057 $y += $h; 2284 $y += $h;
2058 } 2285 }
2059 2286
2060 glDisable GL_TEXTURE_2D; 2287 glDisable GL_TEXTURE_2D;
2061 glDisable GL_BLEND;
2062 }; 2288 };
2063 }); 2289 });
2064} 2290}
2065 2291
2066sub _draw { 2292sub _draw {
2067 my ($self) = @_; 2293 my ($self) = @_;
2068 2294
2069 if ($self->{texture}) {
2070 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2297 glColor 1, 1, 1, 1;
2298 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073 glDisable GL_TEXTURE_2D; 2299 glDisable GL_TEXTURE_2D;
2074 }
2075 2300
2076 $self->{children}[1]->draw; 2301 $self->{children}[1]->draw;
2077 2302
2078} 2303}
2079 2304
… …
2127 2352
2128sub new { 2353sub new {
2129 my $class = shift; 2354 my $class = shift;
2130 2355
2131 my $self = $class->SUPER::new ( 2356 my $self = $class->SUPER::new (
2132 state => 0, 2357 state => 0,
2133 connect_activate => \&toggle_flopper, 2358 connect_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2359 @_
2136 ); 2360 );
2137 2361
2138 if ($self->{state}) { 2362 if ($self->{state}) {
2139 $self->{state} = 0; 2363 $self->{state} = 0;
… …
2174 @_, 2398 @_,
2175 can_events => 0, 2399 can_events => 0,
2176 ) 2400 )
2177} 2401}
2178 2402
2179sub set_text { 2403sub set_tooltip_from {
2180 my ($self, $text) = @_; 2404 my ($self, $widget) = @_;
2181 2405
2182 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2406 $self->add (new CFClient::UI::Label
2183 $self->{label}->set_text ($text); 2407 markup => $widget->{tooltip},
2184 $self->add ($self->{label}); 2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8,
2410 fg => [0, 0, 0, 1],
2411 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 );
2185} 2413}
2186 2414
2187sub size_request { 2415sub size_request {
2188 my ($self) = @_; 2416 my ($self) = @_;
2189 2417
2190 $self->child->set_max_size ($::WIDTH * 0.2);
2191
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2418 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2419
2194 ($w + 4, $h + 4) 2420 ($w + 4, $h + 4)
2195} 2421}
2196 2422
2423sub size_allocate {
2424 my ($self, $w, $h) = @_;
2425
2426 $self->SUPER::size_allocate ($w - 4, $h - 4);
2427}
2428
2197sub _draw { 2429sub _draw {
2198 my ($self) = @_; 2430 my ($self) = @_;
2199 2431
2200 glPushMatrix;
2201 glTranslate 0.375, 0.375; 2432 glTranslate 0.375, 0.375;
2202 2433
2203 my ($w, $h) = @$self{qw(w h)}; 2434 my ($w, $h) = @$self{qw(w h)};
2204 2435
2205 glColor 1, 0.8, 0.4; 2436 glColor 1, 0.8, 0.4;
… …
2216 glVertex 0 , $h; 2447 glVertex 0 , $h;
2217 glVertex $w, $h; 2448 glVertex $w, $h;
2218 glVertex $w, 0; 2449 glVertex $w, 0;
2219 glEnd; 2450 glEnd;
2220 2451
2221 glPopMatrix; 2452 glTranslate 2 - 0.375, 2 - 0.375;
2222
2223 glTranslate 2, 2;
2224 $self->SUPER::_draw; 2453 $self->SUPER::_draw;
2225} 2454}
2226 2455
2227############################################################################# 2456#############################################################################
2228 2457
2458package CFClient::UI::Face;
2459
2460our @ISA = CFClient::UI::Base::;
2461
2462use CFClient::OpenGL;
2463
2464sub new {
2465 my $class = shift;
2466
2467 $class->SUPER::new (
2468 aspect => 1,
2469 @_,
2470 )
2471}
2472
2473sub size_request {
2474 (32, 8)
2475}
2476
2477sub _draw {
2478 my ($self) = @_;
2479
2480 return unless $::CONN;#d# manage and cache textures differently
2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2482
2483 # TODO animation
2484 if ($tex) {
2485 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1;
2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489 glDisable GL_TEXTURE_2D;
2490 }
2491}
2492
2493#############################################################################
2494
2495package CFClient::UI::InventoryItem;
2496
2497our @ISA = CFClient::UI::HBox::;
2498
2499sub new {
2500 my $class = shift;
2501
2502 my %args = @_;
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2
2507 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}";
2509
2510 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)";
2514 $item->{flags} & Crossfire::Protocol::F_UNPAID
2515 and $desc .= " (unpaid)";
2516 $item->{flags} & Crossfire::Protocol::F_MAGIC
2517 and $desc .= " (magic)";
2518 $item->{flags} & Crossfire::Protocol::F_CURSED
2519 and $desc .= " (cursed)";
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *";
2524
2525 my $self = $class->SUPER::new (
2526 can_hover => 1,
2527 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) {
2539 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ],
2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 }
2552
2553 1
2554 },
2555 %args
2556 );
2557
2558 $self->add (new CFClient::UI::Face
2559 can_events => 0,
2560 face => $item->{face},
2561 anim => $item->{anim},
2562 animspeed => $item->{animspeed},
2563 );
2564
2565 $self->add (new CFClient::UI::Label
2566 can_events => 0,
2567 text => $desc,
2568 );
2569
2570 $self
2571}
2572
2573#############################################################################
2574
2575package CFClient::UI::Inventory;
2576
2577our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579sub new {
2580 my $class = shift;
2581
2582 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox),
2584 @_,
2585 );
2586
2587 $self
2588}
2589
2590sub set_items {
2591 my ($self, $items) = @_;
2592
2593 $self->{scrolled}->clear;
2594 return unless $items;
2595
2596 my @items = sort {
2597 ($a->{type} <=> $b->{type})
2598 or ($a->{name} cmp $b->{name})
2599 } @$items;
2600
2601 $self->{real_items} = \@items;
2602
2603 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2609 }
2610
2611 $self->{scrolled}->add (@items);
2612
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614}
2615
2616sub size_request {
2617 my ($self) = @_;
2618 ($self->{req_w}, $self->{req_h});
2619}
2620
2621#############################################################################
2622
2623package CFClient::UI::Menu;
2624
2625our @ISA = CFClient::UI::FancyFrame::;
2626
2627use CFClient::OpenGL;
2628
2629sub new {
2630 my $class = shift;
2631
2632 my $self = $class->SUPER::new (
2633 items => [],
2634 z => 100,
2635 @_,
2636 );
2637
2638 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2639
2640 for my $item (@{ $self->{items} }) {
2641 my ($widget, $cb) = @$item;
2642
2643 # handle various types of items, only text for now
2644 if (!ref $widget) {
2645 $widget = new CFClient::UI::Label
2646 can_hover => 1,
2647 can_events => 1,
2648 text => $widget;
2649 }
2650
2651 $self->{item}{$widget} = $item;
2652
2653 $self->{vbox}->add ($widget);
2654 }
2655
2656 $self
2657}
2658
2659# popup given the event (must be a mouse button down event currently)
2660sub popup {
2661 my ($self, $ev) = @_;
2662
2663 $self->emit ("popdown");
2664
2665 # maybe save $GRAB? must be careful about events...
2666 $GRAB = $self;
2667 $self->{button} = $ev->{button};
2668
2669 $self->show;
2670 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2671}
2672
2673sub mouse_motion {
2674 my ($self, $ev, $x, $y) = @_;
2675
2676 # TODO: should use vbox->find_widget or so
2677 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2678 $self->{hover} = $self->{item}{$HOVER};
2679}
2680
2681sub button_up {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 if ($ev->{button} == $self->{button}) {
2685 undef $GRAB;
2686 $self->hide;
2687
2688 $self->emit ("popdown");
2689 $self->{hover}[1]->() if $self->{hover};
2690 }
2691}
2692
2693#############################################################################
2694
2695package CFClient::UI::Statusbox;
2696
2697our @ISA = CFClient::UI::VBox::;
2698
2699sub reorder {
2700 my ($self) = @_;
2701 my $NOW = time;
2702
2703 while (my ($k, $v) = each %{ $self->{item} }) {
2704 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2705 }
2706
2707 my @widgets;
2708
2709 my @items = sort {
2710 $a->{pri} <=> $b->{pri}
2711 or $b->{id} <=> $a->{id}
2712 } values %{ $self->{item} };
2713
2714 my $count = 10 + 1;
2715 for my $item (@items) {
2716 last unless --$count;
2717
2718 push @widgets, $item->{label} ||= do {
2719 # TODO: doesn't handle markup well (read as: at all)
2720 my $short = $item->{count} > 1
2721 ? "<b>$item->{count} ×</b> $item->{text}"
2722 : $item->{text};
2723
2724 for ($short) {
2725 s/^\s+//;
2726 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 }
2730
2731 new CFClient::UI::Label
2732 markup => $short,
2733 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize},
2737 fg => $item->{fg},
2738 can_events => 1,
2739 can_hover => 1
2740 };
2741 }
2742
2743 $self->clear;
2744 $self->SUPER::add (reverse @widgets);
2745}
2746
2747sub add {
2748 my ($self, $text, %arg) = @_;
2749
2750 $text =~ s/^\s+//;
2751 $text =~ s/\s+$//;
2752
2753 my $timeout = time + ((delete $arg{timeout}) || 60);
2754
2755 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756
2757 if (my $item = $self->{item}{$group}) {
2758 if ($item->{text} eq $text) {
2759 $item->{count}++;
2760 } else {
2761 $item->{count} = 1;
2762 $item->{text} = $item->{tooltip} = $text;
2763 }
2764 $item->{id} = ++$self->{id};
2765 $item->{timeout} = $timeout;
2766 delete $item->{label};
2767 } else {
2768 $self->{item}{$group} = {
2769 id => ++$self->{id},
2770 text => $text,
2771 timeout => $timeout,
2772 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0,
2776 count => 1,
2777 %arg,
2778 };
2779 }
2780
2781 $self->reorder;
2782}
2783
2784#############################################################################
2785
2229package CFClient::UI::Root; 2786package CFClient::UI::Root;
2230 2787
2231our @ISA = CFClient::UI::Container::; 2788our @ISA = CFClient::UI::Container::;
2232 2789
2233use CFClient::OpenGL; 2790use CFClient::OpenGL;
2234 2791
2235sub check_size { 2792sub new {
2236 my ($self) = @_; 2793 my $class = shift;
2237 2794
2238 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2795 $class->SUPER::new (
2239} 2796 @_,
2240 2797 )
2241sub size_request {
2242 ($::WIDTH, $::HEIGHT)
2243} 2798}
2244 2799
2245sub configure { 2800sub configure {
2246 my ($self, $x, $y, $w, $h) = @_; 2801 my ($self, $x, $y, $w, $h) = @_;
2247 2802
2248 $self->SUPER::configure ($x, $y, $w, $h); 2803 $self->{w} = $w;
2804 $self->{h} = $h;
2805}
2249 2806
2807sub check_size {
2808 my ($self) = @_;
2809
2810 $self->size_allocate ($self->{w}, $self->{h})
2811 if $self->{w};
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816
2817 ($self->{w}, $self->{h})
2818}
2819
2820sub size_allocate {
2821 my ($self, $w, $h) = @_;
2822
2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828
2250 for my $child (@{$self->{children}}) { 2829 for my $child ($self->children) {
2251 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2830 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252 2831
2832 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2833 if exists $child->{req_x};
2834
2835 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2836 if exists $child->{req_y};
2837
2253 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2838 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2254 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2839 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2840
2255 $child->configure ($X, $Y, $W,$H); 2841 $child->configure ($X, $Y, $W, $H);
2256 } 2842 }
2257} 2843}
2258 2844
2259sub _topleft { 2845sub coord2local {
2260 my ($self, $x, $y) = @_; 2846 my ($self, $x, $y) = @_;
2261 2847
2262 ($x, $y) 2848 ($x, $y)
2263} 2849}
2264 2850
2851sub coord2global {
2852 my ($self, $x, $y) = @_;
2853
2854 ($x, $y)
2855}
2856
2265sub update { 2857sub update {
2266 my ($self) = @_; 2858 my ($self) = @_;
2267 2859
2268 $self->check_size; 2860 $self->check_size;
2269 ::refresh (); 2861 $::WANT_REFRESH++;
2270} 2862}
2271 2863
2272sub add { 2864sub add {
2273 my ($self, $child) = @_; 2865 my ($self, @children) = @_;
2274 2866
2867 for my $child (@children) {
2868 $child->{toplevel} = 1;
2869
2275 # integerize window positions 2870 # integerise window positions
2276 $child->{x} = int $child->{x}; 2871 $child->{x} = int $child->{x};
2277 $child->{y} = int $child->{y}; 2872 $child->{y} = int $child->{y};
2873 }
2278 2874
2279 $self->SUPER::add ($child); 2875 $self->SUPER::add (@children);
2280} 2876}
2281 2877
2282sub on_refresh { 2878sub on_refresh {
2283 my ($self, $id, $cb) = @_; 2879 my ($self, $id, $cb) = @_;
2284 2880
2285 $self->{refresh_hook}{$id} = $cb; 2881 $self->{refresh_hook}{$id} = $cb;
2286} 2882}
2287 2883
2884sub on_post_alloc {
2885 my ($self, $id, $cb) = @_;
2886
2887 $self->{post_alloc_hook}{$id} = $cb;
2888}
2889
2288sub draw { 2890sub draw {
2289 my ($self) = @_; 2891 my ($self) = @_;
2290 2892
2291 while (my $rcb = delete $self->{refresh_hook}) { 2893 while ($self->{refresh_hook}) {
2292 $_->() for values %$rcb; 2894 $_->()
2895 for values %{delete $self->{refresh_hook}};
2896 }
2897
2898 if ($self->{check_size}) {
2899 my @queue = ([], []);
2900
2901 for (;;) {
2902 if ($self->{check_size}) {
2903 # heuristic: check containers last
2904 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2905 for values %{delete $self->{check_size}}
2906 }
2907
2908 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2909
2910 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2911 ? @$widget{qw(user_w user_h)}
2912 : $widget->size_request;
2913
2914 if (delete $widget->{force_alloc}
2915 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2916 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2917
2918 $widget->{req_w} = $w;
2919 $widget->{req_h} = $h;
2920
2921 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2922
2923 $widget->{parent}->check_size
2924 if $widget->{parent};
2925 }
2926 }
2927 }
2928
2929 while ($self->{size_alloc}) {
2930 for (values %{delete $self->{size_alloc}}) {
2931 my ($widget, $w, $h) = @$_;
2932
2933 $w = 0 if $w < 0;
2934 $h = 0 if $h < 0;
2935
2936 $widget->{w} = $w;
2937 $widget->{h} = $h;
2938 $widget->size_allocate ($w, $h);
2939 $widget->emit (size_allocate => $w, $h);
2940 }
2941 }
2942
2943 while ($self->{post_alloc_hook}) {
2944 $_->()
2945 for values %{delete $self->{post_alloc_hook}};
2293 } 2946 }
2294 2947
2295 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2948 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297 glClear GL_COLOR_BUFFER_BIT; 2950 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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