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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines