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

Diff Legend

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