ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.157 by root, Sun Apr 23 21:47:32 2006 UTC vs.
Revision 1.196 by root, Fri May 12 00:16:34 2006 UTC

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

Diff Legend

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