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.151 by root, Sun Apr 23 00:57:39 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;
24
25 my $tip = $widget->{tooltip};
26
27 $tip = $tip->($widget) if CODE:: eq ref $tip;
28
23 $TOOLTIP->set_text ($widget->{tooltip}); 29 $TOOLTIP->set_markup ($widget->{tooltip});
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 30
25 $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);
26 } 40 }
27 41
28 return; 42 return;
29 } 43 }
30 } 44 }
… …
34 delete $TOOLTIP->{owner}; 48 delete $TOOLTIP->{owner};
35} 49}
36 50
37# class methods for events 51# class methods for events
38sub feed_sdl_key_down_event { 52sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
54 if $FOCUS;
40} 55}
41 56
42sub feed_sdl_key_up_event { 57sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
59 if $FOCUS;
44} 60}
45 61
46sub feed_sdl_button_down_event { 62sub feed_sdl_button_down_event {
47 my ($ev) = @_; 63 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 64 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 72 check_tooltip;
57 } 73 }
58 74
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 75 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 76
61 $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 }
62} 81}
63 82
64sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
67 86
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 88
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 90
72 $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 }
73 95
74 if (!$BUTTON_STATE) { 96 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 97 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 98 $grab->update if $grab;
77 $GRAB->update if $GRAB; 99 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 115 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 116
95 check_tooltip; 117 check_tooltip;
96 } 118 }
97 119
98 $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 }
99} 124}
100 125
101# convert position array to integers 126# convert position array to integers
102sub harmonize { 127sub harmonize {
103 my ($vals) = @_; 128 my ($vals) = @_;
… …
121 146
122sub new { 147sub new {
123 my $class = shift; 148 my $class = shift;
124 149
125 my $self = bless { 150 my $self = bless {
126 x => 0, 151 x => 0,
127 y => 0, 152 y => 0,
128 z => 0, 153 z => 0,
129 can_events => 1, 154 can_events => 1,
130 @_ 155 @_
131 }, $class; 156 }, $class;
132 157
133 for (keys %$self) { 158 for (keys %$self) {
… …
137 } 162 }
138 163
139 $self 164 $self
140} 165}
141 166
167sub destroy {
168 my ($self) = @_;
169
170 $self->hide;
171 %$self = ();
172}
173
142sub show { 174sub show {
143 my ($self) = @_; 175 my ($self) = @_;
144 176
145 return if $self->{parent}; 177 return if $self->{parent};
146 178
… …
148} 180}
149 181
150sub hide { 182sub hide {
151 my ($self) = @_; 183 my ($self) = @_;
152 184
153 return unless $self->{parent}; 185 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self;
154 187
155 $self->{parent}->remove ($self); 188 $self->{parent}->remove ($self)
189 if $self->{parent};
156} 190}
157 191
158sub move { 192sub move {
159 my ($self, $x, $y, $z) = @_; 193 my ($self, $x, $y, $z) = @_;
160 194
… …
163 $self->{z} = $z if defined $z; 197 $self->{z} = $z if defined $z;
164 198
165 $self->update; 199 $self->update;
166} 200}
167 201
168sub needs_redraw { 202sub set_size {
169 0 203 my ($self, $w, $h) = @_;
204
205 $self->{user_w} = $w;
206 $self->{user_h} = $h;
207
208 $self->check_size;
170} 209}
171 210
172sub size_request { 211sub size_request {
173 require Carp; 212 require Carp;
174 Carp::confess "size_request is abstract"; 213 Carp::confess "size_request is abstract";
… …
194 $self->{y} = $y; 233 $self->{y} = $y;
195 $self->update; 234 $self->update;
196 } 235 }
197 236
198 if ($self->{w} != $w || $self->{h} != $h) { 237 if ($self->{w} != $w || $self->{h} != $h) {
199 $self->{w} = $w; 238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
200 $self->{h} = $h;
201
202 $self->size_allocate ($w, $h);
203 $self->update;
204 } 239 }
205} 240}
206 241
207sub size_allocate { 242sub size_allocate {
208 # nothing to be done 243 # nothing to be done
209} 244}
210 245
211# return top left coordinates 246sub children {
212sub _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 {
213 my ($self, $x, $y) = @_; 262 my ($self, $w, $h) = @_;
214 263
215 $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;
216} 266}
217 267
218# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
219sub coord2local { 269sub coord2local {
220 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
221 271
222 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
223 ($x - $X, $y - $Y)
224} 273}
225 274
226# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
227sub coord2global { 276sub coord2global {
228 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
229 278
230 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
231 ($x + $X, $y + $Y)
232} 280}
233 281
234sub focus_in { 282sub focus_in {
235 my ($self) = @_; 283 my ($self) = @_;
236 284
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
298 glEnd; 346 glEnd;
299 glDisable GL_BLEND; 347 glDisable GL_BLEND;
300 } 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 }
301} 363}
302 364
303sub _draw { 365sub _draw {
304 my ($self) = @_; 366 my ($self) = @_;
305 367
… …
320 382
321sub set_parent { 383sub set_parent {
322 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
323 385
324 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
325} 390}
326 391
327sub check_size { 392sub check_size {
328 my ($self) = @_; 393 my ($self) = @_;
329 394
330 return unless $self->{parent}; 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
331
332 my ($w, $h) = $self->size_request;
333
334 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w;
336 $self->{req_h} = $h;
337
338 $self->{parent}->check_size;
339 }
340} 396}
341 397
342sub update { 398sub update {
343 my ($self) = @_; 399 my ($self) = @_;
344 400
… …
353} 409}
354 410
355sub emit { 411sub emit {
356 my ($self, $signal, @args) = @_; 412 my ($self, $signal, @args) = @_;
357 413
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 415}
362 416
363sub DESTROY { 417sub DESTROY {
364 my ($self) = @_; 418 my ($self) = @_;
365 419
… …
432sub new { 486sub new {
433 my ($class, %arg) = @_; 487 my ($class, %arg) = @_;
434 488
435 my $children = delete $arg{children} || []; 489 my $children = delete $arg{children} || [];
436 490
437 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 );
438 $self->add ($_) for @$children; 496 $self->add ($_) for @$children;
439 497
440 $self 498 $self
441} 499}
442 500
443sub add { 501sub add {
444 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
445 503
446 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
447 506
448 use sort 'stable'; 507 use sort 'stable';
449 508
450 $self->{children} = [ 509 $self->{children} = [
451 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
453 ]; 512 ];
454 513
455 $child->check_size; 514 $self->check_size;
515 $self->update;
516}
517
518sub children {
519 @{ $_[0]{children} }
456} 520}
457 521
458sub remove { 522sub remove {
459 my ($self, $child) = @_; 523 my ($self, $child) = @_;
460 524
461 delete $child->{parent}; 525 delete $child->{parent};
526 $child->hide;
462 527
463 $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 }
464 544
465 $self->check_size; 545 $self->check_size;
466 $self->update; 546 $self->update;
467} 547}
468 548
… …
546} 626}
547 627
548sub update { 628sub update {
549 my ($self) = @_; 629 my ($self) = @_;
550 630
551 # we want to do this delayed... 631 $ROOT->on_refresh ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 632 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 633}
565 634
566sub size_allocate { 635sub size_allocate {
567 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
568 637
569 $self->child->configure (0, 0, $w, $h); 638 $self->SUPER::size_allocate ($w, $h);
639 $self->update;
640}
570 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
571 $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 };
572} 662}
573 663
574sub _draw { 664sub _draw {
575 my ($self) = @_; 665 my ($self) = @_;
576 666
577 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
578 668
579 my $tex = $self->{texture} 669 my $tex = $self->{texture}
580 or return; 670 or return;
581 671
582 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
585 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;
586 675
587 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
588 677
589 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
591} 679}
592 680
593############################################################################# 681#############################################################################
594 682
595package CFClient::UI::ViewPort; 683package CFClient::UI::ViewPort;
596 684
597our @ISA = CFClient::UI::Window::; 685our @ISA = CFClient::UI::Window::;
598 686
599sub new { die }
600
601sub size_request { 687sub size_request {
602 my ($self) = @_; 688 my ($self) = @_;
603 689
604 @$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)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
606 692
607 @$self{qw(child_w child_h)} 693 @$self{qw(child_w child_h)}
608} 694}
609 695
610sub _draw { 696sub size_allocate {
611 my ($self) = @_; 697 my ($self, $w, $h) = @_;
612 698
613 $self->{children}[1]->draw; 699 $self->update;
614} 700}
615 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
616 781
617############################################################################# 782#############################################################################
618 783
619package CFClient::UI::Frame; 784package CFClient::UI::Frame;
620 785
… …
631 border => 0.8, 796 border => 0.8,
632 @_ 797 @_
633 ); 798 );
634 799
635 $self 800 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643}
644
645sub size_request {
646 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h})
648}
649
650sub size_allocate {
651 my ($self, $w, $h) = @_;
652 $self->{w} = $w;
653 $self->{h} = $h;
654 $self->child->configure (0, 0, $w, $h);
655} 801}
656 802
657sub _draw { 803sub _draw {
658 my ($self) = @_; 804 my ($self) = @_;
659 805
… …
694 my $class = shift; 840 my $class = shift;
695 841
696 # TODO: user_x, user_y, overwrite moveto? 842 # TODO: user_x, user_y, overwrite moveto?
697 843
698 my $self = $class->SUPER::new ( 844 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 845 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
701 border => 0.8, 847 border => 0.6,
702 can_events => 1, 848 can_events => 1,
703 @_ 849 @_
704 ); 850 );
705 851
706 $self->{title} &&= new CFClient::UI::Label 852 $self->{title} &&= new CFClient::UI::Label
707 align => 0, 853 align => 0,
708 valign => 1, 854 valign => 1,
709 text => $self->{title}, 855 text => $self->{title},
710 fontsize => 1; 856 fontsize => $self->{border};
711 857
712 $self 858 $self
713} 859}
714 860
715sub border { 861sub border {
716 int $_[0]{border} * $::FONTSIZE 862 int $_[0]{border} * $::FONTSIZE
717} 863}
718 864
719sub size_request { 865sub size_request {
720 my ($self) = @_; 866 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723 867
724 my ($w, $h) = $self->SUPER::size_request; 868 my ($w, $h) = $self->SUPER::size_request;
725 869
726 ( 870 (
727 $w + $self->border * 2, 871 $w + $self->border * 2,
… …
742} 886}
743 887
744sub button_down { 888sub button_down {
745 my ($self, $ev, $x, $y) = @_; 889 my ($self, $ev, $x, $y) = @_;
746 890
891 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 892 my $border = $self->border;
748 893
749 if ($x < $self->{w} && $x >= $self->{w} - $border 894 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 895 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 896
897 if ($lr & $td) {
898 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 899 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 900 my ($bw, $bh) = ($self->{w}, $self->{h});
754 901
902 my $mx = $x < $border;
903 my $my = $y < $border;
904
755 $self->{motion} = sub { 905 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 906 my ($ev, $x, $y) = @_;
757 907
758 ($x, $y) = ($ev->{x}, $ev->{y}); 908 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy;
759 910
760 $self->{user_w} = $bw + $x - $ox; 911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
761 $self->{user_h} = $bh + $y - $oy; 912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
762 $self->check_size; 914 $self->check_size;
763 }; 915 };
764 916
765 } elsif ($x >= 0 && $x < $self->{w} 917 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 919 my ($bx, $by) = ($self->{x}, $self->{y});
770 920
771 $self->{motion} = sub { 921 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 922 my ($ev, $x, $y) = @_;
… …
808 $tex[1]->draw_quad (0, 0, $w, $border); 958 $tex[1]->draw_quad (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 959 $tex[3]->draw_quad (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 961 $tex[4]->draw_quad (0, $h - $border, $w, $border);
812 962
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813 my $bg = $tex[0]; 964 my $bg = $tex[0];
814 965
815 # TODO: repeat texture not scale 966 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 967 my $rep_x = $cw / $bg->{w};
817 my $rep_y = $ch / $bg->{h}; 968 my $rep_y = $ch / $bg->{h};
818 969
819 glColor @{ $self->{bg} }; 970 glColor @{ $self->{bg} };
820 971
821 $bg->{s} = $rep_x; 972 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y; 973 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1; 974 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 975 $bg->draw_quad ($border, $border, $cw, $ch);
825 976
826 glDisable GL_TEXTURE_2D; 977 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND; 978 glDisable GL_BLEND;
979 }
828 980
829 $self->{title}->draw if $self->{title}; 981 $self->{title}->draw if $self->{title};
982
830 $self->child->draw; 983 $self->child->draw;
831} 984}
832 985
833############################################################################# 986#############################################################################
834 987
… …
856 $self->{children}[$y][$x] = $child; 1009 $self->{children}[$y][$x] = $child;
857 1010
858 $child->check_size; 1011 $child->check_size;
859} 1012}
860 1013
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
861# 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?
862sub clear { 1019sub clear {
863 my ($self) = @_; 1020 my ($self) = @_;
864 1021
1022 my @children = $self->children;
865 delete $self->{children}; 1023 delete $self->{children};
1024
1025 for (@children) {
1026 delete $_->{parent};
1027 $_->hide;
1028 }
1029
866 $self->update; 1030 $self->update;
867} 1031}
868 1032
869sub get_wh { 1033sub get_wh {
870 my ($self) = @_; 1034 my ($self) = @_;
… …
1047} 1211}
1048 1212
1049sub size_allocate { 1213sub size_allocate {
1050 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1051 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1052 my $children = $self->{children}; 1218 my $children = $self->{children};
1053 1219
1054 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1055 1221
1056 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1093 1259
1094sub new { 1260sub new {
1095 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1096 1262
1097 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1098 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),
1099 fontsize => 1, 1269 fontsize => 1,
1100 text => "",
1101 align => -1, 1270 align => -1,
1102 valign => -1, 1271 valign => -1,
1103 padding => 2, 1272 padding => 2,
1104 layout => new CFClient::Layout,
1105 can_events => 0, 1273 can_events => 0,
1106 %arg 1274 %arg
1107 ); 1275 );
1108 1276
1109 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout; 1280 $self->{template} = $layout;
1113 } 1281 }
1114 1282
1115 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1116 $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 }
1117 1288
1118 $self 1289 $self
1119} 1290}
1120 1291
1121sub escape_text { 1292sub escape {
1122 local $_ = $_[1]; 1293 local $_ = $_[1];
1123 1294
1124 s/&/&amp;/g; 1295 s/&/&amp;/g;
1125 s/>/&gt;/g; 1296 s/>/&gt;/g;
1126 s/</&lt;/g; 1297 s/</&lt;/g;
1127 1298
1128 $_[1] 1299 $_[1]
1129} 1300}
1130 1301
1302sub update {
1303 my ($self) = @_;
1304
1305 delete $self->{texture};
1306 $self->SUPER::update;
1307}
1308
1131sub set_text { 1309sub set_text {
1132 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1133 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;
1134 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1135 1317
1136 delete $self->{texture}; 1318 $self->update;
1137 $self->check_size; 1319 $self->check_size;
1138 $self->update;
1139} 1320}
1140 1321
1141sub set_markup { 1322sub set_markup {
1142 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1143 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;
1144 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1145 1332
1146 delete $self->{texture}; 1333 $self->update;
1147 $self->check_size; 1334 $self->check_size;
1148 $self->update;
1149} 1335}
1150 1336
1151sub size_request { 1337sub size_request {
1152 my ($self) = @_; 1338 my ($self) = @_;
1153 1339
1154 $self->{layout}->set_width; 1340 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1);
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1343
1157 my ($w, $h) = $self->{layout}->size; 1344 my ($w, $h) = $self->{layout}->size;
1158 1345
1159 if (exists $self->{template}) { 1346 if (exists $self->{template}) {
1347 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1348 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1349
1162 my ($w2, $h2) = $self->{template}->size; 1350 my ($w2, $h2) = $self->{template}->size;
1163 1351
1164 $w = List::Util::max $w, $w2; 1352 $w = List::Util::max $w, $w2;
… …
1179 1367
1180sub set_fontsize { 1368sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1369 my ($self, $fontsize) = @_;
1182 1370
1183 $self->{fontsize} = $fontsize; 1371 $self->{fontsize} = $fontsize;
1372 delete $self->{texture};
1373
1374 $self->update;
1184 $self->check_size; 1375 $self->check_size;
1185} 1376}
1186 1377
1187sub _draw { 1378sub _draw {
1188 my ($self) = @_; 1379 my ($self) = @_;
1189 1380
1190 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};
1191 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1192 $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
1193 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
1194 }; 1398 };
1195 1399
1196 glEnable GL_BLEND;
1197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1198 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1199 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1200 1402
1403 if ($tex->{format} == GL_ALPHA) {
1201 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1202
1203 $self->{ox} = int (
1204 $self->{align} < 0 ? $self->{padding}
1205 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1206 : ($self->{w} - $tex->{w}) * 0.5
1207 );
1208
1209 $self->{oy} = int (
1210 $self->{valign} < 0 ? $self->{padding}
1211 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1212 : ($self->{h} - $tex->{h}) * 0.5
1213 );
1214
1215 $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 }
1216 1409
1217 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1218 glDisable GL_BLEND;
1219} 1411}
1220 1412
1221############################################################################# 1413#############################################################################
1222 1414
1223package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1228 1420
1229sub new { 1421sub new {
1230 my $class = shift; 1422 my $class = shift;
1231 1423
1232 $class->SUPER::new ( 1424 $class->SUPER::new (
1233 fg => [1, 1, 1], 1425 fg => [1, 1, 1],
1234 bg => [0, 0, 0, 0.2], 1426 bg => [0, 0, 0, 0.2],
1235 active_bg => [1, 1, 1, 0.5], 1427 active_bg => [1, 1, 1, 0.5],
1236 active_fg => [0, 0, 0], 1428 active_fg => [0, 0, 0],
1237 can_hover => 1, 1429 can_hover => 1,
1238 can_focus => 1, 1430 can_focus => 1,
1239 valign => 0, 1431 valign => 0,
1240 can_events => 1, 1432 can_events => 1,
1241 @_ 1433 @_
1242 ) 1434 )
1243} 1435}
1244 1436
… …
1258 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1259 1451
1260 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1261} 1453}
1262 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
1263sub get_text { 1464sub get_text {
1264 $_[0]{text} 1465 $_[0]{text}
1265} 1466}
1266 1467
1267sub size_request { 1468sub size_request {
… …
1274 1475
1275sub size_allocate { 1476sub size_allocate {
1276 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1277 1478
1278 $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
1279}
1280
1281sub set_text {
1282 my ($self, $text) = @_;
1283
1284 $self->{cursor} = length $text;
1285 $self->_set_text ($text);
1286 $self->update;
1287} 1480}
1288 1481
1289sub key_down { 1482sub key_down {
1290 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1291 1484
… …
1398 my ($self, $ev) = @_; 1591 my ($self, $ev) = @_;
1399 1592
1400 my $sym = $ev->{sym}; 1593 my $sym = $ev->{sym};
1401 1594
1402 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} = '';
1403 $self->emit (activate => $self->get_text); 1600 $self->emit (activate => $txt);
1404 $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 }
1405 1624
1406 } else { 1625 } else {
1407 $self->SUPER::key_down ($ev); 1626 $self->SUPER::key_down ($ev);
1408 } 1627 }
1409 1628
… …
1423 1642
1424sub new { 1643sub new {
1425 my $class = shift; 1644 my $class = shift;
1426 1645
1427 $class->SUPER::new ( 1646 $class->SUPER::new (
1428 padding => 4, 1647 padding => 4,
1429 fg => [1, 1, 1], 1648 fg => [1, 1, 1],
1430 bg => [1, 1, 1, 0.2], 1649 bg => [1, 1, 1, 0.2],
1431 active_fg => [0, 0, 1], 1650 active_fg => [0, 0, 1],
1432 can_hover => 1, 1651 can_hover => 1,
1433 align => 0, 1652 align => 0,
1434 valign => 0, 1653 valign => 0,
1435 can_events => 1, 1654 can_events => 1,
1436 @_ 1655 @_
1437 ) 1656 )
1438} 1657}
1439 1658
… …
1598 1817
1599package CFClient::UI::VGauge; 1818package CFClient::UI::VGauge;
1600 1819
1601our @ISA = CFClient::UI::Base::; 1820our @ISA = CFClient::UI::Base::;
1602 1821
1822use List::Util qw(min max);
1823
1603use CFClient::OpenGL; 1824use CFClient::OpenGL;
1604 1825
1605my %tex = ( 1826my %tex = (
1606 food => [ 1827 food => [
1607 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1828 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1608 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1829 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1609 ], 1830 ],
1610 grace => [ 1831 grace => [
1611 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1832 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1612 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/
1613 ], 1834 ],
1614 hp => [ 1835 hp => [
1615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1616 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1837 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1617 ], 1838 ],
1618 mana => [ 1839 mana => [
1619 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1840 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1620 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/
1621 ], 1842 ],
1622); 1843);
1623 1844
1624# eg. VGauge->new (gauge => 'food'), default gauge: food 1845# eg. VGauge->new (gauge => 'food'), default gauge: food
1625sub new { 1846sub new {
… …
1644} 1865}
1645 1866
1646sub set_max { 1867sub set_max {
1647 my ($self, $max) = @_; 1868 my ($self, $max) = @_;
1648 1869
1870 return if $self->{max_val} == $max;
1871
1649 $self->{max_val} = $max; 1872 $self->{max_val} = $max;
1873 $self->update;
1650} 1874}
1651 1875
1652sub set_value { 1876sub set_value {
1653 my ($self, $val, $max) = @_; 1877 my ($self, $val, $max) = @_;
1654 1878
1655 $self->set_max ($max) 1879 $self->set_max ($max)
1656 if defined $max; 1880 if defined $max;
1657 1881
1658 $max = $self->{max_val}; 1882 return if $self->{val} == $val;
1883
1659 $self->{val} = $val; 1884 $self->{val} = $val;
1660
1661 $self->update; 1885 $self->update;
1662} 1886}
1663 1887
1664sub _draw { 1888sub _draw {
1665 my ($self) = @_; 1889 my ($self) = @_;
1666 1890
1667 my $tex = $tex{$self->{type}}; 1891 my $tex = $tex{$self->{type}};
1892 my ($t1, $t2, $t3) = @$tex;
1668 1893
1669 my ($w, $h) = ($self->{w}, $self->{h}); 1894 my ($w, $h) = ($self->{w}, $self->{h});
1670 1895
1671 if ($self->{vertical}) { 1896 if ($self->{vertical}) {
1672 glRotate 90, 0, 0, 1; 1897 glRotate 90, 0, 0, 1;
… …
1674 1899
1675 ($w, $h) = ($h, $w); 1900 ($w, $h) = ($h, $w);
1676 } 1901 }
1677 1902
1678 my $ycut = $self->{val} / ($self->{max_val} || 1); 1903 my $ycut = $self->{val} / ($self->{max_val} || 1);
1679 $ycut = 1 if $self->{val} > $self->{max_val};
1680 1904
1681 my $t1 = $tex->[0]; 1905 my $ycut1 = max 0, min 1, $ycut;
1682 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);
1683 1910
1684 glEnable GL_BLEND; 1911 glEnable GL_BLEND;
1685 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1912 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1686 glEnable GL_TEXTURE_2D; 1913 glEnable GL_TEXTURE_2D;
1687 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1914 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1688 1915
1689 my $h1 = $self->{h} - $ycut * $self->{h};
1690 my $h2 = $ycut * $self->{h};
1691
1692 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1916 glBindTexture GL_TEXTURE_2D, $t1->{name};
1693 glBegin GL_QUADS; 1917 glBegin GL_QUADS;
1694 glTexCoord 0 , 0; glVertex 0 , 0; 1918 glTexCoord 0 , 0; glVertex 0 , 0;
1695 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1919 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1696 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1920 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1697 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1921 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1698 glEnd; 1922 glEnd;
1699 1923
1924 my $ycut1 = List::Util::min 1, $ycut;
1700 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1925 glBindTexture GL_TEXTURE_2D, $t2->{name};
1701 glBegin GL_QUADS; 1926 glBegin GL_QUADS;
1702 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1927 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1928 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1704 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1929 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1705 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1930 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1706 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 }
1707 1942
1708 glDisable GL_BLEND; 1943 glDisable GL_BLEND;
1709 glDisable GL_TEXTURE_2D; 1944 glDisable GL_TEXTURE_2D;
1710} 1945}
1711 1946
… …
1717 1952
1718sub new { 1953sub new {
1719 my ($class, %arg) = @_; 1954 my ($class, %arg) = @_;
1720 1955
1721 my $self = $class->SUPER::new ( 1956 my $self = $class->SUPER::new (
1722 tooltip => $arg{type}, 1957 tooltip => $arg{type},
1958 can_hover => 1,
1959 can_events => 1,
1723 %arg, 1960 %arg,
1724 ); 1961 );
1725 1962
1726 $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");
1727 $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);
1728 $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");
1729 1966
1730 $self 1967 $self
1731} 1968}
1732 1969
… …
1735 1972
1736 $self->{value}->set_fontsize ($fsize); 1973 $self->{value}->set_fontsize ($fsize);
1737 $self->{max} ->set_fontsize ($fsize); 1974 $self->{max} ->set_fontsize ($fsize);
1738} 1975}
1739 1976
1977sub set_max {
1978 my ($self, $max) = @_;
1979
1980 $self->{gauge}->set_max ($max);
1981 $self->{max}->set_text ($max);
1982}
1983
1740sub set_value { 1984sub set_value {
1741 my ($self, $val, $max) = @_; 1985 my ($self, $val, $max) = @_;
1742 1986
1743 $self->set_max ($max) 1987 $self->set_max ($max)
1744 if defined $max; 1988 if defined $max;
1745 1989
1746 $self->{gauge}->set_value ($val, $max); 1990 $self->{gauge}->set_value ($val, $max);
1747 $self->{value}->set_text ($val); 1991 $self->{value}->set_text ($val);
1748}
1749
1750sub set_max {
1751 my ($self, $max) = @_;
1752
1753 $self->{gauge}->set_max ($max);
1754 $self->{max}->set_text ($max);
1755} 1992}
1756 1993
1757############################################################################# 1994#############################################################################
1758 1995
1759package CFClient::UI::Slider; 1996package CFClient::UI::Slider;
… …
1778 # TODO: calculations are off 2015 # TODO: calculations are off
1779 my $self = $class->SUPER::new ( 2016 my $self = $class->SUPER::new (
1780 fg => [1, 1, 1], 2017 fg => [1, 1, 1],
1781 active_fg => [0, 0, 0], 2018 active_fg => [0, 0, 0],
1782 range => [0, 0, 100, 10], 2019 range => [0, 0, 100, 10],
1783 req_w => 20, 2020 req_w => $::WIDTH / 80,
1784 req_h => 20, 2021 req_h => $::WIDTH / 80,
1785 vertical => 0, 2022 vertical => 0,
1786 can_hover => 1, 2023 can_hover => 1,
1787 inner_pad => 5, 2024 inner_pad => 5,
1788 @_ 2025 @_
1789 ); 2026 );
… …
1899 2136
1900sub new { 2137sub new {
1901 my $class = shift; 2138 my $class = shift;
1902 2139
1903 my $self = $class->SUPER::new ( 2140 my $self = $class->SUPER::new (
1904 fontsize => 1, 2141 fontsize => 1,
2142 can_events => 0,
2143 #font => default_font
1905 @_, 2144 @_,
1906 2145
1907 layout => (new CFClient::Layout), 2146 layout => (new CFClient::Layout),
1908 par => [], 2147 par => [],
1909 height => 0, 2148 height => 0,
1910 children => [ 2149 children => [
1911 (new CFClient::UI::Empty expand => 1), 2150 (new CFClient::UI::Empty expand => 1),
1912 (new CFClient::UI::Slider vertical => 1), 2151 (new CFClient::UI::Slider vertical => 1),
1913 ], 2152 ],
1914 ); 2153 );
1915 2154
1916 $self->{children}[1]->connect (changed => sub { 2155 $self->{children}[1]->connect (changed => sub { $self->update });
1917 $self->update;
1918 });
1919 2156
1920 $self 2157 $self
1921} 2158}
1922 2159
1923sub set_fontsize { 2160sub set_fontsize {
… …
1931 my ($self, $text) = @_; 2168 my ($self, $text) = @_;
1932 2169
1933 my $layout = $self->{layout}; 2170 my $layout = $self->{layout};
1934 2171
1935 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1936 $layout->set_width ($self->{w}); 2173 $layout->set_width ($self->{children}[0]{w});
1937 $layout->set_text ($text); 2174 $layout->set_text ($text);
1938 2175
1939 ($layout->size)[1] 2176 ($layout->size)[1]
1940} 2177}
1941 2178
… …
1949sub size_allocate { 2186sub size_allocate {
1950 my ($self, $w, $h) = @_; 2187 my ($self, $w, $h) = @_;
1951 2188
1952 $self->SUPER::size_allocate ($w, $h); 2189 $self->SUPER::size_allocate ($w, $h);
1953 2190
2191 $self->{layout}->set_font ($self->{font}) if $self->{font};
1954 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2192 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $self->{layout}->set_width ($self->{children}[0]{w}); 2193 $self->{layout}->set_width ($self->{children}[0]{w});
1956 2194
1957 $self->reflow; 2195 $self->reflow;
1958} 2196}
… …
1993 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2231 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1994 2232
1995 delete $self->{texture}; 2233 delete $self->{texture};
1996 } 2234 }
1997 2235
1998 $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 {
1999 glClearColor 0, 0, 0, 1; 2237 glClearColor 0, 0, 0, 0;
2000 glClear GL_COLOR_BUFFER_BIT; 2238 glClear GL_COLOR_BUFFER_BIT;
2001 2239
2002 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
2003 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2004 glEnable GL_TEXTURE_2D; 2242 glEnable GL_TEXTURE_2D;
… …
2011 2249
2012 my $y = 0; 2250 my $y = 0;
2013 2251
2014 my $layout = $self->{layout}; 2252 my $layout = $self->{layout};
2015 2253
2254 $layout->set_font ($self->{font}) if $self->{font};
2255
2016 for my $par (@{$self->{par}}) { 2256 for my $par (@{$self->{par}}) {
2017 my $h = $par->[0]; 2257 my $h = $par->[0];
2018 2258
2019 if ($y0 < $y + $h && $y < $y1) { 2259 if ($y0 < $y + $h && $y < $y1) {
2020 $layout->set_text ($par->[2]); 2260 $layout->set_text ($par->[2]);
… …
2034} 2274}
2035 2275
2036sub _draw { 2276sub _draw {
2037 my ($self) = @_; 2277 my ($self) = @_;
2038 2278
2039 if ($self->{texture}) { 2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2040 glEnable GL_TEXTURE_2D; 2281 glEnable GL_TEXTURE_2D;
2041 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;
2042 $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});
2043 glDisable GL_TEXTURE_2D; 2285 glDisable GL_TEXTURE_2D;
2044 } 2286 glDisable GL_BLEND;
2045 2287
2046 $self->{children}[1]->draw; 2288 $self->{children}[1]->draw;
2047 2289
2048} 2290}
2049 2291
… …
2097 2339
2098sub new { 2340sub new {
2099 my $class = shift; 2341 my $class = shift;
2100 2342
2101 my $self = $class->SUPER::new ( 2343 my $self = $class->SUPER::new (
2102 state => 0, 2344 state => 0,
2103 connect_activate => \&toggle_flopper, 2345 connect_activate => \&toggle_flopper,
2104 can_events => 1,
2105 @_ 2346 @_
2106 ); 2347 );
2107 2348
2108 if ($self->{state}) { 2349 if ($self->{state}) {
2109 $self->{state} = 0; 2350 $self->{state} = 0;
… …
2129 $self->emit (changed => $self->{state}); 2370 $self->emit (changed => $self->{state});
2130} 2371}
2131 2372
2132############################################################################# 2373#############################################################################
2133 2374
2375package CFClient::UI::Tooltip;
2376
2377our @ISA = CFClient::UI::Bin::;
2378
2379use CFClient::OpenGL;
2380
2381sub new {
2382 my $class = shift;
2383
2384 $class->SUPER::new (
2385 @_,
2386 can_events => 0,
2387 )
2388}
2389
2390sub set_markup {
2391 my ($self, $text) = @_;
2392
2393 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2394 $self->{label}->set_markup ($text);
2395 $self->add ($self->{label});
2396}
2397
2398sub size_request {
2399 my ($self) = @_;
2400
2401 $self->child->set_max_size ($::WIDTH * 0.3);
2402
2403 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404
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);
2412}
2413
2414sub _draw {
2415 my ($self) = @_;
2416
2417 glPushMatrix;
2418 glTranslate 0.375, 0.375;
2419
2420 my ($w, $h) = @$self{qw(w h)};
2421
2422 glColor 1, 0.8, 0.4;
2423 glBegin GL_QUADS;
2424 glVertex 0 , 0;
2425 glVertex 0 , $h;
2426 glVertex $w, $h;
2427 glVertex $w, 0;
2428 glEnd;
2429
2430 glColor 0, 0, 0;
2431 glBegin GL_LINE_LOOP;
2432 glVertex 0 , 0;
2433 glVertex 0 , $h;
2434 glVertex $w, $h;
2435 glVertex $w, 0;
2436 glEnd;
2437
2438 glPopMatrix;
2439
2440 glTranslate 2, 2;
2441 $self->SUPER::_draw;
2442}
2443
2444#############################################################################
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
2134package CFClient::UI::Root; 2732package CFClient::UI::Root;
2135 2733
2136our @ISA = CFClient::UI::Container::; 2734our @ISA = CFClient::UI::Container::;
2137 2735
2138use CFClient::OpenGL; 2736use CFClient::OpenGL;
2139 2737
2140sub check_size { 2738sub new {
2141 my ($self) = @_; 2739 my $class = shift;
2142 2740
2143 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2741 $class->SUPER::new (
2144} 2742 @_,
2145 2743 )
2146sub size_request {
2147 ($::WIDTH, $::HEIGHT)
2148} 2744}
2149 2745
2150sub configure { 2746sub configure {
2151 my ($self, $x, $y, $w, $h) = @_; 2747 my ($self, $x, $y, $w, $h) = @_;
2152 2748
2153 $self->SUPER::configure ($x, $y, $w, $h); 2749 $self->{w} = $w;
2750 $self->{h} = $h;
2751}
2154 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
2155 for my $child (@{$self->{children}}) { 2785 for my $child ($self->children) {
2156 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)};
2157 2787
2158 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2788 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2159 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2160 $child->configure ($X, $Y, $W,$H); 2790 $child->configure ($X, $Y, $W, $H);
2161 } 2791 }
2162}
2163 2792
2164sub _topleft { 2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795}
2796
2797sub coord2local {
2165 my ($self, $x, $y) = @_; 2798 my ($self, $x, $y) = @_;
2166 2799
2167 ($x, $y) 2800 ($x, $y)
2168} 2801}
2169 2802
2803sub coord2global {
2804 my ($self, $x, $y) = @_;
2805
2806 ($x, $y)
2807}
2808
2170sub update { 2809sub update {
2171 my ($self) = @_; 2810 my ($self) = @_;
2172 2811
2173 $self->check_size; 2812 $self->check_size;
2174 ::refresh (); 2813 $::WANT_REFRESH++;
2175} 2814}
2176 2815
2177sub add { 2816sub add {
2178 my ($self, $child) = @_; 2817 my ($self, $child) = @_;
2179 2818
2180 # integerize window positions 2819 # integerise window positions
2181 $child->{x} = int $child->{x}; 2820 $child->{x} = int $child->{x};
2182 $child->{y} = int $child->{y}; 2821 $child->{y} = int $child->{y};
2183 2822
2184 $self->SUPER::add ($child); 2823 $self->SUPER::add ($child);
2185} 2824}
… …
2188 my ($self, $id, $cb) = @_; 2827 my ($self, $id, $cb) = @_;
2189 2828
2190 $self->{refresh_hook}{$id} = $cb; 2829 $self->{refresh_hook}{$id} = $cb;
2191} 2830}
2192 2831
2193sub draw { 2832sub draw {
2194 my ($self) = @_; 2833 my ($self) = @_;
2195 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
2196 while (my $rcb = delete $self->{refresh_hook}) { 2879 while ($self->{refresh_hook}) {
2197 $_->() for values %$rcb; 2880 $_->()
2881 for values %{delete $self->{refresh_hook}};
2198 } 2882 }
2199 2883
2200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2202 glClear GL_COLOR_BUFFER_BIT; 2886 glClear GL_COLOR_BUFFER_BIT;
… …
2213############################################################################# 2897#############################################################################
2214 2898
2215package CFClient::UI; 2899package CFClient::UI;
2216 2900
2217$ROOT = new CFClient::UI::Root; 2901$ROOT = new CFClient::UI::Root;
2218$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 2902$TOOLTIP = new CFClient::UI::Tooltip;
2219 2903
22201 29041
2221 2905

Diff Legend

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