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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.155 by root, Sun Apr 23 02:22:54 2006 UTC vs.
Revision 1.186 by root, Mon May 8 20:39:34 2006 UTC

… …
14our $BUTTON_STATE; 14our $BUTTON_STATE;
15 15
16sub check_tooltip { 16sub check_tooltip {
17 if (!$GRAB) { 17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 19 if (length $widget->{tooltip}) {
20 20
21 if ($TOOLTIP->{owner} != $widget) { 21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 22 $TOOLTIP->{owner} = $widget;
23 23
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
… …
39 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
40} 48}
41 49
42# class methods for events 50# class methods for events
43sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
45} 54}
46 55
47sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
49} 59}
50 60
51sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
52 my ($ev) = @_; 62 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 71 check_tooltip;
62 } 72 }
63 73
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 75
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
67} 80}
68 81
69sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
70 my ($ev) = @_; 83 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
72 85
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 87
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 89
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
78 94
79 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 97 $grab->update if $grab;
82 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 115
100 check_tooltip; 116 check_tooltip;
101 } 117 }
102 118
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
104} 123}
105 124
106# convert position array to integers 125# convert position array to integers
107sub harmonize { 126sub harmonize {
108 my ($vals) = @_; 127 my ($vals) = @_;
… …
126 145
127sub new { 146sub new {
128 my $class = shift; 147 my $class = shift;
129 148
130 my $self = bless { 149 my $self = bless {
131 x => 0, 150 x => 0,
132 y => 0, 151 y => 0,
133 z => 0, 152 z => 0,
134 can_events => 1, 153 can_events => 1,
135 @_ 154 @_
136 }, $class; 155 }, $class;
137 156
138 for (keys %$self) { 157 for (keys %$self) {
… …
142 } 161 }
143 162
144 $self 163 $self
145} 164}
146 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
147sub show { 173sub show {
148 my ($self) = @_; 174 my ($self) = @_;
149 175
150 return if $self->{parent}; 176 return if $self->{parent};
151 177
… …
153} 179}
154 180
155sub hide { 181sub hide {
156 my ($self) = @_; 182 my ($self) = @_;
157 183
158 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
159 186
160 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
161} 189}
162 190
163sub move { 191sub move {
164 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
165 193
… …
168 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
169 197
170 $self->update; 198 $self->update;
171} 199}
172 200
173sub needs_redraw { 201sub set_size {
174 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
175} 208}
176 209
177sub size_request { 210sub size_request {
178 require Carp; 211 require Carp;
179 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
204 $self->{w} = $w; 237 $self->{w} = $w;
205 $self->{h} = $h; 238 $self->{h} = $h;
206 239
207 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
208 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
209 } 243 }
210} 244}
211 245
212sub size_allocate { 246sub size_allocate {
213 # nothing to be done 247 # nothing to be done
248}
249
250sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263}
264
265sub set_max_size {
266 my ($self, $w, $h) = @_;
267
268 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h;
214} 270}
215 271
216# return top left coordinates 272# return top left coordinates
217sub _topleft { 273sub _topleft {
218 my ($self, $x, $y) = @_; 274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
219 278
220 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
221} 280}
222 281
223# translate global coordinates to local coordinate system 282# translate global coordinates to local coordinate system
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 360 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 361 glVertex $x , $y + $self->{h};
303 glEnd; 362 glEnd;
304 glDisable GL_BLEND; 363 glDisable GL_BLEND;
305 } 364 }
365
366 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix;
368 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0;
372 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h};
375 glEnd;
376 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 }
306} 379}
307 380
308sub _draw { 381sub _draw {
309 my ($self) = @_; 382 my ($self) = @_;
310 383
… …
330} 403}
331 404
332sub check_size { 405sub check_size {
333 my ($self) = @_; 406 my ($self) = @_;
334 407
335 return unless $self->{parent}; 408 $self->{parent}
409 or return 1;
336 410
337 my ($w, $h) = $self->size_request; 411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
338 414
339 if ($w != $self->{req_w} || $h != $self->{req_h}) { 415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w; 416 $self->{req_w} = $w;
341 $self->{req_h} = $h; 417 $self->{req_h} = $h;
342 418
343 $self->{parent}->check_size; 419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
344 } 428 }
345} 429}
346 430
347sub update { 431sub update {
348 my ($self) = @_; 432 my ($self) = @_;
… …
358} 442}
359 443
360sub emit { 444sub emit {
361 my ($self, $signal, @args) = @_; 445 my ($self, $signal, @args) = @_;
362 446
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
364 $cb->($self, @args);
365 }
366} 448}
367 449
368sub DESTROY { 450sub DESTROY {
369 my ($self) = @_; 451 my ($self) = @_;
370 452
… …
437sub new { 519sub new {
438 my ($class, %arg) = @_; 520 my ($class, %arg) = @_;
439 521
440 my $children = delete $arg{children} || []; 522 my $children = delete $arg{children} || [];
441 523
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 524 my $self = $class->SUPER::new (
525 children => [],
526 can_events => 0,
527 %arg,
528 );
443 $self->add ($_) for @$children; 529 $self->add ($_) for @$children;
444 530
445 $self 531 $self
446} 532}
447 533
… …
456 sort { $a->{z} <=> $b->{z} } 542 sort { $a->{z} <=> $b->{z} }
457 @{$self->{children}}, $child 543 @{$self->{children}}, $child
458 ]; 544 ];
459 545
460 $child->check_size; 546 $child->check_size;
547 $self->update;
548}
549
550sub children {
551 @{ $_[0]{children} }
461} 552}
462 553
463sub remove { 554sub remove {
464 my ($self, $child) = @_; 555 my ($self, $child) = @_;
465 556
466 delete $child->{parent}; 557 delete $child->{parent};
558 $child->hide;
467 559
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
561
562 $self->check_size;
563 $self->update;
564}
565
566sub clear {
567 my ($self) = @_;
568
569 my $children = delete $self->{children};
570 $self->{children} = [];
571
572 for (@$children) {
573 delete $_->{parent};
574 $_->hide;
575 }
469 576
470 $self->check_size; 577 $self->check_size;
471 $self->update; 578 $self->update;
472} 579}
473 580
… …
551} 658}
552 659
553sub update { 660sub update {
554 my ($self) = @_; 661 my ($self) = @_;
555 662
556 # we want to do this delayed... 663 $ROOT->on_refresh ($self => sub { $self->render_child });
557 $self->render_chld;
558 $self->SUPER::update; 664 $self->SUPER::update;
559}
560
561sub render_chld {
562 my ($self) = @_;
563
564 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
565 glClearColor 0, 0, 0, 1;
566 glClear GL_COLOR_BUFFER_BIT;
567 $self->child->draw;
568 };
569} 665}
570 666
571sub size_allocate { 667sub size_allocate {
572 my ($self, $w, $h) = @_; 668 my ($self, $w, $h) = @_;
573 669
574 $self->child->configure (0, 0, $w, $h); 670 $self->SUPER::size_allocate ($w, $h);
671 $self->update;
672}
575 673
674sub _render {
675 $_[0]{children}[0]->draw;
676}
677
678sub render_child {
679 my ($self) = @_;
680
681 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
682 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT;
684
576 $self->render_chld; 685 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
693 };
577} 694}
578 695
579sub _draw { 696sub _draw {
580 my ($self) = @_; 697 my ($self) = @_;
581 698
… …
583 700
584 my $tex = $self->{texture} 701 my $tex = $self->{texture}
585 or return; 702 or return;
586 703
587 glEnable GL_BLEND; 704 glEnable GL_BLEND;
588 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
589 glEnable GL_TEXTURE_2D; 706 glEnable GL_TEXTURE_2D;
590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1;
591 709
592 $tex->draw_quad (0, 0, $w, $h); 710 $tex->draw_quad (0, 0, $w, $h);
593 711
594 glDisable GL_BLEND; 712 glDisable GL_BLEND;
595 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
… …
599 717
600package CFClient::UI::ViewPort; 718package CFClient::UI::ViewPort;
601 719
602our @ISA = CFClient::UI::Window::; 720our @ISA = CFClient::UI::Window::;
603 721
604sub new { die }
605
606sub size_request { 722sub size_request {
607 my ($self) = @_; 723 my ($self) = @_;
608 724
609 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
610 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
611 727
612 @$self{qw(child_w child_h)} 728 @$self{qw(child_w child_h)}
613} 729}
614 730
615sub _draw { 731sub size_allocate {
616 my ($self) = @_; 732 my ($self, $w, $h) = @_;
617 733
618 $self->{children}[1]->draw; 734 $self->update;
619} 735}
620 736
737sub set_offset {
738 my ($self, $x, $y) = @_;
739
740 $self->{view_x} = int $x;
741 $self->{view_y} = int $y;
742
743 $self->update;
744}
745
746# hmm, this does not work for topleft of $self... but we should not aks for that
747sub _topleft {
748 my ($self, $x, $y) = @_;
749
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
751}
752
753sub find_widget {
754 my ($self, $x, $y) = @_;
755
756 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
757 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
758 ) {
759 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
760 } else {
761 $self->CFClient::UI::Base::find_widget ($x, $y)
762 }
763}
764
765sub _render {
766 my ($self) = @_;
767
768 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
769
770 $self->SUPER::_render;
771}
772
773#############################################################################
774
775package CFClient::UI::ScrolledWindow;
776
777our @ISA = CFClient::UI::HBox::;
778
779sub new {
780 my $class = shift;
781
782 my $self;
783
784 my $slider = new CFClient::UI::Slider
785 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
789 },
790 ;
791
792 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort),
794 slider => $slider,
795 @_,
796 );
797
798 $self->{vp}->add ($self->{scrolled});
799 $self->add ($self->{vp});
800 $self->add ($self->{slider});
801
802 $self
803}
804
805#TODO# update range on size_allocate depeneing on child
806# update viewport offset on scroll
621 807
622############################################################################# 808#############################################################################
623 809
624package CFClient::UI::Frame; 810package CFClient::UI::Frame;
625 811
… …
636 border => 0.8, 822 border => 0.8,
637 @_ 823 @_
638 ); 824 );
639 825
640 $self 826 $self
641}
642
643sub set_size {
644 my ($self, $w, $h) = @_;
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648}
649
650sub size_request {
651 my ($self) = @_;
652 ($self->{req_w}, $self->{req_h})
653}
654
655sub size_allocate {
656 my ($self, $w, $h) = @_;
657 $self->{w} = $w;
658 $self->{h} = $h;
659 $self->child->configure (0, 0, $w, $h);
660} 827}
661 828
662sub _draw { 829sub _draw {
663 my ($self) = @_; 830 my ($self) = @_;
664 831
… …
699 my $class = shift; 866 my $class = shift;
700 867
701 # TODO: user_x, user_y, overwrite moveto? 868 # TODO: user_x, user_y, overwrite moveto?
702 869
703 my $self = $class->SUPER::new ( 870 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 871 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 872 border_bg => [1, 1, 1, 1],
706 border => 0.8, 873 border => 0.6,
707 can_events => 1, 874 can_events => 1,
708 @_ 875 @_
709 ); 876 );
710 877
711 $self->{title} &&= new CFClient::UI::Label 878 $self->{title} &&= new CFClient::UI::Label
712 align => 0, 879 align => 0,
713 valign => 1, 880 valign => 1,
714 text => $self->{title}, 881 text => $self->{title},
715 fontsize => 1; 882 fontsize => $self->{border};
716 883
717 $self 884 $self
718} 885}
719 886
720sub border { 887sub border {
721 int $_[0]{border} * $::FONTSIZE 888 int $_[0]{border} * $::FONTSIZE
722} 889}
723 890
724sub size_request { 891sub size_request {
725 my ($self) = @_; 892 my ($self) = @_;
726
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728 893
729 my ($w, $h) = $self->SUPER::size_request; 894 my ($w, $h) = $self->SUPER::size_request;
730 895
731 ( 896 (
732 $w + $self->border * 2, 897 $w + $self->border * 2,
… …
747} 912}
748 913
749sub button_down { 914sub button_down {
750 my ($self, $ev, $x, $y) = @_; 915 my ($self, $ev, $x, $y) = @_;
751 916
917 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 918 my $border = $self->border;
753 919
754 if ($x < $self->{w} && $x >= $self->{w} - $border 920 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 921 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 922
923 if ($lr & $td) {
924 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 925 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 926 my ($bw, $bh) = ($self->{w}, $self->{h});
759 927
928 my $mx = $x < $border;
929 my $my = $y < $border;
930
760 $self->{motion} = sub { 931 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 932 my ($ev, $x, $y) = @_;
762 933
763 ($x, $y) = ($ev->{x}, $ev->{y}); 934 my $dx = $ev->{x} - $ox;
935 my $dy = $ev->{y} - $oy;
764 936
765 $self->{user_w} = $bw + $x - $ox; 937 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
766 $self->{user_h} = $bh + $y - $oy; 938 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
939 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
767 $self->check_size; 940 $self->check_size;
768 }; 941 };
769 942
770 } elsif ($x >= 0 && $x < $self->{w} 943 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 944 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 945 my ($bx, $by) = ($self->{x}, $self->{y});
775 946
776 $self->{motion} = sub { 947 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 948 my ($ev, $x, $y) = @_;
… …
813 $tex[1]->draw_quad (0, 0, $w, $border); 984 $tex[1]->draw_quad (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 985 $tex[3]->draw_quad (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 987 $tex[4]->draw_quad (0, $h - $border, $w, $border);
817 988
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
818 my $bg = $tex[0]; 990 my $bg = $tex[0];
819 991
820 # TODO: repeat texture not scale 992 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 993 my $rep_x = $cw / $bg->{w};
822 my $rep_y = $ch / $bg->{h}; 994 my $rep_y = $ch / $bg->{h};
823 995
824 glColor @{ $self->{bg} }; 996 glColor @{ $self->{bg} };
825 997
826 $bg->{s} = $rep_x; 998 $bg->{s} = $rep_x;
827 $bg->{t} = $rep_y; 999 $bg->{t} = $rep_y;
828 $bg->{wrap_mode} = 1; 1000 $bg->{wrap_mode} = 1;
829 $bg->draw_quad ($border, $border, $cw, $ch); 1001 $bg->draw_quad ($border, $border, $cw, $ch);
830 1002
831 glDisable GL_TEXTURE_2D; 1003 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND; 1004 glDisable GL_BLEND;
1005 }
833 1006
834 $self->{title}->draw if $self->{title}; 1007 $self->{title}->draw if $self->{title};
1008
835 $self->child->draw; 1009 $self->child->draw;
836} 1010}
837 1011
838############################################################################# 1012#############################################################################
839 1013
… …
861 $self->{children}[$y][$x] = $child; 1035 $self->{children}[$y][$x] = $child;
862 1036
863 $child->check_size; 1037 $child->check_size;
864} 1038}
865 1039
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1042}
1043
866# TODO: move to container class maybe? send childs a signal on removal? 1044# TODO: move to container class maybe? send childs a signal on removal?
867sub clear { 1045sub clear {
868 my ($self) = @_; 1046 my ($self) = @_;
869 1047
1048 my @children = $self->children;
870 delete $self->{children}; 1049 delete $self->{children};
1050
1051 for (@children) {
1052 delete $_->{parent};
1053 $_->hide;
1054 }
1055
871 $self->update; 1056 $self->update;
872} 1057}
873 1058
874sub get_wh { 1059sub get_wh {
875 my ($self) = @_; 1060 my ($self) = @_;
… …
1098 1283
1099sub new { 1284sub new {
1100 my ($class, %arg) = @_; 1285 my ($class, %arg) = @_;
1101 1286
1102 my $self = $class->SUPER::new ( 1287 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1288 fg => [1, 1, 1],
1289 #font => default_font
1104 fontsize => 1, 1290 fontsize => 1,
1105 text => "", 1291 text => "",
1106 align => -1, 1292 align => -1,
1107 valign => -1, 1293 valign => -1,
1108 padding => 2, 1294 padding => 2,
1109 layout => new CFClient::Layout, 1295 layout => new CFClient::Layout,
1110 can_events => 0, 1296 can_events => 0,
1111 %arg 1297 %arg
1112 ); 1298 );
1113 1299
1114 if (exists $self->{template}) { 1300 if (exists $self->{template}) {
… …
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1307 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1122 1308
1123 $self 1309 $self
1124} 1310}
1125 1311
1126sub escape_text { 1312sub escape {
1127 local $_ = $_[1]; 1313 local $_ = $_[1];
1128 1314
1129 s/&/&amp;/g; 1315 s/&/&amp;/g;
1130 s/>/&gt;/g; 1316 s/>/&gt;/g;
1131 s/</&lt;/g; 1317 s/</&lt;/g;
1132 1318
1133 $_[1] 1319 $_[1]
1134} 1320}
1135 1321
1322sub update {
1323 my ($self) = @_;
1324
1325 delete $self->{texture};
1326 $self->SUPER::update;
1327}
1328
1136sub set_text { 1329sub set_text {
1137 my ($self, $text) = @_; 1330 my ($self, $text) = @_;
1138 1331
1332 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text";
1334
1139 $self->{layout}->set_text ($text); 1335 $self->{layout}->set_text ($text);
1140 1336
1141 delete $self->{texture}; 1337 delete $self->{texture};
1338 $self->update;
1142 $self->check_size; 1339 $self->check_size;
1143 $self->update;
1144} 1340}
1145 1341
1146sub set_markup { 1342sub set_markup {
1147 my ($self, $markup) = @_; 1343 my ($self, $markup) = @_;
1148 1344
1345 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup";
1347
1149 $self->{layout}->set_markup ($markup); 1348 $self->{layout}->set_markup ($markup);
1150 1349
1151 delete $self->{texture}; 1350 delete $self->{texture};
1351 $self->update;
1152 $self->check_size; 1352 $self->check_size;
1153 $self->update;
1154} 1353}
1155 1354
1156sub size_request { 1355sub size_request {
1157 my ($self) = @_; 1356 my ($self) = @_;
1158 1357
1159 $self->{layout}->set_width; 1358 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $self->{layout}->set_width ($self->{max_w} || -1);
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1361
1162 my ($w, $h) = $self->{layout}->size; 1362 my ($w, $h) = $self->{layout}->size;
1163 1363
1164 if (exists $self->{template}) { 1364 if (exists $self->{template}) {
1365 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1366 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1367
1167 my ($w2, $h2) = $self->{template}->size; 1368 my ($w2, $h2) = $self->{template}->size;
1168 1369
1169 $w = List::Util::max $w, $w2; 1370 $w = List::Util::max $w, $w2;
… …
1185sub set_fontsize { 1386sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1387 my ($self, $fontsize) = @_;
1187 1388
1188 $self->{fontsize} = $fontsize; 1389 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1390 delete $self->{texture};
1391
1392 $self->update;
1190 $self->check_size; 1393 $self->check_size;
1191 $self->update;
1192} 1394}
1193 1395
1194sub _draw { 1396sub _draw {
1195 my ($self) = @_; 1397 my ($self) = @_;
1196 1398
1197 my $tex = $self->{texture} ||= do { 1399 my $tex = $self->{texture} ||= do {
1400 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1401 $self->{layout}->set_width ($self->{w});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1200 new_from_layout CFClient::Texture $self->{layout} 1403 new_from_layout CFClient::Texture $self->{layout}
1201 }; 1404 };
1202 1405
… …
1235 1438
1236sub new { 1439sub new {
1237 my $class = shift; 1440 my $class = shift;
1238 1441
1239 $class->SUPER::new ( 1442 $class->SUPER::new (
1240 fg => [1, 1, 1], 1443 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1444 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1445 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1446 active_fg => [0, 0, 0],
1244 can_hover => 1, 1447 can_hover => 1,
1245 can_focus => 1, 1448 can_focus => 1,
1246 valign => 0, 1449 valign => 0,
1247 can_events => 1, 1450 can_events => 1,
1248 @_ 1451 @_
1249 ) 1452 )
1250} 1453}
1251 1454
… …
1405 my ($self, $ev) = @_; 1608 my ($self, $ev) = @_;
1406 1609
1407 my $sym = $ev->{sym}; 1610 my $sym = $ev->{sym};
1408 1611
1409 if ($sym == 13) { 1612 if ($sym == 13) {
1613 unshift @{$self->{history}},
1614 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1617 $self->emit (activate => $txt);
1411 $self->update; 1618 $self->update;
1619
1620 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text;
1623 }
1624 if (@{$self->{history} || []} > 0) {
1625 $self->{history_pointer}++;
1626 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1627 $self->{history_pointer} = @{$self->{history} || []} - 1;
1628 }
1629 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1630 }
1631
1632 } elsif ($sym == CFClient::SDLK_DOWN) {
1633 $self->{history_pointer}--;
1634 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1635
1636 if ($self->{history_pointer} >= 0) {
1637 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1638 } else {
1639 $self->set_text ($self->{history_saveback});
1640 }
1412 1641
1413 } else { 1642 } else {
1414 $self->SUPER::key_down ($ev); 1643 $self->SUPER::key_down ($ev);
1415 } 1644 }
1416 1645
… …
1430 1659
1431sub new { 1660sub new {
1432 my $class = shift; 1661 my $class = shift;
1433 1662
1434 $class->SUPER::new ( 1663 $class->SUPER::new (
1435 padding => 4, 1664 padding => 4,
1436 fg => [1, 1, 1], 1665 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2], 1666 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1667 active_fg => [0, 0, 1],
1439 can_hover => 1, 1668 can_hover => 1,
1440 align => 0, 1669 align => 0,
1441 valign => 0, 1670 valign => 0,
1442 can_events => 1, 1671 can_events => 1,
1443 @_ 1672 @_
1444 ) 1673 )
1445} 1674}
1446 1675
… …
1605 1834
1606package CFClient::UI::VGauge; 1835package CFClient::UI::VGauge;
1607 1836
1608our @ISA = CFClient::UI::Base::; 1837our @ISA = CFClient::UI::Base::;
1609 1838
1839use List::Util qw(min max);
1840
1610use CFClient::OpenGL; 1841use CFClient::OpenGL;
1611 1842
1612my %tex = ( 1843my %tex = (
1613 food => [ 1844 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1845 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1846 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1847 ],
1617 grace => [ 1848 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1849 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1850 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1851 ],
1621 hp => [ 1852 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1854 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1855 ],
1625 mana => [ 1856 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1858 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1859 ],
1629); 1860);
1630 1861
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1862# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1863sub new {
… …
1651} 1882}
1652 1883
1653sub set_max { 1884sub set_max {
1654 my ($self, $max) = @_; 1885 my ($self, $max) = @_;
1655 1886
1887 return if $self->{max_val} == $max;
1888
1656 $self->{max_val} = $max; 1889 $self->{max_val} = $max;
1890 $self->update;
1657} 1891}
1658 1892
1659sub set_value { 1893sub set_value {
1660 my ($self, $val, $max) = @_; 1894 my ($self, $val, $max) = @_;
1661 1895
1662 $self->set_max ($max) 1896 $self->set_max ($max)
1663 if defined $max; 1897 if defined $max;
1664 1898
1665 $max = $self->{max_val}; 1899 return if $self->{val} == $val;
1900
1666 $self->{val} = $val; 1901 $self->{val} = $val;
1667
1668 $self->update; 1902 $self->update;
1669} 1903}
1670 1904
1671sub _draw { 1905sub _draw {
1672 my ($self) = @_; 1906 my ($self) = @_;
1673 1907
1674 my $tex = $tex{$self->{type}}; 1908 my $tex = $tex{$self->{type}};
1909 my ($t1, $t2, $t3) = @$tex;
1675 1910
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1911 my ($w, $h) = ($self->{w}, $self->{h});
1677 1912
1678 if ($self->{vertical}) { 1913 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1914 glRotate 90, 0, 0, 1;
… …
1681 1916
1682 ($w, $h) = ($h, $w); 1917 ($w, $h) = ($h, $w);
1683 } 1918 }
1684 1919
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1920 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1921
1688 my $t1 = $tex->[0]; 1922 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 1923 my $ycut2 = max 0, min 1, $ycut - 1;
1924
1925 my $h1 = $self->{h} * (1 - $ycut1);
1926 my $h2 = $self->{h} * (1 - $ycut2);
1690 1927
1691 glEnable GL_BLEND; 1928 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1930 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1931 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1932
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1933 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1934 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1935 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1936 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1937 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1938 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1939 glEnd;
1706 1940
1941 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1942 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1943 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1944 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1945 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1946 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1947 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 1948 glEnd;
1949
1950 if ($t3) {
1951 glBindTexture GL_TEXTURE_2D, $t3->{name};
1952 glBegin GL_QUADS;
1953 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1954 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1955 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1956 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1957 glEnd;
1958 }
1714 1959
1715 glDisable GL_BLEND; 1960 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1961 glDisable GL_TEXTURE_2D;
1717} 1962}
1718 1963
… …
1724 1969
1725sub new { 1970sub new {
1726 my ($class, %arg) = @_; 1971 my ($class, %arg) = @_;
1727 1972
1728 my $self = $class->SUPER::new ( 1973 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 1974 tooltip => $arg{type},
1975 can_hover => 1,
1976 can_events => 1,
1730 %arg, 1977 %arg,
1731 ); 1978 );
1732 1979
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1980 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1734 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1981 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1735 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1982 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 1983
1737 $self 1984 $self
1738} 1985}
1739 1986
… …
1742 1989
1743 $self->{value}->set_fontsize ($fsize); 1990 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 1991 $self->{max} ->set_fontsize ($fsize);
1745} 1992}
1746 1993
1994sub set_max {
1995 my ($self, $max) = @_;
1996
1997 $self->{gauge}->set_max ($max);
1998 $self->{max}->set_text ($max);
1999}
2000
1747sub set_value { 2001sub set_value {
1748 my ($self, $val, $max) = @_; 2002 my ($self, $val, $max) = @_;
1749 2003
1750 $self->set_max ($max) 2004 $self->set_max ($max)
1751 if defined $max; 2005 if defined $max;
1752 2006
1753 $self->{gauge}->set_value ($val, $max); 2007 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 2008 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762} 2009}
1763 2010
1764############################################################################# 2011#############################################################################
1765 2012
1766package CFClient::UI::Slider; 2013package CFClient::UI::Slider;
… …
1785 # TODO: calculations are off 2032 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 2033 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2034 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 2035 active_fg => [0, 0, 0],
1789 range => [0, 0, 100, 10], 2036 range => [0, 0, 100, 10],
1790 req_w => 20, 2037 req_w => $::WIDTH / 80,
1791 req_h => 20, 2038 req_h => $::WIDTH / 80,
1792 vertical => 0, 2039 vertical => 0,
1793 can_hover => 1, 2040 can_hover => 1,
1794 inner_pad => 5, 2041 inner_pad => 5,
1795 @_ 2042 @_
1796 ); 2043 );
… …
1906 2153
1907sub new { 2154sub new {
1908 my $class = shift; 2155 my $class = shift;
1909 2156
1910 my $self = $class->SUPER::new ( 2157 my $self = $class->SUPER::new (
1911 fontsize => 1, 2158 fontsize => 1,
2159 can_events => 0,
2160 #font => default_font
1912 @_, 2161 @_,
1913 2162
1914 layout => (new CFClient::Layout), 2163 layout => (new CFClient::Layout),
1915 par => [], 2164 par => [],
1916 height => 0, 2165 height => 0,
1917 children => [ 2166 children => [
1918 (new CFClient::UI::Empty expand => 1), 2167 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2168 (new CFClient::UI::Slider vertical => 1),
1920 ], 2169 ],
1921 ); 2170 );
1922 2171
1923 $self->{children}[1]->connect (changed => sub { 2172 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2173
1927 $self 2174 $self
1928} 2175}
1929 2176
1930sub set_fontsize { 2177sub set_fontsize {
… …
1938 my ($self, $text) = @_; 2185 my ($self, $text) = @_;
1939 2186
1940 my $layout = $self->{layout}; 2187 my $layout = $self->{layout};
1941 2188
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2190 $layout->set_width ($self->{children}[0]{w});
1944 $layout->set_text ($text); 2191 $layout->set_text ($text);
1945 2192
1946 ($layout->size)[1] 2193 ($layout->size)[1]
1947} 2194}
1948 2195
… …
1956sub size_allocate { 2203sub size_allocate {
1957 my ($self, $w, $h) = @_; 2204 my ($self, $w, $h) = @_;
1958 2205
1959 $self->SUPER::size_allocate ($w, $h); 2206 $self->SUPER::size_allocate ($w, $h);
1960 2207
2208 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2209 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1962 $self->{layout}->set_width ($self->{children}[0]{w}); 2210 $self->{layout}->set_width ($self->{children}[0]{w});
1963 2211
1964 $self->reflow; 2212 $self->reflow;
1965} 2213}
… …
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2001 2249
2002 delete $self->{texture}; 2250 delete $self->{texture};
2003 } 2251 }
2004 2252
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2253 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2006 glClearColor 0, 0, 0, 1; 2254 glClearColor 0, 0, 0, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2255 glClear GL_COLOR_BUFFER_BIT;
2008 2256
2009 glEnable GL_BLEND; 2257 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2259 glEnable GL_TEXTURE_2D;
… …
2018 2266
2019 my $y = 0; 2267 my $y = 0;
2020 2268
2021 my $layout = $self->{layout}; 2269 my $layout = $self->{layout};
2022 2270
2271 $layout->set_font ($self->{font}) if $self->{font};
2272
2023 for my $par (@{$self->{par}}) { 2273 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2274 my $h = $par->[0];
2025 2275
2026 if ($y0 < $y + $h && $y < $y1) { 2276 if ($y0 < $y + $h && $y < $y1) {
2027 $layout->set_text ($par->[2]); 2277 $layout->set_text ($par->[2]);
… …
2041} 2291}
2042 2292
2043sub _draw { 2293sub _draw {
2044 my ($self) = @_; 2294 my ($self) = @_;
2045 2295
2046 if ($self->{texture}) { 2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2047 glEnable GL_TEXTURE_2D; 2298 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2301 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2302 glDisable GL_TEXTURE_2D;
2051 } 2303 glDisable GL_BLEND;
2052 2304
2053 $self->{children}[1]->draw; 2305 $self->{children}[1]->draw;
2054 2306
2055} 2307}
2056 2308
… …
2104 2356
2105sub new { 2357sub new {
2106 my $class = shift; 2358 my $class = shift;
2107 2359
2108 my $self = $class->SUPER::new ( 2360 my $self = $class->SUPER::new (
2109 state => 0, 2361 state => 0,
2110 connect_activate => \&toggle_flopper, 2362 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2363 @_
2113 ); 2364 );
2114 2365
2115 if ($self->{state}) { 2366 if ($self->{state}) {
2116 $self->{state} = 0; 2367 $self->{state} = 0;
… …
2151 @_, 2402 @_,
2152 can_events => 0, 2403 can_events => 0,
2153 ) 2404 )
2154} 2405}
2155 2406
2156sub set_text { 2407sub set_markup {
2157 my ($self, $text) = @_; 2408 my ($self, $text) = @_;
2158 2409
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2160 $self->{label}->set_text ($text); 2411 $self->{label}->set_markup ($text);
2161 $self->add ($self->{label}); 2412 $self->add ($self->{label});
2162} 2413}
2163 2414
2164sub size_request { 2415sub size_request {
2165 my ($self) = @_; 2416 my ($self) = @_;
2166 2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2421
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2422 ($w + 4, $h + 4)
2423}
2424
2425sub size_allocate {
2426 my ($self, $w, $h) = @_;
2427
2428 $self->SUPER::size_allocate ($w - 4, $h - 4);
2173} 2429}
2174 2430
2175sub _draw { 2431sub _draw {
2176 my ($self) = @_; 2432 my ($self) = @_;
2177 2433
… …
2202 $self->SUPER::_draw; 2458 $self->SUPER::_draw;
2203} 2459}
2204 2460
2205############################################################################# 2461#############################################################################
2206 2462
2463package CFClient::UI::Face;
2464
2465our @ISA = CFClient::UI::Base::;
2466
2467use CFClient::OpenGL;
2468
2469sub new {
2470 my $class = shift;
2471
2472 $class->SUPER::new (
2473 aspect => 1,
2474 @_,
2475 )
2476}
2477
2478sub size_request {
2479 (32, 8)
2480}
2481
2482sub _draw {
2483 my ($self) = @_;
2484
2485 return unless $::CONN;#d# manage and cache textures differently
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2487
2488 # TODO animation
2489 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 }
2499}
2500
2501#############################################################################
2502
2503package CFClient::UI::InventoryItem;
2504
2505our @ISA = CFClient::UI::HBox::;
2506
2507sub new {
2508 my $class = shift;
2509
2510 my %args = @_;
2511
2512 my $item = $args{item};
2513
2514 my $desc = $item->{nrof} < 2
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518
2519 my $self = $class->SUPER::new (
2520 can_hover => 1,
2521 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_;
2526
2527 # todo: maybe put examine on 1? but should just be a tooltip :(
2528 if ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2543 ],
2544 )->popup ($ev);
2545 }
2546
2547 1
2548 },
2549 %args
2550 );
2551 $self->add(new CFClient::UI::Face
2552 can_events => 0,
2553 face => $item->{face},
2554 anim => $item->{anim},
2555 animspeed => $item->{animspeed});
2556 $self->add(new CFClient::UI::Label
2557 can_events => 0,
2558 text => $desc);
2559
2560 $self
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Inventory;
2566
2567our @ISA = CFClient::UI::ScrolledWindow::;
2568
2569sub new {
2570 my $class = shift;
2571
2572 my $self = $class->SUPER::new (
2573 scrolled => (new CFClient::UI::VBox),
2574 @_,
2575 );
2576
2577 $self
2578}
2579
2580sub set_items {
2581 my ($self, $items) = @_;
2582
2583 $self->{scrolled}->clear;
2584 return unless $items;
2585
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2587
2588 $self->{real_items} = \@items;
2589
2590 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2596 }
2597
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599}
2600
2601sub size_request {
2602 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h});
2604}
2605
2606#############################################################################
2607
2608package CFClient::UI::Menu;
2609
2610our @ISA = CFClient::UI::FancyFrame::;
2611
2612use CFClient::OpenGL;
2613
2614sub new {
2615 my $class = shift;
2616
2617 my $self = $class->SUPER::new (
2618 items => [],
2619 z => 100,
2620 @_,
2621 );
2622
2623 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2624
2625 for my $item (@{ $self->{items} }) {
2626 my ($widget, $cb) = @$item;
2627
2628 # handle various types of items, only text for now
2629 if (!ref $widget) {
2630 $widget = new CFClient::UI::Label
2631 can_hover => 1,
2632 can_events => 1,
2633 text => $widget;
2634 }
2635
2636 $self->{item}{$widget} = $item;
2637
2638 $self->{vbox}->add ($widget);
2639 }
2640
2641 $self
2642}
2643
2644# popup given the event (must be a mouse button down event currently)
2645sub popup {
2646 my ($self, $ev) = @_;
2647
2648 $self->emit ("popdown");
2649
2650 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self;
2652 $self->{button} = $ev->{button};
2653
2654 $self->show;
2655 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2656}
2657
2658sub mouse_motion {
2659 my ($self, $ev, $x, $y) = @_;
2660
2661 # TODO: should use vbox->find_widget or so
2662 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2663 $self->{hover} = $self->{item}{$HOVER};
2664}
2665
2666sub button_up {
2667 my ($self, $ev, $x, $y) = @_;
2668
2669 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB;
2671 $self->hide;
2672
2673 $self->emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover};
2675 }
2676}
2677
2678#############################################################################
2679
2207package CFClient::UI::Root; 2680package CFClient::UI::Root;
2208 2681
2209our @ISA = CFClient::UI::Container::; 2682our @ISA = CFClient::UI::Container::;
2210 2683
2211use CFClient::OpenGL; 2684use CFClient::OpenGL;
2212 2685
2213sub check_size { 2686sub check_size {
2214 my ($self) = @_; 2687 my ($self) = @_;
2215 2688
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2689 $self->configure (0, 0, $self->{w}, $self->{h});
2217} 2690}
2218 2691
2219sub size_request { 2692sub size_request {
2220 ($::WIDTH, $::HEIGHT) 2693 my ($self) = @_;
2694
2695 ($self->{w}, $self->{h})
2696}
2697
2698sub size_allocate {
2699 my ($self, $w, $h) = @_;
2700
2701 my $old_w = $self->{old_w};
2702 my $old_h = $self->{old_h};
2703
2704 if ($old_w && $old_h) {
2705 for my $child ($self->children) {
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2221} 2719}
2222 2720
2223sub configure { 2721sub configure {
2224 my ($self, $x, $y, $w, $h) = @_; 2722 my ($self, $x, $y, $w, $h) = @_;
2225 2723
2226 $self->SUPER::configure ($x, $y, $w, $h); 2724 $self->SUPER::configure ($x, $y, $w, $h);
2227 2725
2228 for my $child (@{$self->{children}}) { 2726 for my $child ($self->children) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2727 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230 2728
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2729 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2730 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2233 $child->configure ($X, $Y, $W,$H); 2731 $child->configure ($X, $Y, $W, $H);
2234 } 2732 }
2235} 2733}
2236 2734
2237sub _topleft { 2735sub _topleft {
2238 my ($self, $x, $y) = @_; 2736 my ($self, $x, $y) = @_;

Diff Legend

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