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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines