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.189 by root, Mon May 8 22:17:24 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->_check_size;
409 return;
410 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
336 411
337 my ($w, $h) = $self->size_request; 412 $check_size->{$self} = $self;
338 413
414 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
415 while (%$check_size) {
416 my @widgets = values %$check_size;
417 $_->_check_size
418 for @widgets;
419 }
420 });
421}
422
423sub _check_size {
424 my ($self) = @_;
425
426 delete $CFClient::UI::ROOT->{_check_size}{$self};
427
428 $self->{parent}
429 or return 1;
430
431 my ($w, $h) = $self->{user_w} && $self->{user_h}
432 ? @$self{qw(user_w user_h)}
433 : $self->size_request;
434
339 if ($w != $self->{req_w} || $h != $self->{req_h}) { 435 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w; 436 $self->{req_w} = $w;
341 $self->{req_h} = $h; 437 $self->{req_h} = $h;
342 438
343 $self->{parent}->check_size; 439 $self->{parent}->_check_size
440 or $self->size_allocate (
441 (List::Util::max $self->{w}, $w),
442 (List::Util::max $self->{h}, $h),
443 );
444
445 1
446 } else {
447 0
344 } 448 }
345} 449}
346 450
347sub update { 451sub update {
348 my ($self) = @_; 452 my ($self) = @_;
349 453
350 $self->{parent}->update 454 my $update = $CFClient::UI::ROOT->{_update} ||= {};
351 if $self->{parent}; 455
456 $update->{$self} = $self;
457
458 $CFClient::UI::ROOT->on_refresh (_update => sub {
459 while (%$update) {
460 my @widgets = values %$update;
461 %$update = ();
462
463 $_->{parent} && $_->{parent}->update
464 for @widgets;
465 }
466 });
352} 467}
353 468
354sub connect { 469sub connect {
355 my ($self, $signal, $cb) = @_; 470 my ($self, $signal, $cb) = @_;
356 471
358} 473}
359 474
360sub emit { 475sub emit {
361 my ($self, $signal, @args) = @_; 476 my ($self, $signal, @args) = @_;
362 477
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 478 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
364 $cb->($self, @args);
365 }
366} 479}
367 480
368sub DESTROY { 481sub DESTROY {
369 my ($self) = @_; 482 my ($self) = @_;
370 483
437sub new { 550sub new {
438 my ($class, %arg) = @_; 551 my ($class, %arg) = @_;
439 552
440 my $children = delete $arg{children} || []; 553 my $children = delete $arg{children} || [];
441 554
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 555 my $self = $class->SUPER::new (
556 children => [],
557 can_events => 0,
558 %arg,
559 );
443 $self->add ($_) for @$children; 560 $self->add ($_) for @$children;
444 561
445 $self 562 $self
446} 563}
447 564
448sub add { 565sub add {
449 my ($self, $child) = @_; 566 my ($self, @widgets) = @_;
450 567
451 $child->set_parent ($self); 568 $_->set_parent ($self)
569 for @widgets;
452 570
453 use sort 'stable'; 571 use sort 'stable';
454 572
455 $self->{children} = [ 573 $self->{children} = [
456 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
457 @{$self->{children}}, $child 575 @{$self->{children}}, @widgets
458 ]; 576 ];
459 577
460 $child->check_size; 578 $_->check_size
579 for @widgets;
580
581 $self->update;
582}
583
584sub children {
585 @{ $_[0]{children} }
461} 586}
462 587
463sub remove { 588sub remove {
464 my ($self, $child) = @_; 589 my ($self, $child) = @_;
465 590
466 delete $child->{parent}; 591 delete $child->{parent};
592 $child->hide;
467 593
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 594 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
595
596 $self->check_size;
597 $self->update;
598}
599
600sub clear {
601 my ($self) = @_;
602
603 my $children = delete $self->{children};
604 $self->{children} = [];
605
606 for (@$children) {
607 delete $_->{parent};
608 $_->hide;
609 }
469 610
470 $self->check_size; 611 $self->check_size;
471 $self->update; 612 $self->update;
472} 613}
473 614
551} 692}
552 693
553sub update { 694sub update {
554 my ($self) = @_; 695 my ($self) = @_;
555 696
556 # we want to do this delayed... 697 $ROOT->on_refresh ($self => sub { $self->render_child });
557 $self->render_chld;
558 $self->SUPER::update; 698 $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} 699}
570 700
571sub size_allocate { 701sub size_allocate {
572 my ($self, $w, $h) = @_; 702 my ($self, $w, $h) = @_;
573 703
574 $self->child->configure (0, 0, $w, $h); 704 $self->SUPER::size_allocate ($w, $h);
705 $self->update;
706}
575 707
708sub _render {
709 $_[0]{children}[0]->draw;
710}
711
712sub render_child {
713 my ($self) = @_;
714
715 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
716 glClearColor 0, 0, 0, 0;
717 glClear GL_COLOR_BUFFER_BIT;
718
576 $self->render_chld; 719 $self->_render;
720# glColorMask 1, 1, 1, 0;
721# glEnable GL_BLEND;
722# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
723# glRasterPos 0, 0;
724# glCopyPixels 0, 0, $self->{w}, $self->{h};
725# glDisable GL_BLEND;
726# glColorMask 1, 1, 1, 1;
727 };
577} 728}
578 729
579sub _draw { 730sub _draw {
580 my ($self) = @_; 731 my ($self) = @_;
581 732
583 734
584 my $tex = $self->{texture} 735 my $tex = $self->{texture}
585 or return; 736 or return;
586 737
587 glEnable GL_BLEND; 738 glEnable GL_BLEND;
588 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 739 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
589 glEnable GL_TEXTURE_2D; 740 glEnable GL_TEXTURE_2D;
590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
742 glColor 0, 0, 0, 1;
591 743
592 $tex->draw_quad (0, 0, $w, $h); 744 $tex->draw_quad (0, 0, $w, $h);
593 745
594 glDisable GL_BLEND; 746 glDisable GL_BLEND;
595 glDisable GL_TEXTURE_2D; 747 glDisable GL_TEXTURE_2D;
599 751
600package CFClient::UI::ViewPort; 752package CFClient::UI::ViewPort;
601 753
602our @ISA = CFClient::UI::Window::; 754our @ISA = CFClient::UI::Window::;
603 755
604sub new { die }
605
606sub size_request { 756sub size_request {
607 my ($self) = @_; 757 my ($self) = @_;
608 758
609 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 759 @$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)}); 760 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
611 761
612 @$self{qw(child_w child_h)} 762 @$self{qw(child_w child_h)}
613} 763}
614 764
615sub _draw { 765sub size_allocate {
616 my ($self) = @_; 766 my ($self, $w, $h) = @_;
617 767
618 $self->{children}[1]->draw; 768 $self->update;
619} 769}
620 770
771sub set_offset {
772 my ($self, $x, $y) = @_;
773
774 $self->{view_x} = int $x;
775 $self->{view_y} = int $y;
776
777 $self->update;
778}
779
780# hmm, this does not work for topleft of $self... but we should not aks for that
781sub _topleft {
782 my ($self, $x, $y) = @_;
783
784 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
785}
786
787sub find_widget {
788 my ($self, $x, $y) = @_;
789
790 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
791 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
792 ) {
793 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
794 } else {
795 $self->CFClient::UI::Base::find_widget ($x, $y)
796 }
797}
798
799sub _render {
800 my ($self) = @_;
801
802 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
803
804 $self->SUPER::_render;
805}
806
807#############################################################################
808
809package CFClient::UI::ScrolledWindow;
810
811our @ISA = CFClient::UI::HBox::;
812
813sub new {
814 my $class = shift;
815
816 my $self;
817
818 my $slider = new CFClient::UI::Slider
819 vertical => 1,
820 range => [0, 0, 1, 0.01], # HACK fix
821 connect_changed => sub {
822 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
823 },
824 ;
825
826 $self = $class->SUPER::new (
827 vp => (new CFClient::UI::ViewPort),
828 slider => $slider,
829 @_,
830 );
831
832 $self->{vp}->add ($self->{scrolled});
833 $self->add ($self->{vp});
834 $self->add ($self->{slider});
835
836 $self
837}
838
839#TODO# update range on size_allocate depeneing on child
840# update viewport offset on scroll
621 841
622############################################################################# 842#############################################################################
623 843
624package CFClient::UI::Frame; 844package CFClient::UI::Frame;
625 845
636 border => 0.8, 856 border => 0.8,
637 @_ 857 @_
638 ); 858 );
639 859
640 $self 860 $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} 861}
661 862
662sub _draw { 863sub _draw {
663 my ($self) = @_; 864 my ($self) = @_;
664 865
699 my $class = shift; 900 my $class = shift;
700 901
701 # TODO: user_x, user_y, overwrite moveto? 902 # TODO: user_x, user_y, overwrite moveto?
702 903
703 my $self = $class->SUPER::new ( 904 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 905 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 906 border_bg => [1, 1, 1, 1],
706 border => 0.8, 907 border => 0.6,
707 can_events => 1, 908 can_events => 1,
708 @_ 909 @_
709 ); 910 );
710 911
711 $self->{title} &&= new CFClient::UI::Label 912 $self->{title} &&= new CFClient::UI::Label
712 align => 0, 913 align => 0,
713 valign => 1, 914 valign => 1,
714 text => $self->{title}, 915 text => $self->{title},
715 fontsize => 1; 916 fontsize => $self->{border};
716 917
717 $self 918 $self
718} 919}
719 920
720sub border { 921sub border {
721 int $_[0]{border} * $::FONTSIZE 922 int $_[0]{border} * $::FONTSIZE
722} 923}
723 924
724sub size_request { 925sub size_request {
725 my ($self) = @_; 926 my ($self) = @_;
726
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728 927
729 my ($w, $h) = $self->SUPER::size_request; 928 my ($w, $h) = $self->SUPER::size_request;
730 929
731 ( 930 (
732 $w + $self->border * 2, 931 $w + $self->border * 2,
747} 946}
748 947
749sub button_down { 948sub button_down {
750 my ($self, $ev, $x, $y) = @_; 949 my ($self, $ev, $x, $y) = @_;
751 950
951 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 952 my $border = $self->border;
753 953
754 if ($x < $self->{w} && $x >= $self->{w} - $border 954 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 955 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 956
957 if ($lr & $td) {
958 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 959 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 960 my ($bw, $bh) = ($self->{w}, $self->{h});
759 961
962 my $mx = $x < $border;
963 my $my = $y < $border;
964
760 $self->{motion} = sub { 965 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 966 my ($ev, $x, $y) = @_;
762 967
763 ($x, $y) = ($ev->{x}, $ev->{y}); 968 my $dx = $ev->{x} - $ox;
969 my $dy = $ev->{y} - $oy;
764 970
765 $self->{user_w} = $bw + $x - $ox; 971 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
766 $self->{user_h} = $bh + $y - $oy; 972 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
973 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
767 $self->check_size; 974 $self->check_size;
768 }; 975 };
769 976
770 } elsif ($x >= 0 && $x < $self->{w} 977 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 978 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 979 my ($bx, $by) = ($self->{x}, $self->{y});
775 980
776 $self->{motion} = sub { 981 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 982 my ($ev, $x, $y) = @_;
813 $tex[1]->draw_quad (0, 0, $w, $border); 1018 $tex[1]->draw_quad (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 1019 $tex[3]->draw_quad (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1020 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1021 $tex[4]->draw_quad (0, $h - $border, $w, $border);
817 1022
1023 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
818 my $bg = $tex[0]; 1024 my $bg = $tex[0];
819 1025
820 # TODO: repeat texture not scale 1026 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 1027 my $rep_x = $cw / $bg->{w};
822 my $rep_y = $ch / $bg->{h}; 1028 my $rep_y = $ch / $bg->{h};
823 1029
824 glColor @{ $self->{bg} }; 1030 glColor @{ $self->{bg} };
825 1031
826 $bg->{s} = $rep_x; 1032 $bg->{s} = $rep_x;
827 $bg->{t} = $rep_y; 1033 $bg->{t} = $rep_y;
828 $bg->{wrap_mode} = 1; 1034 $bg->{wrap_mode} = 1;
829 $bg->draw_quad ($border, $border, $cw, $ch); 1035 $bg->draw_quad ($border, $border, $cw, $ch);
830 1036
831 glDisable GL_TEXTURE_2D; 1037 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND; 1038 glDisable GL_BLEND;
1039 }
833 1040
834 $self->{title}->draw if $self->{title}; 1041 $self->{title}->draw if $self->{title};
1042
835 $self->child->draw; 1043 $self->child->draw;
836} 1044}
837 1045
838############################################################################# 1046#############################################################################
839 1047
861 $self->{children}[$y][$x] = $child; 1069 $self->{children}[$y][$x] = $child;
862 1070
863 $child->check_size; 1071 $child->check_size;
864} 1072}
865 1073
1074sub children {
1075 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1076}
1077
866# TODO: move to container class maybe? send childs a signal on removal? 1078# TODO: move to container class maybe? send childs a signal on removal?
867sub clear { 1079sub clear {
868 my ($self) = @_; 1080 my ($self) = @_;
869 1081
1082 my @children = $self->children;
870 delete $self->{children}; 1083 delete $self->{children};
1084
1085 for (@children) {
1086 delete $_->{parent};
1087 $_->hide;
1088 }
1089
871 $self->update; 1090 $self->update;
872} 1091}
873 1092
874sub get_wh { 1093sub get_wh {
875 my ($self) = @_; 1094 my ($self) = @_;
1098 1317
1099sub new { 1318sub new {
1100 my ($class, %arg) = @_; 1319 my ($class, %arg) = @_;
1101 1320
1102 my $self = $class->SUPER::new ( 1321 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1322 fg => [1, 1, 1],
1323 #font => default_font
1104 fontsize => 1, 1324 fontsize => 1,
1105 text => "", 1325 text => "",
1106 align => -1, 1326 align => -1,
1107 valign => -1, 1327 valign => -1,
1108 padding => 2, 1328 padding => 2,
1109 layout => new CFClient::Layout, 1329 layout => new CFClient::Layout,
1110 can_events => 0, 1330 can_events => 0,
1111 %arg 1331 %arg
1112 ); 1332 );
1113 1333
1114 if (exists $self->{template}) { 1334 if (exists $self->{template}) {
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1341 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1122 1342
1123 $self 1343 $self
1124} 1344}
1125 1345
1126sub escape_text { 1346sub escape {
1127 local $_ = $_[1]; 1347 local $_ = $_[1];
1128 1348
1129 s/&/&amp;/g; 1349 s/&/&amp;/g;
1130 s/>/&gt;/g; 1350 s/>/&gt;/g;
1131 s/</&lt;/g; 1351 s/</&lt;/g;
1132 1352
1133 $_[1] 1353 $_[1]
1134} 1354}
1135 1355
1356sub update {
1357 my ($self) = @_;
1358
1359 delete $self->{texture};
1360 $self->SUPER::update;
1361}
1362
1136sub set_text { 1363sub set_text {
1137 my ($self, $text) = @_; 1364 my ($self, $text) = @_;
1138 1365
1366 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text";
1368
1139 $self->{layout}->set_text ($text); 1369 $self->{layout}->set_text ($text);
1140 1370
1141 delete $self->{texture}; 1371 delete $self->{texture};
1372 $self->update;
1142 $self->check_size; 1373 $self->check_size;
1143 $self->update;
1144} 1374}
1145 1375
1146sub set_markup { 1376sub set_markup {
1147 my ($self, $markup) = @_; 1377 my ($self, $markup) = @_;
1148 1378
1379 return if $self->{text} eq "M$markup";
1380 $self->{text} = "M$markup";
1381
1149 $self->{layout}->set_markup ($markup); 1382 $self->{layout}->set_markup ($markup);
1150 1383
1151 delete $self->{texture}; 1384 delete $self->{texture};
1385 $self->update;
1152 $self->check_size; 1386 $self->check_size;
1153 $self->update;
1154} 1387}
1155 1388
1156sub size_request { 1389sub size_request {
1157 my ($self) = @_; 1390 my ($self) = @_;
1158 1391
1159 $self->{layout}->set_width; 1392 $self->{layout}->set_font ($self->{font}) if $self->{font};
1393 $self->{layout}->set_width ($self->{max_w} || -1);
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1395
1162 my ($w, $h) = $self->{layout}->size; 1396 my ($w, $h) = $self->{layout}->size;
1163 1397
1164 if (exists $self->{template}) { 1398 if (exists $self->{template}) {
1399 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1401
1167 my ($w2, $h2) = $self->{template}->size; 1402 my ($w2, $h2) = $self->{template}->size;
1168 1403
1169 $w = List::Util::max $w, $w2; 1404 $w = List::Util::max $w, $w2;
1185sub set_fontsize { 1420sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1421 my ($self, $fontsize) = @_;
1187 1422
1188 $self->{fontsize} = $fontsize; 1423 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1424 delete $self->{texture};
1425
1426 $self->update;
1190 $self->check_size; 1427 $self->check_size;
1191 $self->update;
1192} 1428}
1193 1429
1194sub _draw { 1430sub _draw {
1195 my ($self) = @_; 1431 my ($self) = @_;
1196 1432
1197 my $tex = $self->{texture} ||= do { 1433 my $tex = $self->{texture} ||= do {
1434 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1435 $self->{layout}->set_width ($self->{w});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1436 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1200 new_from_layout CFClient::Texture $self->{layout} 1437 new_from_layout CFClient::Texture $self->{layout}
1201 }; 1438 };
1202 1439
1235 1472
1236sub new { 1473sub new {
1237 my $class = shift; 1474 my $class = shift;
1238 1475
1239 $class->SUPER::new ( 1476 $class->SUPER::new (
1240 fg => [1, 1, 1], 1477 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1478 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1479 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1480 active_fg => [0, 0, 0],
1244 can_hover => 1, 1481 can_hover => 1,
1245 can_focus => 1, 1482 can_focus => 1,
1246 valign => 0, 1483 valign => 0,
1247 can_events => 1, 1484 can_events => 1,
1248 @_ 1485 @_
1249 ) 1486 )
1250} 1487}
1251 1488
1405 my ($self, $ev) = @_; 1642 my ($self, $ev) = @_;
1406 1643
1407 my $sym = $ev->{sym}; 1644 my $sym = $ev->{sym};
1408 1645
1409 if ($sym == 13) { 1646 if ($sym == 13) {
1647 unshift @{$self->{history}},
1648 my $txt = $self->get_text;
1649 $self->{history_pointer} = -1;
1650 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1651 $self->emit (activate => $txt);
1411 $self->update; 1652 $self->update;
1653
1654 } elsif ($sym == CFClient::SDLK_UP) {
1655 if ($self->{history_pointer} < 0) {
1656 $self->{history_saveback} = $self->get_text;
1657 }
1658 if (@{$self->{history} || []} > 0) {
1659 $self->{history_pointer}++;
1660 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1661 $self->{history_pointer} = @{$self->{history} || []} - 1;
1662 }
1663 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1664 }
1665
1666 } elsif ($sym == CFClient::SDLK_DOWN) {
1667 $self->{history_pointer}--;
1668 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1669
1670 if ($self->{history_pointer} >= 0) {
1671 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1672 } else {
1673 $self->set_text ($self->{history_saveback});
1674 }
1412 1675
1413 } else { 1676 } else {
1414 $self->SUPER::key_down ($ev); 1677 $self->SUPER::key_down ($ev);
1415 } 1678 }
1416 1679
1430 1693
1431sub new { 1694sub new {
1432 my $class = shift; 1695 my $class = shift;
1433 1696
1434 $class->SUPER::new ( 1697 $class->SUPER::new (
1435 padding => 4, 1698 padding => 4,
1436 fg => [1, 1, 1], 1699 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2], 1700 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1701 active_fg => [0, 0, 1],
1439 can_hover => 1, 1702 can_hover => 1,
1440 align => 0, 1703 align => 0,
1441 valign => 0, 1704 valign => 0,
1442 can_events => 1, 1705 can_events => 1,
1443 @_ 1706 @_
1444 ) 1707 )
1445} 1708}
1446 1709
1605 1868
1606package CFClient::UI::VGauge; 1869package CFClient::UI::VGauge;
1607 1870
1608our @ISA = CFClient::UI::Base::; 1871our @ISA = CFClient::UI::Base::;
1609 1872
1873use List::Util qw(min max);
1874
1610use CFClient::OpenGL; 1875use CFClient::OpenGL;
1611 1876
1612my %tex = ( 1877my %tex = (
1613 food => [ 1878 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1879 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1880 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1881 ],
1617 grace => [ 1882 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1883 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1884 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1885 ],
1621 hp => [ 1886 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1887 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1888 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1889 ],
1625 mana => [ 1890 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1891 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1892 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1893 ],
1629); 1894);
1630 1895
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1896# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1897sub new {
1651} 1916}
1652 1917
1653sub set_max { 1918sub set_max {
1654 my ($self, $max) = @_; 1919 my ($self, $max) = @_;
1655 1920
1921 return if $self->{max_val} == $max;
1922
1656 $self->{max_val} = $max; 1923 $self->{max_val} = $max;
1924 $self->update;
1657} 1925}
1658 1926
1659sub set_value { 1927sub set_value {
1660 my ($self, $val, $max) = @_; 1928 my ($self, $val, $max) = @_;
1661 1929
1662 $self->set_max ($max) 1930 $self->set_max ($max)
1663 if defined $max; 1931 if defined $max;
1664 1932
1665 $max = $self->{max_val}; 1933 return if $self->{val} == $val;
1934
1666 $self->{val} = $val; 1935 $self->{val} = $val;
1667
1668 $self->update; 1936 $self->update;
1669} 1937}
1670 1938
1671sub _draw { 1939sub _draw {
1672 my ($self) = @_; 1940 my ($self) = @_;
1673 1941
1674 my $tex = $tex{$self->{type}}; 1942 my $tex = $tex{$self->{type}};
1943 my ($t1, $t2, $t3) = @$tex;
1675 1944
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1945 my ($w, $h) = ($self->{w}, $self->{h});
1677 1946
1678 if ($self->{vertical}) { 1947 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1948 glRotate 90, 0, 0, 1;
1681 1950
1682 ($w, $h) = ($h, $w); 1951 ($w, $h) = ($h, $w);
1683 } 1952 }
1684 1953
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1954 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1955
1688 my $t1 = $tex->[0]; 1956 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 1957 my $ycut2 = max 0, min 1, $ycut - 1;
1958
1959 my $h1 = $self->{h} * (1 - $ycut1);
1960 my $h2 = $self->{h} * (1 - $ycut2);
1690 1961
1691 glEnable GL_BLEND; 1962 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1963 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1966
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1967 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1968 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1969 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1970 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1971 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1972 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1973 glEnd;
1706 1974
1975 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1976 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1977 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1978 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1979 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1980 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1981 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 1982 glEnd;
1983
1984 if ($t3) {
1985 glBindTexture GL_TEXTURE_2D, $t3->{name};
1986 glBegin GL_QUADS;
1987 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1988 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1989 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1990 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1991 glEnd;
1992 }
1714 1993
1715 glDisable GL_BLEND; 1994 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1995 glDisable GL_TEXTURE_2D;
1717} 1996}
1718 1997
1724 2003
1725sub new { 2004sub new {
1726 my ($class, %arg) = @_; 2005 my ($class, %arg) = @_;
1727 2006
1728 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 2008 tooltip => $arg{type},
2009 can_hover => 1,
2010 can_events => 1,
1730 %arg, 2011 %arg,
1731 ); 2012 );
1732 2013
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2014 $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); 2015 $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"); 2016 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 2017
1737 $self 2018 $self
1738} 2019}
1739 2020
1742 2023
1743 $self->{value}->set_fontsize ($fsize); 2024 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 2025 $self->{max} ->set_fontsize ($fsize);
1745} 2026}
1746 2027
2028sub set_max {
2029 my ($self, $max) = @_;
2030
2031 $self->{gauge}->set_max ($max);
2032 $self->{max}->set_text ($max);
2033}
2034
1747sub set_value { 2035sub set_value {
1748 my ($self, $val, $max) = @_; 2036 my ($self, $val, $max) = @_;
1749 2037
1750 $self->set_max ($max) 2038 $self->set_max ($max)
1751 if defined $max; 2039 if defined $max;
1752 2040
1753 $self->{gauge}->set_value ($val, $max); 2041 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 2042 $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} 2043}
1763 2044
1764############################################################################# 2045#############################################################################
1765 2046
1766package CFClient::UI::Slider; 2047package CFClient::UI::Slider;
1785 # TODO: calculations are off 2066 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 2069 active_fg => [0, 0, 0],
1789 range => [0, 0, 100, 10], 2070 range => [0, 0, 100, 10],
1790 req_w => 20, 2071 req_w => $::WIDTH / 80,
1791 req_h => 20, 2072 req_h => $::WIDTH / 80,
1792 vertical => 0, 2073 vertical => 0,
1793 can_hover => 1, 2074 can_hover => 1,
1794 inner_pad => 5, 2075 inner_pad => 5,
1795 @_ 2076 @_
1796 ); 2077 );
1906 2187
1907sub new { 2188sub new {
1908 my $class = shift; 2189 my $class = shift;
1909 2190
1910 my $self = $class->SUPER::new ( 2191 my $self = $class->SUPER::new (
1911 fontsize => 1, 2192 fontsize => 1,
2193 can_events => 0,
2194 #font => default_font
1912 @_, 2195 @_,
1913 2196
1914 layout => (new CFClient::Layout), 2197 layout => (new CFClient::Layout),
1915 par => [], 2198 par => [],
1916 height => 0, 2199 height => 0,
1917 children => [ 2200 children => [
1918 (new CFClient::UI::Empty expand => 1), 2201 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2202 (new CFClient::UI::Slider vertical => 1),
1920 ], 2203 ],
1921 ); 2204 );
1922 2205
1923 $self->{children}[1]->connect (changed => sub { 2206 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2207
1927 $self 2208 $self
1928} 2209}
1929 2210
1930sub set_fontsize { 2211sub set_fontsize {
1938 my ($self, $text) = @_; 2219 my ($self, $text) = @_;
1939 2220
1940 my $layout = $self->{layout}; 2221 my $layout = $self->{layout};
1941 2222
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2223 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2224 $layout->set_width ($self->{children}[0]{w});
1944 $layout->set_text ($text); 2225 $layout->set_text ($text);
1945 2226
1946 ($layout->size)[1] 2227 ($layout->size)[1]
1947} 2228}
1948 2229
1956sub size_allocate { 2237sub size_allocate {
1957 my ($self, $w, $h) = @_; 2238 my ($self, $w, $h) = @_;
1958 2239
1959 $self->SUPER::size_allocate ($w, $h); 2240 $self->SUPER::size_allocate ($w, $h);
1960 2241
2242 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2243 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1962 $self->{layout}->set_width ($self->{children}[0]{w}); 2244 $self->{layout}->set_width ($self->{children}[0]{w});
1963 2245
1964 $self->reflow; 2246 $self->reflow;
1965} 2247}
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2282 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2001 2283
2002 delete $self->{texture}; 2284 delete $self->{texture};
2003 } 2285 }
2004 2286
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2287 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2006 glClearColor 0, 0, 0, 1; 2288 glClearColor 0, 0, 0, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2289 glClear GL_COLOR_BUFFER_BIT;
2008 2290
2009 glEnable GL_BLEND; 2291 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2293 glEnable GL_TEXTURE_2D;
2018 2300
2019 my $y = 0; 2301 my $y = 0;
2020 2302
2021 my $layout = $self->{layout}; 2303 my $layout = $self->{layout};
2022 2304
2305 $layout->set_font ($self->{font}) if $self->{font};
2306
2023 for my $par (@{$self->{par}}) { 2307 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2308 my $h = $par->[0];
2025 2309
2026 if ($y0 < $y + $h && $y < $y1) { 2310 if ($y0 < $y + $h && $y < $y1) {
2027 $layout->set_text ($par->[2]); 2311 $layout->set_text ($par->[2]);
2041} 2325}
2042 2326
2043sub _draw { 2327sub _draw {
2044 my ($self) = @_; 2328 my ($self) = @_;
2045 2329
2046 if ($self->{texture}) { 2330 glEnable GL_BLEND;
2331 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2047 glEnable GL_TEXTURE_2D; 2332 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2333 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2334 glColor 1, 1, 1, 1;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2335 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2336 glDisable GL_TEXTURE_2D;
2051 } 2337 glDisable GL_BLEND;
2052 2338
2053 $self->{children}[1]->draw; 2339 $self->{children}[1]->draw;
2054 2340
2055} 2341}
2056 2342
2104 2390
2105sub new { 2391sub new {
2106 my $class = shift; 2392 my $class = shift;
2107 2393
2108 my $self = $class->SUPER::new ( 2394 my $self = $class->SUPER::new (
2109 state => 0, 2395 state => 0,
2110 connect_activate => \&toggle_flopper, 2396 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2397 @_
2113 ); 2398 );
2114 2399
2115 if ($self->{state}) { 2400 if ($self->{state}) {
2116 $self->{state} = 0; 2401 $self->{state} = 0;
2151 @_, 2436 @_,
2152 can_events => 0, 2437 can_events => 0,
2153 ) 2438 )
2154} 2439}
2155 2440
2156sub set_text { 2441sub set_markup {
2157 my ($self, $text) = @_; 2442 my ($self, $text) = @_;
2158 2443
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2444 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2160 $self->{label}->set_text ($text); 2445 $self->{label}->set_markup ($text);
2161 $self->add ($self->{label}); 2446 $self->add ($self->{label});
2162} 2447}
2163 2448
2164sub size_request { 2449sub size_request {
2165 my ($self) = @_; 2450 my ($self) = @_;
2166 2451
2452 $self->child->set_max_size ($::WIDTH * 0.3);
2453
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2454 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2455
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2456 ($w + 4, $h + 4)
2457}
2458
2459sub size_allocate {
2460 my ($self, $w, $h) = @_;
2461
2462 $self->SUPER::size_allocate ($w - 4, $h - 4);
2173} 2463}
2174 2464
2175sub _draw { 2465sub _draw {
2176 my ($self) = @_; 2466 my ($self) = @_;
2177 2467
2202 $self->SUPER::_draw; 2492 $self->SUPER::_draw;
2203} 2493}
2204 2494
2205############################################################################# 2495#############################################################################
2206 2496
2497package CFClient::UI::Face;
2498
2499our @ISA = CFClient::UI::Base::;
2500
2501use CFClient::OpenGL;
2502
2503sub new {
2504 my $class = shift;
2505
2506 $class->SUPER::new (
2507 aspect => 1,
2508 @_,
2509 )
2510}
2511
2512sub size_request {
2513 (32, 8)
2514}
2515
2516sub _draw {
2517 my ($self) = @_;
2518
2519 return unless $::CONN;#d# manage and cache textures differently
2520 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2521
2522 # TODO animation
2523 if ($tex) {
2524 glEnable GL_BLEND;
2525 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2526 glEnable GL_TEXTURE_2D;
2527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2528 glColor 1, 1, 1, 1;
2529 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2530 glDisable GL_TEXTURE_2D;
2531 glDisable GL_BLEND;
2532 }
2533}
2534
2535#############################################################################
2536
2537package CFClient::UI::InventoryItem;
2538
2539our @ISA = CFClient::UI::HBox::;
2540
2541sub new {
2542 my $class = shift;
2543
2544 my %args = @_;
2545
2546 my $item = $args{item};
2547
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552
2553 my $self = $class->SUPER::new (
2554 can_hover => 1,
2555 can_events => 1,
2556 tooltip => (CFClient::UI::Label->escape ($desc)
2557 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2558 connect_button_down => sub {
2559 my ($self, $ev, $x, $y) = @_;
2560
2561 # todo: maybe put examine on 1? but should just be a tooltip :(
2562 if ($ev->{button} == 1) {
2563 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2564 } elsif ($ev->{button} == 2) {
2565 $::CONN->send ("apply $item->{tag}");
2566 } elsif ($ev->{button} == 3) {
2567 CFClient::UI::Menu->new (
2568 items => [
2569 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2570 [
2571 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2572 sub { $::CONN->send ("lock $item->{tag}") },
2573 ],
2574 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2575 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2576 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2577 ],
2578 )->popup ($ev);
2579 }
2580
2581 1
2582 },
2583 %args
2584 );
2585 $self->add(new CFClient::UI::Face
2586 can_events => 0,
2587 face => $item->{face},
2588 anim => $item->{anim},
2589 animspeed => $item->{animspeed});
2590 $self->add(new CFClient::UI::Label
2591 can_events => 0,
2592 text => $desc);
2593
2594 $self
2595}
2596
2597#############################################################################
2598
2599package CFClient::UI::Inventory;
2600
2601our @ISA = CFClient::UI::ScrolledWindow::;
2602
2603sub new {
2604 my $class = shift;
2605
2606 my $self = $class->SUPER::new (
2607 scrolled => (new CFClient::UI::VBox),
2608 @_,
2609 );
2610
2611 $self
2612}
2613
2614sub set_items {
2615 my ($self, $items) = @_;
2616
2617 $self->{scrolled}->clear;
2618 return unless $items;
2619
2620 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2621
2622 $self->{real_items} = \@items;
2623
2624 for my $item (@items) {
2625 my $desc = $item->{nrof} < 2
2626 ? $item->{name}
2627 : "$item->{nrof} $item->{name_pl}";
2628
2629 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2630 }
2631
2632# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633}
2634
2635sub size_request {
2636 my ($self) = @_;
2637 ($self->{req_w}, $self->{req_h});
2638}
2639
2640#############################################################################
2641
2642package CFClient::UI::Menu;
2643
2644our @ISA = CFClient::UI::FancyFrame::;
2645
2646use CFClient::OpenGL;
2647
2648sub new {
2649 my $class = shift;
2650
2651 my $self = $class->SUPER::new (
2652 items => [],
2653 z => 100,
2654 @_,
2655 );
2656
2657 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2658
2659 for my $item (@{ $self->{items} }) {
2660 my ($widget, $cb) = @$item;
2661
2662 # handle various types of items, only text for now
2663 if (!ref $widget) {
2664 $widget = new CFClient::UI::Label
2665 can_hover => 1,
2666 can_events => 1,
2667 text => $widget;
2668 }
2669
2670 $self->{item}{$widget} = $item;
2671
2672 $self->{vbox}->add ($widget);
2673 }
2674
2675 $self
2676}
2677
2678# popup given the event (must be a mouse button down event currently)
2679sub popup {
2680 my ($self, $ev) = @_;
2681
2682 $self->emit ("popdown");
2683
2684 # maybe save $GRAB? must be careful about events...
2685 $GRAB = $self;
2686 $self->{button} = $ev->{button};
2687
2688 $self->show;
2689 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2690}
2691
2692sub mouse_motion {
2693 my ($self, $ev, $x, $y) = @_;
2694
2695 # TODO: should use vbox->find_widget or so
2696 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2697 $self->{hover} = $self->{item}{$HOVER};
2698}
2699
2700sub button_up {
2701 my ($self, $ev, $x, $y) = @_;
2702
2703 if ($ev->{button} == $self->{button}) {
2704 undef $GRAB;
2705 $self->hide;
2706
2707 $self->emit ("popdown");
2708 $self->{hover}[1]->() if $self->{hover};
2709 }
2710}
2711
2712#############################################################################
2713
2207package CFClient::UI::Root; 2714package CFClient::UI::Root;
2208 2715
2209our @ISA = CFClient::UI::Container::; 2716our @ISA = CFClient::UI::Container::;
2210 2717
2211use CFClient::OpenGL; 2718use CFClient::OpenGL;
2212 2719
2213sub check_size { 2720sub check_size {
2214 my ($self) = @_; 2721 my ($self) = @_;
2215 2722
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2723 $self->configure (0, 0, $self->{w}, $self->{h});
2217} 2724}
2218 2725
2219sub size_request { 2726sub size_request {
2220 ($::WIDTH, $::HEIGHT) 2727 my ($self) = @_;
2728
2729 ($self->{w}, $self->{h})
2730}
2731
2732sub size_allocate {
2733 my ($self, $w, $h) = @_;
2734
2735 my $old_w = $self->{old_w};
2736 my $old_h = $self->{old_h};
2737
2738 if ($old_w && $old_h) {
2739 for my $child ($self->children) {
2740 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2741 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2742 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2743 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2744 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2745 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2746 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2747 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2748 }
2749 }
2750
2751 $self->{old_w} = $w;
2752 $self->{old_h} = $h;
2221} 2753}
2222 2754
2223sub configure { 2755sub configure {
2224 my ($self, $x, $y, $w, $h) = @_; 2756 my ($self, $x, $y, $w, $h) = @_;
2225 2757
2226 $self->SUPER::configure ($x, $y, $w, $h); 2758 $self->SUPER::configure ($x, $y, $w, $h);
2227 2759
2228 for my $child (@{$self->{children}}) { 2760 for my $child ($self->children) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2761 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230 2762
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2763 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2764 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2233 $child->configure ($X, $Y, $W,$H); 2765 $child->configure ($X, $Y, $W, $H);
2234 } 2766 }
2235} 2767}
2236 2768
2237sub _topleft { 2769sub _topleft {
2238 my ($self, $x, $y) = @_; 2770 my ($self, $x, $y) = @_;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines