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.153 by root, Sun Apr 23 02:14:33 2006 UTC vs.
Revision 1.195 by root, Thu May 11 23:54:31 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 $TOOLTIP->set_text ($widget->{tooltip}); 24
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 25 my $tip = $widget->{tooltip};
26
27 $tip = $tip->($widget) if CODE:: eq ref $tip;
28
29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font});
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;
… …
1180sub set_fontsize { 1368sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1369 my ($self, $fontsize) = @_;
1182 1370
1183 $self->{fontsize} = $fontsize; 1371 $self->{fontsize} = $fontsize;
1184 delete $self->{texture}; 1372 delete $self->{texture};
1373
1374 $self->update;
1185 $self->check_size; 1375 $self->check_size;
1186 $self->update;
1187} 1376}
1188 1377
1189sub _draw { 1378sub _draw {
1190 my ($self) = @_; 1379 my ($self) = @_;
1191 1380
1192 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};
1193 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1194 $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
1195 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
1196 }; 1398 };
1197 1399
1198 glEnable GL_BLEND;
1199 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1200 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1202 1402
1403 if ($tex->{format} == GL_ALPHA) {
1203 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1204
1205 $self->{ox} = int (
1206 $self->{align} < 0 ? $self->{padding}
1207 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1208 : ($self->{w} - $tex->{w}) * 0.5
1209 );
1210
1211 $self->{oy} = int (
1212 $self->{valign} < 0 ? $self->{padding}
1213 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1214 : ($self->{h} - $tex->{h}) * 0.5
1215 );
1216
1217 $tex->draw_quad ($self->{ox}, $self->{oy}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1218 1409
1219 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1220 glDisable GL_BLEND;
1221} 1411}
1222 1412
1223############################################################################# 1413#############################################################################
1224 1414
1225package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1230 1420
1231sub new { 1421sub new {
1232 my $class = shift; 1422 my $class = shift;
1233 1423
1234 $class->SUPER::new ( 1424 $class->SUPER::new (
1235 fg => [1, 1, 1], 1425 fg => [1, 1, 1],
1236 bg => [0, 0, 0, 0.2], 1426 bg => [0, 0, 0, 0.2],
1237 active_bg => [1, 1, 1, 0.5], 1427 active_bg => [1, 1, 1, 0.5],
1238 active_fg => [0, 0, 0], 1428 active_fg => [0, 0, 0],
1239 can_hover => 1, 1429 can_hover => 1,
1240 can_focus => 1, 1430 can_focus => 1,
1241 valign => 0, 1431 valign => 0,
1242 can_events => 1, 1432 can_events => 1,
1243 @_ 1433 @_
1244 ) 1434 )
1245} 1435}
1246 1436
… …
1260 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1261 1451
1262 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1263} 1453}
1264 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
1265sub get_text { 1464sub get_text {
1266 $_[0]{text} 1465 $_[0]{text}
1267} 1466}
1268 1467
1269sub size_request { 1468sub size_request {
… …
1276 1475
1277sub size_allocate { 1476sub size_allocate {
1278 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1279 1478
1280 $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
1281}
1282
1283sub set_text {
1284 my ($self, $text) = @_;
1285
1286 $self->{cursor} = length $text;
1287 $self->_set_text ($text);
1288 $self->update;
1289} 1480}
1290 1481
1291sub key_down { 1482sub key_down {
1292 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1293 1484
… …
1400 my ($self, $ev) = @_; 1591 my ($self, $ev) = @_;
1401 1592
1402 my $sym = $ev->{sym}; 1593 my $sym = $ev->{sym};
1403 1594
1404 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} = '';
1405 $self->emit (activate => $self->get_text); 1600 $self->emit (activate => $txt);
1406 $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 }
1407 1624
1408 } else { 1625 } else {
1409 $self->SUPER::key_down ($ev); 1626 $self->SUPER::key_down ($ev);
1410 } 1627 }
1411 1628
… …
1425 1642
1426sub new { 1643sub new {
1427 my $class = shift; 1644 my $class = shift;
1428 1645
1429 $class->SUPER::new ( 1646 $class->SUPER::new (
1430 padding => 4, 1647 padding => 4,
1431 fg => [1, 1, 1], 1648 fg => [1, 1, 1],
1432 bg => [1, 1, 1, 0.2], 1649 bg => [1, 1, 1, 0.2],
1433 active_fg => [0, 0, 1], 1650 active_fg => [0, 0, 1],
1434 can_hover => 1, 1651 can_hover => 1,
1435 align => 0, 1652 align => 0,
1436 valign => 0, 1653 valign => 0,
1437 can_events => 1, 1654 can_events => 1,
1438 @_ 1655 @_
1439 ) 1656 )
1440} 1657}
1441 1658
… …
1455 1672
1456 if ($GRAB == $self) { 1673 if ($GRAB == $self) {
1457 $self->{fg} = $self->{active_fg}; 1674 $self->{fg} = $self->{active_fg};
1458 } 1675 }
1459 1676
1460 glEnable GL_BLEND;
1461 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1462 glEnable GL_TEXTURE_2D; 1677 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1678 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 glColor 0, 0, 0, 1; 1679 glColor 0, 0, 0, 1;
1465 1680
1466 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1681 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1467 1682
1468 glDisable GL_TEXTURE_2D; 1683 glDisable GL_TEXTURE_2D;
1469 glDisable GL_BLEND;
1470 1684
1471 $self->SUPER::_draw; 1685 $self->SUPER::_draw;
1472} 1686}
1473 1687
1474############################################################################# 1688#############################################################################
… …
1521 1735
1522 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1523 1737
1524 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1525 1739
1526 glEnable GL_BLEND;
1527 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1529 1741
1530 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1531 1743
1532 $tex->draw_quad (0, 0, $s, $s); 1744 $tex->draw_quad_alpha (0, 0, $s, $s);
1533 1745
1534 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1535 glDisable GL_BLEND;
1536} 1747}
1537 1748
1538############################################################################# 1749#############################################################################
1539 1750
1540package CFClient::UI::Image; 1751package CFClient::UI::Image;
… …
1583 glTranslate 0, -$self->{w}, 0; 1794 glTranslate 0, -$self->{w}, 0;
1584 1795
1585 ($w, $h) = ($h, $w); 1796 ($w, $h) = ($h, $w);
1586 } 1797 }
1587 1798
1588 glEnable GL_BLEND;
1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590 glEnable GL_TEXTURE_2D; 1799 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592 1801
1593 $tex->draw_quad (0, 0, $w, $h); 1802 $tex->draw_quad_alpha (0, 0, $w, $h);
1594 1803
1595 glDisable GL_BLEND;
1596 glDisable GL_TEXTURE_2D; 1804 glDisable GL_TEXTURE_2D;
1597} 1805}
1598 1806
1599############################################################################# 1807#############################################################################
1600 1808
1601package CFClient::UI::VGauge; 1809package CFClient::UI::VGauge;
1602 1810
1603our @ISA = CFClient::UI::Base::; 1811our @ISA = CFClient::UI::Base::;
1812
1813use List::Util qw(min max);
1604 1814
1605use CFClient::OpenGL; 1815use CFClient::OpenGL;
1606 1816
1607my %tex = ( 1817my %tex = (
1608 food => [ 1818 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1819 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1820 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1821 ],
1612 grace => [ 1822 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1824 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1615 ], 1825 ],
1616 hp => [ 1826 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1827 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1828 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 1829 ],
1620 mana => [ 1830 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1831 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1832 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1623 ], 1833 ],
1624); 1834);
1625 1835
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 1836# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 1837sub new {
… …
1646} 1856}
1647 1857
1648sub set_max { 1858sub set_max {
1649 my ($self, $max) = @_; 1859 my ($self, $max) = @_;
1650 1860
1861 return if $self->{max_val} == $max;
1862
1651 $self->{max_val} = $max; 1863 $self->{max_val} = $max;
1864 $self->update;
1652} 1865}
1653 1866
1654sub set_value { 1867sub set_value {
1655 my ($self, $val, $max) = @_; 1868 my ($self, $val, $max) = @_;
1656 1869
1657 $self->set_max ($max) 1870 $self->set_max ($max)
1658 if defined $max; 1871 if defined $max;
1659 1872
1660 $max = $self->{max_val}; 1873 return if $self->{val} == $val;
1874
1661 $self->{val} = $val; 1875 $self->{val} = $val;
1662
1663 $self->update; 1876 $self->update;
1664} 1877}
1665 1878
1666sub _draw { 1879sub _draw {
1667 my ($self) = @_; 1880 my ($self) = @_;
1668 1881
1669 my $tex = $tex{$self->{type}}; 1882 my $tex = $tex{$self->{type}};
1883 my ($t1, $t2, $t3) = @$tex;
1670 1884
1671 my ($w, $h) = ($self->{w}, $self->{h}); 1885 my ($w, $h) = ($self->{w}, $self->{h});
1672 1886
1673 if ($self->{vertical}) { 1887 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 1888 glRotate 90, 0, 0, 1;
… …
1676 1890
1677 ($w, $h) = ($h, $w); 1891 ($w, $h) = ($h, $w);
1678 } 1892 }
1679 1893
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 1894 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 1895
1683 my $t1 = $tex->[0]; 1896 my $ycut1 = max 0, min 1, $ycut;
1684 my $t2 = $tex->[1]; 1897 my $ycut2 = max 0, min 1, $ycut - 1;
1898
1899 my $h1 = $self->{h} * (1 - $ycut1);
1900 my $h2 = $self->{h} * (1 - $ycut2);
1685 1901
1686 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 1904 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1905 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 1906
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1907 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 1908 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 1909 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1910 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1911 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1912 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 1913 glEnd;
1701 1914
1915 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1916 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 1917 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1918 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1919 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1920 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1921 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 glEnd; 1922 glEnd;
1923
1924 if ($t3) {
1925 glBindTexture GL_TEXTURE_2D, $t3->{name};
1926 glBegin GL_QUADS;
1927 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1928 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1929 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1930 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1931 glEnd;
1932 }
1709 1933
1710 glDisable GL_BLEND; 1934 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 1935 glDisable GL_TEXTURE_2D;
1712} 1936}
1713 1937
… …
1719 1943
1720sub new { 1944sub new {
1721 my ($class, %arg) = @_; 1945 my ($class, %arg) = @_;
1722 1946
1723 my $self = $class->SUPER::new ( 1947 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 1948 tooltip => $arg{type},
1949 can_hover => 1,
1950 can_events => 1,
1725 %arg, 1951 %arg,
1726 ); 1952 );
1727 1953
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1954 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1729 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1955 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1730 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1956 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731 1957
1732 $self 1958 $self
1733} 1959}
1734 1960
… …
1737 1963
1738 $self->{value}->set_fontsize ($fsize); 1964 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize); 1965 $self->{max} ->set_fontsize ($fsize);
1740} 1966}
1741 1967
1968sub set_max {
1969 my ($self, $max) = @_;
1970
1971 $self->{gauge}->set_max ($max);
1972 $self->{max}->set_text ($max);
1973}
1974
1742sub set_value { 1975sub set_value {
1743 my ($self, $val, $max) = @_; 1976 my ($self, $val, $max) = @_;
1744 1977
1745 $self->set_max ($max) 1978 $self->set_max ($max)
1746 if defined $max; 1979 if defined $max;
1747 1980
1748 $self->{gauge}->set_value ($val, $max); 1981 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val); 1982 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757} 1983}
1758 1984
1759############################################################################# 1985#############################################################################
1760 1986
1761package CFClient::UI::Slider; 1987package CFClient::UI::Slider;
… …
1780 # TODO: calculations are off 2006 # TODO: calculations are off
1781 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1782 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1783 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1784 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1785 req_w => 20, 2011 req_w => $::WIDTH / 80,
1786 req_h => 20, 2012 req_h => $::WIDTH / 80,
1787 vertical => 0, 2013 vertical => 0,
1788 can_hover => 1, 2014 can_hover => 1,
1789 inner_pad => 5, 2015 inner_pad => 5,
1790 @_ 2016 @_
1791 ); 2017 );
… …
1874 $page ||= 2; 2100 $page ||= 2;
1875 2101
1876 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1877 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1878 2104
1879 glEnable GL_BLEND;
1880 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1881 glEnable GL_TEXTURE_2D; 2105 glEnable GL_TEXTURE_2D;
1882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1883 2107
1884 # draw background 2108 # draw background
1885 $tex[1]->draw_quad (0, 0, $w, $h); 2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1886 2110
1887 # draw handle 2111 # draw handle
1888 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1889 2113
1890 glDisable GL_BLEND;
1891 glDisable GL_TEXTURE_2D; 2114 glDisable GL_TEXTURE_2D;
1892} 2115}
1893 2116
1894############################################################################# 2117#############################################################################
1895 2118
… …
1901 2124
1902sub new { 2125sub new {
1903 my $class = shift; 2126 my $class = shift;
1904 2127
1905 my $self = $class->SUPER::new ( 2128 my $self = $class->SUPER::new (
1906 fontsize => 1, 2129 fontsize => 1,
2130 can_events => 0,
2131 #font => default_font
1907 @_, 2132 @_,
1908 2133
1909 layout => (new CFClient::Layout), 2134 layout => (new CFClient::Layout 1),
1910 par => [], 2135 par => [],
1911 height => 0, 2136 height => 0,
1912 children => [ 2137 children => [
1913 (new CFClient::UI::Empty expand => 1), 2138 (new CFClient::UI::Empty expand => 1),
1914 (new CFClient::UI::Slider vertical => 1), 2139 (new CFClient::UI::Slider vertical => 1),
1915 ], 2140 ],
1916 ); 2141 );
1917 2142
1918 $self->{children}[1]->connect (changed => sub { 2143 $self->{children}[1]->connect (changed => sub { $self->update });
1919 $self->update;
1920 });
1921 2144
1922 $self 2145 $self
1923} 2146}
1924 2147
1925sub set_fontsize { 2148sub set_fontsize {
… …
1933 my ($self, $text) = @_; 2156 my ($self, $text) = @_;
1934 2157
1935 my $layout = $self->{layout}; 2158 my $layout = $self->{layout};
1936 2159
1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1938 $layout->set_width ($self->{w}); 2161 $layout->set_width ($self->{children}[0]{w});
1939 $layout->set_text ($text); 2162 $layout->set_markup ($text);
1940 2163
1941 ($layout->size)[1] 2164 ($layout->size)[1]
1942} 2165}
1943 2166
1944sub reflow { 2167sub reflow {
… …
1951sub size_allocate { 2174sub size_allocate {
1952 my ($self, $w, $h) = @_; 2175 my ($self, $w, $h) = @_;
1953 2176
1954 $self->SUPER::size_allocate ($w, $h); 2177 $self->SUPER::size_allocate ($w, $h);
1955 2178
2179 $self->{layout}->set_font ($self->{font}) if $self->{font};
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2180 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1957 $self->{layout}->set_width ($self->{children}[0]{w}); 2181 $self->{layout}->set_width ($self->{children}[0]{w});
1958 2182
1959 $self->reflow; 2183 $self->reflow;
1960} 2184}
… …
1995 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1996 2220
1997 delete $self->{texture}; 2221 delete $self->{texture};
1998 } 2222 }
1999 2223
2000 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2001 glClearColor 0, 0, 0, 1; 2225 glClearColor 0, 0, 0, 0;
2002 glClear GL_COLOR_BUFFER_BIT; 2226 glClear GL_COLOR_BUFFER_BIT;
2003 2227
2004 glEnable GL_BLEND;
2005 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2006 glEnable GL_TEXTURE_2D; 2228 glEnable GL_TEXTURE_2D;
2007 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2008 2230
2009 my $top = int $self->{children}[1]{range}[0]; 2231 my $top = int $self->{children}[1]{range}[0];
2010 2232
… …
2013 2235
2014 my $y = 0; 2236 my $y = 0;
2015 2237
2016 my $layout = $self->{layout}; 2238 my $layout = $self->{layout};
2017 2239
2240 $layout->set_font ($self->{font}) if $self->{font};
2241
2018 for my $par (@{$self->{par}}) { 2242 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2243 my $h = $par->[0];
2020 2244
2021 if ($y0 < $y + $h && $y < $y1) { 2245 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] });
2022 $layout->set_text ($par->[2]); 2247 $layout->set_markup ($par->[2]);
2023 2248
2024 glColor @{ $par->[1] };
2025 my ($W, $H) = $layout->size; 2249 my ($W, $H) = $layout->size;
2026 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2027 } 2251 }
2028 2252
2029 $y += $h; 2253 $y += $h;
2030 } 2254 }
2031 2255
2032 glDisable GL_TEXTURE_2D; 2256 glDisable GL_TEXTURE_2D;
2033 glDisable GL_BLEND;
2034 }; 2257 };
2035 }); 2258 });
2036} 2259}
2037 2260
2038sub _draw { 2261sub _draw {
2039 my ($self) = @_; 2262 my ($self) = @_;
2040 2263
2041 if ($self->{texture}) {
2042 glEnable GL_TEXTURE_2D; 2264 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2044 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2266 glColor 1, 1, 1, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2045 glDisable GL_TEXTURE_2D; 2268 glDisable GL_TEXTURE_2D;
2046 }
2047 2269
2048 $self->{children}[1]->draw; 2270 $self->{children}[1]->draw;
2049 2271
2050} 2272}
2051 2273
… …
2099 2321
2100sub new { 2322sub new {
2101 my $class = shift; 2323 my $class = shift;
2102 2324
2103 my $self = $class->SUPER::new ( 2325 my $self = $class->SUPER::new (
2104 state => 0, 2326 state => 0,
2105 connect_activate => \&toggle_flopper, 2327 connect_activate => \&toggle_flopper,
2106 can_events => 1,
2107 @_ 2328 @_
2108 ); 2329 );
2109 2330
2110 if ($self->{state}) { 2331 if ($self->{state}) {
2111 $self->{state} = 0; 2332 $self->{state} = 0;
… …
2146 @_, 2367 @_,
2147 can_events => 0, 2368 can_events => 0,
2148 ) 2369 )
2149} 2370}
2150 2371
2151sub set_text { 2372sub set_markup {
2152 my ($self, $text) = @_; 2373 my ($self, $text, $font) = @_;
2153 2374
2154 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8; 2375 $self->{label} = new CFClient::UI::Label
2376 fontsize => 0.8,
2377 fg => [0, 0, 0],
2378 font => ($font || $::FONT_PROP);
2379
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2155 $self->{label}->set_text ($text); 2381 $self->{label}->set_markup ($text);
2156 $self->add ($self->{label}); 2382 $self->add ($self->{label});
2157} 2383}
2158 2384
2159sub size_request { 2385sub size_request {
2160 my ($self) = @_; 2386 my ($self) = @_;
2161 2387
2162 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2388 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2163 2389
2164 $w = List::Util::min $::WIDTH * 0.2, $w; 2390 ($w + 4, $h + 4)
2391}
2165 2392
2166 ($w, $h) 2393sub size_allocate {
2394 my ($self, $w, $h) = @_;
2395
2396 $self->SUPER::size_allocate ($w - 4, $h - 4);
2397}
2398
2399sub _draw {
2400 my ($self) = @_;
2401
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375;
2404
2405 my ($w, $h) = @$self{qw(w h)};
2406
2407 glColor 1, 0.8, 0.4;
2408 glBegin GL_QUADS;
2409 glVertex 0 , 0;
2410 glVertex 0 , $h;
2411 glVertex $w, $h;
2412 glVertex $w, 0;
2413 glEnd;
2414
2415 glColor 0, 0, 0;
2416 glBegin GL_LINE_LOOP;
2417 glVertex 0 , 0;
2418 glVertex 0 , $h;
2419 glVertex $w, $h;
2420 glVertex $w, 0;
2421 glEnd;
2422
2423 glPopMatrix;
2424
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw;
2427}
2428
2429#############################################################################
2430
2431package CFClient::UI::Face;
2432
2433our @ISA = CFClient::UI::Base::;
2434
2435use CFClient::OpenGL;
2436
2437sub new {
2438 my $class = shift;
2439
2440 $class->SUPER::new (
2441 aspect => 1,
2442 @_,
2443 )
2444}
2445
2446sub size_request {
2447 (32, 8)
2448}
2449
2450sub _draw {
2451 my ($self) = @_;
2452
2453 return unless $::CONN;#d# manage and cache textures differently
2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2455
2456 # TODO animation
2457 if ($tex) {
2458 glEnable GL_TEXTURE_2D;
2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2460 glColor 1, 1, 1, 1;
2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2462 glDisable GL_TEXTURE_2D;
2463 }
2464}
2465
2466#############################################################################
2467
2468package CFClient::UI::InventoryItem;
2469
2470our @ISA = CFClient::UI::HBox::;
2471
2472sub new {
2473 my $class = shift;
2474
2475 my %args = @_;
2476
2477 my $item = delete $args{item};
2478
2479 my $desc = $item->{nrof} < 2
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483
2484 my $self = $class->SUPER::new (
2485 can_hover => 1,
2486 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_;
2491
2492 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ],
2509 )->popup ($ev);
2510 }
2511
2512 1
2513 },
2514 %args
2515 );
2516
2517 $self->add (new CFClient::UI::Face
2518 can_events => 0,
2519 face => $item->{face},
2520 anim => $item->{anim},
2521 animspeed => $item->{animspeed},
2522 );
2523
2524 $self->add (new CFClient::UI::Label
2525 can_events => 0,
2526 text => $desc,
2527 );
2528
2529 $self
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Inventory;
2535
2536our @ISA = CFClient::UI::ScrolledWindow::;
2537
2538sub new {
2539 my $class = shift;
2540
2541 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox),
2543 @_,
2544 );
2545
2546 $self
2547}
2548
2549sub set_items {
2550 my ($self, $items) = @_;
2551
2552 $self->{scrolled}->clear;
2553 return unless $items;
2554
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2556
2557 $self->{real_items} = \@items;
2558
2559 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2565 }
2566
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568}
2569
2570sub size_request {
2571 my ($self) = @_;
2572 ($self->{req_w}, $self->{req_h});
2573}
2574
2575#############################################################################
2576
2577package CFClient::UI::Menu;
2578
2579our @ISA = CFClient::UI::FancyFrame::;
2580
2581use CFClient::OpenGL;
2582
2583sub new {
2584 my $class = shift;
2585
2586 my $self = $class->SUPER::new (
2587 items => [],
2588 z => 100,
2589 @_,
2590 );
2591
2592 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2593
2594 for my $item (@{ $self->{items} }) {
2595 my ($widget, $cb) = @$item;
2596
2597 # handle various types of items, only text for now
2598 if (!ref $widget) {
2599 $widget = new CFClient::UI::Label
2600 can_hover => 1,
2601 can_events => 1,
2602 text => $widget;
2603 }
2604
2605 $self->{item}{$widget} = $item;
2606
2607 $self->{vbox}->add ($widget);
2608 }
2609
2610 $self
2611}
2612
2613# popup given the event (must be a mouse button down event currently)
2614sub popup {
2615 my ($self, $ev) = @_;
2616
2617 $self->emit ("popdown");
2618
2619 # maybe save $GRAB? must be careful about events...
2620 $GRAB = $self;
2621 $self->{button} = $ev->{button};
2622
2623 $self->show;
2624 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2625}
2626
2627sub mouse_motion {
2628 my ($self, $ev, $x, $y) = @_;
2629
2630 # TODO: should use vbox->find_widget or so
2631 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2632 $self->{hover} = $self->{item}{$HOVER};
2633}
2634
2635sub button_up {
2636 my ($self, $ev, $x, $y) = @_;
2637
2638 if ($ev->{button} == $self->{button}) {
2639 undef $GRAB;
2640 $self->hide;
2641
2642 $self->emit ("popdown");
2643 $self->{hover}[1]->() if $self->{hover};
2644 }
2645}
2646
2647#############################################################################
2648
2649package CFClient::UI::Statusbox;
2650
2651our @ISA = CFClient::UI::VBox::;
2652
2653sub reorder {
2654 my ($self) = @_;
2655 my $NOW = time;
2656
2657 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 }
2660
2661 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2663 my $count = 10 + 1;
2664 for my $item (@items) {
2665 last unless --$count;
2666
2667 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text};
2670 for ($short) {
2671 s/^\s+//;
2672 s/\012.*//s;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 }
2676
2677 new CFClient::UI::Label
2678 markup => $short,
2679 tooltip => delete $item->{tooltip},
2680 fontsize => delete $item->{fontsize},
2681 color => delete $item->{color},
2682 can_events => 1,
2683 can_hover => 1,
2684 };
2685 }
2686
2687 $self->clear;
2688 $self->SUPER::add (@widgets);
2689}
2690
2691sub add {
2692 my ($self, $text, %arg) = @_;
2693
2694 my $item = {
2695 time => time,
2696 text => $text,
2697 timeout => 60,
2698 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8],
2701 %arg,
2702 };
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708
2709 $self->reorder;
2167} 2710}
2168 2711
2169############################################################################# 2712#############################################################################
2170 2713
2171package CFClient::UI::Root; 2714package CFClient::UI::Root;
2172 2715
2173our @ISA = CFClient::UI::Container::; 2716our @ISA = CFClient::UI::Container::;
2174 2717
2175use CFClient::OpenGL; 2718use CFClient::OpenGL;
2176 2719
2177sub check_size { 2720sub new {
2178 my ($self) = @_; 2721 my $class = shift;
2179 2722
2180 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2723 $class->SUPER::new (
2181} 2724 @_,
2182 2725 )
2183sub size_request {
2184 ($::WIDTH, $::HEIGHT)
2185} 2726}
2186 2727
2187sub configure { 2728sub configure {
2188 my ($self, $x, $y, $w, $h) = @_; 2729 my ($self, $x, $y, $w, $h) = @_;
2189 2730
2190 $self->SUPER::configure ($x, $y, $w, $h); 2731 $self->{w} = $w;
2732 $self->{h} = $h;
2733}
2191 2734
2735sub check_size {
2736 my ($self) = @_;
2737
2738 $self->size_allocate ($self->{w}, $self->{h})
2739 if $self->{w};
2740}
2741
2742sub size_request {
2743 my ($self) = @_;
2744
2745 ($self->{w}, $self->{h})
2746}
2747
2748sub size_allocate {
2749 my ($self, $w, $h) = @_;
2750
2751 my $old_w = $self->{old_w};
2752 my $old_h = $self->{old_h};
2753
2754 if ($old_w && $old_h) {
2755 for my $child ($self->children) {
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766
2192 for my $child (@{$self->{children}}) { 2767 for my $child ($self->children) {
2193 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2194 2769
2195 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2770 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2196 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2197 $child->configure ($X, $Y, $W,$H); 2772 $child->configure ($X, $Y, $W, $H);
2198 } 2773 }
2199}
2200 2774
2201sub _topleft { 2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777}
2778
2779sub coord2local {
2202 my ($self, $x, $y) = @_; 2780 my ($self, $x, $y) = @_;
2203 2781
2204 ($x, $y) 2782 ($x, $y)
2205} 2783}
2206 2784
2785sub coord2global {
2786 my ($self, $x, $y) = @_;
2787
2788 ($x, $y)
2789}
2790
2207sub update { 2791sub update {
2208 my ($self) = @_; 2792 my ($self) = @_;
2209 2793
2210 $self->check_size; 2794 $self->check_size;
2211 ::refresh (); 2795 $::WANT_REFRESH++;
2212} 2796}
2213 2797
2214sub add { 2798sub add {
2215 my ($self, $child) = @_; 2799 my ($self, $child) = @_;
2216 2800
2217 # integerize window positions 2801 # integerise window positions
2218 $child->{x} = int $child->{x}; 2802 $child->{x} = int $child->{x};
2219 $child->{y} = int $child->{y}; 2803 $child->{y} = int $child->{y};
2220 2804
2221 $self->SUPER::add ($child); 2805 $self->SUPER::add ($child);
2222} 2806}
… …
2225 my ($self, $id, $cb) = @_; 2809 my ($self, $id, $cb) = @_;
2226 2810
2227 $self->{refresh_hook}{$id} = $cb; 2811 $self->{refresh_hook}{$id} = $cb;
2228} 2812}
2229 2813
2230sub draw { 2814sub draw {
2231 my ($self) = @_; 2815 my ($self) = @_;
2232 2816
2817 if ($self->{check_size}) {
2818 my @queue = ([], []);
2819
2820 for (;;) {
2821 if ($self->{check_size}) {
2822 # heuristic: check containers last
2823 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2824 for values %{delete $self->{check_size}}
2825 }
2826
2827 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2828
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request;
2832
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835
2836 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h;
2838
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2840
2841 $widget->{parent}->check_size
2842 if $widget->{parent};
2843 }
2844 }
2845 }
2846
2847 while ($self->{size_alloc}) {
2848 for (values %{delete $self->{size_alloc}}) {
2849 my ($widget, $w, $h) = @$_;
2850
2851 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0;
2853
2854 $widget->{w} = $w;
2855 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h);
2858 }
2859 }
2860
2233 while (my $rcb = delete $self->{refresh_hook}) { 2861 while ($self->{refresh_hook}) {
2234 $_->() for values %$rcb; 2862 $_->()
2863 for values %{delete $self->{refresh_hook}};
2235 } 2864 }
2236 2865
2237 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2866 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2238 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2239 glClear GL_COLOR_BUFFER_BIT; 2868 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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