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

Diff Legend

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