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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.151 by root, Sun Apr 23 00:57:39 2006 UTC vs.
Revision 1.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
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
23 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
25 $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);
26 } 39 }
27 40
28 return; 41 return;
29 } 42 }
30 } 43 }
34 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
35} 48}
36 49
37# class methods for events 50# class methods for events
38sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
40} 54}
41 55
42sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
44} 59}
45 60
46sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
47 my ($ev) = @_; 62 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
56 check_tooltip; 71 check_tooltip;
57 } 72 }
58 73
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 75
61 $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 }
62} 80}
63 81
64sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
65 my ($ev) = @_; 83 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
67 85
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 87
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 89
72 $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 }
73 94
74 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 97 $grab->update if $grab;
77 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 115
95 check_tooltip; 116 check_tooltip;
96 } 117 }
97 118
98 $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 }
99} 123}
100 124
101# convert position array to integers 125# convert position array to integers
102sub harmonize { 126sub harmonize {
103 my ($vals) = @_; 127 my ($vals) = @_;
121 145
122sub new { 146sub new {
123 my $class = shift; 147 my $class = shift;
124 148
125 my $self = bless { 149 my $self = bless {
126 x => 0, 150 x => 0,
127 y => 0, 151 y => 0,
128 z => 0, 152 z => 0,
129 can_events => 1, 153 can_events => 1,
130 @_ 154 @_
131 }, $class; 155 }, $class;
132 156
133 for (keys %$self) { 157 for (keys %$self) {
137 } 161 }
138 162
139 $self 163 $self
140} 164}
141 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
142sub show { 173sub show {
143 my ($self) = @_; 174 my ($self) = @_;
144 175
145 return if $self->{parent}; 176 return if $self->{parent};
146 177
148} 179}
149 180
150sub hide { 181sub hide {
151 my ($self) = @_; 182 my ($self) = @_;
152 183
153 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
154 186
155 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
156} 189}
157 190
158sub move { 191sub move {
159 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
160 193
163 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
164 197
165 $self->update; 198 $self->update;
166} 199}
167 200
168sub needs_redraw { 201sub set_size {
169 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
170} 208}
171 209
172sub size_request { 210sub size_request {
173 require Carp; 211 require Carp;
174 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
199 $self->{w} = $w; 237 $self->{w} = $w;
200 $self->{h} = $h; 238 $self->{h} = $h;
201 239
202 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
203 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
204 } 243 }
205} 244}
206 245
207sub size_allocate { 246sub size_allocate {
208 # 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;
209} 270}
210 271
211# return top left coordinates 272# return top left coordinates
212sub _topleft { 273sub _topleft {
213 my ($self, $x, $y) = @_; 274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
214 278
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
216} 280}
217 281
218# translate global coordinates to local coordinate system 282# translate global coordinates to local coordinate system
296 glVertex $x + $self->{w}, $y + $self->{h}; 360 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 361 glVertex $x , $y + $self->{h};
298 glEnd; 362 glEnd;
299 glDisable GL_BLEND; 363 glDisable GL_BLEND;
300 } 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 }
301} 379}
302 380
303sub _draw { 381sub _draw {
304 my ($self) = @_; 382 my ($self) = @_;
305 383
325} 403}
326 404
327sub check_size { 405sub check_size {
328 my ($self) = @_; 406 my ($self) = @_;
329 407
330 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} ||= {};
331 412
332 my ($w, $h) = $self->size_request; 413 $check_size->{$self} = $self;
333 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
334 if ($w != $self->{req_w} || $h != $self->{req_h}) { 436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w; 437 $self->{req_w} = $w;
336 $self->{req_h} = $h; 438 $self->{req_h} = $h;
337 439
338 $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
339 } 449 }
340} 450}
341 451
342sub update { 452sub update {
343 my ($self) = @_; 453 my ($self) = @_;
344 454
345 $self->{parent}->update 455 my $update = $CFClient::UI::ROOT->{_update} ||= {};
346 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 });
347} 468}
348 469
349sub connect { 470sub connect {
350 my ($self, $signal, $cb) = @_; 471 my ($self, $signal, $cb) = @_;
351 472
353} 474}
354 475
355sub emit { 476sub emit {
356 my ($self, $signal, @args) = @_; 477 my ($self, $signal, @args) = @_;
357 478
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 480}
362 481
363sub DESTROY { 482sub DESTROY {
364 my ($self) = @_; 483 my ($self) = @_;
365 484
432sub new { 551sub new {
433 my ($class, %arg) = @_; 552 my ($class, %arg) = @_;
434 553
435 my $children = delete $arg{children} || []; 554 my $children = delete $arg{children} || [];
436 555
437 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 );
438 $self->add ($_) for @$children; 561 $self->add ($_) for @$children;
439 562
440 $self 563 $self
441} 564}
442 565
443sub add { 566sub add {
444 my ($self, $child) = @_; 567 my ($self, @widgets) = @_;
445 568
446 $child->set_parent ($self); 569 $_->set_parent ($self)
570 for @widgets;
447 571
448 use sort 'stable'; 572 use sort 'stable';
449 573
450 $self->{children} = [ 574 $self->{children} = [
451 sort { $a->{z} <=> $b->{z} } 575 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 576 @{$self->{children}}, @widgets
453 ]; 577 ];
454 578
455 $child->check_size; 579 $_->check_size
580 for @widgets;
581
582 $self->update;
583}
584
585sub children {
586 @{ $_[0]{children} }
456} 587}
457 588
458sub remove { 589sub remove {
459 my ($self, $child) = @_; 590 my ($self, $child) = @_;
460 591
461 delete $child->{parent}; 592 delete $child->{parent};
593 $child->hide;
462 594
463 $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 }
464 611
465 $self->check_size; 612 $self->check_size;
466 $self->update; 613 $self->update;
467} 614}
468 615
546} 693}
547 694
548sub update { 695sub update {
549 my ($self) = @_; 696 my ($self) = @_;
550 697
551 # we want to do this delayed... 698 $ROOT->on_refresh ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 699 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 700}
565 701
566sub size_allocate { 702sub size_allocate {
567 my ($self, $w, $h) = @_; 703 my ($self, $w, $h) = @_;
568 704
569 $self->child->configure (0, 0, $w, $h); 705 $self->SUPER::size_allocate ($w, $h);
706 $self->update;
707}
570 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
571 $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 };
572} 729}
573 730
574sub _draw { 731sub _draw {
575 my ($self) = @_; 732 my ($self) = @_;
576 733
578 735
579 my $tex = $self->{texture} 736 my $tex = $self->{texture}
580 or return; 737 or return;
581 738
582 glEnable GL_BLEND; 739 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 741 glEnable GL_TEXTURE_2D;
585 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;
586 744
587 $tex->draw_quad (0, 0, $w, $h); 745 $tex->draw_quad (0, 0, $w, $h);
588 746
589 glDisable GL_BLEND; 747 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 748 glDisable GL_TEXTURE_2D;
594 752
595package CFClient::UI::ViewPort; 753package CFClient::UI::ViewPort;
596 754
597our @ISA = CFClient::UI::Window::; 755our @ISA = CFClient::UI::Window::;
598 756
599sub new { die }
600
601sub size_request { 757sub size_request {
602 my ($self) = @_; 758 my ($self) = @_;
603 759
604 @$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)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 761 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
606 762
607 @$self{qw(child_w child_h)} 763 @$self{qw(child_w child_h)}
608} 764}
609 765
610sub _draw { 766sub size_allocate {
611 my ($self) = @_; 767 my ($self, $w, $h) = @_;
612 768
613 $self->{children}[1]->draw; 769 $self->update;
614} 770}
615 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
616 842
617############################################################################# 843#############################################################################
618 844
619package CFClient::UI::Frame; 845package CFClient::UI::Frame;
620 846
631 border => 0.8, 857 border => 0.8,
632 @_ 858 @_
633 ); 859 );
634 860
635 $self 861 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643}
644
645sub size_request {
646 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h})
648}
649
650sub size_allocate {
651 my ($self, $w, $h) = @_;
652 $self->{w} = $w;
653 $self->{h} = $h;
654 $self->child->configure (0, 0, $w, $h);
655} 862}
656 863
657sub _draw { 864sub _draw {
658 my ($self) = @_; 865 my ($self) = @_;
659 866
694 my $class = shift; 901 my $class = shift;
695 902
696 # TODO: user_x, user_y, overwrite moveto? 903 # TODO: user_x, user_y, overwrite moveto?
697 904
698 my $self = $class->SUPER::new ( 905 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 906 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 907 border_bg => [1, 1, 1, 1],
701 border => 0.8, 908 border => 0.6,
702 can_events => 1, 909 can_events => 1,
703 @_ 910 @_
704 ); 911 );
705 912
706 $self->{title} &&= new CFClient::UI::Label 913 $self->{title} &&= new CFClient::UI::Label
707 align => 0, 914 align => 0,
708 valign => 1, 915 valign => 1,
709 text => $self->{title}, 916 text => $self->{title},
710 fontsize => 1; 917 fontsize => $self->{border};
711 918
712 $self 919 $self
713} 920}
714 921
715sub border { 922sub border {
716 int $_[0]{border} * $::FONTSIZE 923 int $_[0]{border} * $::FONTSIZE
717} 924}
718 925
719sub size_request { 926sub size_request {
720 my ($self) = @_; 927 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723 928
724 my ($w, $h) = $self->SUPER::size_request; 929 my ($w, $h) = $self->SUPER::size_request;
725 930
726 ( 931 (
727 $w + $self->border * 2, 932 $w + $self->border * 2,
742} 947}
743 948
744sub button_down { 949sub button_down {
745 my ($self, $ev, $x, $y) = @_; 950 my ($self, $ev, $x, $y) = @_;
746 951
952 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 953 my $border = $self->border;
748 954
749 if ($x < $self->{w} && $x >= $self->{w} - $border 955 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 956 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 957
958 if ($lr & $td) {
959 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 960 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 961 my ($bw, $bh) = ($self->{w}, $self->{h});
754 962
963 my $mx = $x < $border;
964 my $my = $y < $border;
965
755 $self->{motion} = sub { 966 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 967 my ($ev, $x, $y) = @_;
757 968
758 ($x, $y) = ($ev->{x}, $ev->{y}); 969 my $dx = $ev->{x} - $ox;
970 my $dy = $ev->{y} - $oy;
759 971
760 $self->{user_w} = $bw + $x - $ox; 972 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
761 $self->{user_h} = $bh + $y - $oy; 973 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
974 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
762 $self->check_size; 975 $self->check_size;
763 }; 976 };
764 977
765 } elsif ($x >= 0 && $x < $self->{w} 978 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 979 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 980 my ($bx, $by) = ($self->{x}, $self->{y});
770 981
771 $self->{motion} = sub { 982 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 983 my ($ev, $x, $y) = @_;
808 $tex[1]->draw_quad (0, 0, $w, $border); 1019 $tex[1]->draw_quad (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 1020 $tex[3]->draw_quad (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1022 $tex[4]->draw_quad (0, $h - $border, $w, $border);
812 1023
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813 my $bg = $tex[0]; 1025 my $bg = $tex[0];
814 1026
815 # TODO: repeat texture not scale 1027 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 1028 my $rep_x = $cw / $bg->{w};
817 my $rep_y = $ch / $bg->{h}; 1029 my $rep_y = $ch / $bg->{h};
818 1030
819 glColor @{ $self->{bg} }; 1031 glColor @{ $self->{bg} };
820 1032
821 $bg->{s} = $rep_x; 1033 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y; 1034 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1; 1035 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 1036 $bg->draw_quad ($border, $border, $cw, $ch);
825 1037
826 glDisable GL_TEXTURE_2D; 1038 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND; 1039 glDisable GL_BLEND;
1040 }
828 1041
829 $self->{title}->draw if $self->{title}; 1042 $self->{title}->draw if $self->{title};
1043
830 $self->child->draw; 1044 $self->child->draw;
831} 1045}
832 1046
833############################################################################# 1047#############################################################################
834 1048
856 $self->{children}[$y][$x] = $child; 1070 $self->{children}[$y][$x] = $child;
857 1071
858 $child->check_size; 1072 $child->check_size;
859} 1073}
860 1074
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
861# 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?
862sub clear { 1080sub clear {
863 my ($self) = @_; 1081 my ($self) = @_;
864 1082
1083 my @children = $self->children;
865 delete $self->{children}; 1084 delete $self->{children};
1085
1086 for (@children) {
1087 delete $_->{parent};
1088 $_->hide;
1089 }
1090
866 $self->update; 1091 $self->update;
867} 1092}
868 1093
869sub get_wh { 1094sub get_wh {
870 my ($self) = @_; 1095 my ($self) = @_;
1093 1318
1094sub new { 1319sub new {
1095 my ($class, %arg) = @_; 1320 my ($class, %arg) = @_;
1096 1321
1097 my $self = $class->SUPER::new ( 1322 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1323 fg => [1, 1, 1],
1324 #font => default_font
1099 fontsize => 1, 1325 fontsize => 1,
1100 text => "", 1326 text => "",
1101 align => -1, 1327 align => -1,
1102 valign => -1, 1328 valign => -1,
1103 padding => 2, 1329 padding => 2,
1104 layout => new CFClient::Layout, 1330 layout => new CFClient::Layout,
1105 can_events => 0, 1331 can_events => 0,
1106 %arg 1332 %arg
1107 ); 1333 );
1108 1334
1109 if (exists $self->{template}) { 1335 if (exists $self->{template}) {
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1342 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1117 1343
1118 $self 1344 $self
1119} 1345}
1120 1346
1121sub escape_text { 1347sub escape {
1122 local $_ = $_[1]; 1348 local $_ = $_[1];
1123 1349
1124 s/&/&amp;/g; 1350 s/&/&amp;/g;
1125 s/>/&gt;/g; 1351 s/>/&gt;/g;
1126 s/</&lt;/g; 1352 s/</&lt;/g;
1127 1353
1128 $_[1] 1354 $_[1]
1129} 1355}
1130 1356
1357sub update {
1358 my ($self) = @_;
1359
1360 delete $self->{texture};
1361 $self->SUPER::update;
1362}
1363
1131sub set_text { 1364sub set_text {
1132 my ($self, $text) = @_; 1365 my ($self, $text) = @_;
1133 1366
1367 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text";
1369
1134 $self->{layout}->set_text ($text); 1370 $self->{layout}->set_text ($text);
1135 1371
1136 delete $self->{texture}; 1372 delete $self->{texture};
1373 $self->update;
1137 $self->check_size; 1374 $self->check_size;
1138 $self->update;
1139} 1375}
1140 1376
1141sub set_markup { 1377sub set_markup {
1142 my ($self, $markup) = @_; 1378 my ($self, $markup) = @_;
1143 1379
1380 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup";
1382
1144 $self->{layout}->set_markup ($markup); 1383 $self->{layout}->set_markup ($markup);
1145 1384
1146 delete $self->{texture}; 1385 delete $self->{texture};
1386 $self->update;
1147 $self->check_size; 1387 $self->check_size;
1148 $self->update;
1149} 1388}
1150 1389
1151sub size_request { 1390sub size_request {
1152 my ($self) = @_; 1391 my ($self) = @_;
1153 1392
1154 $self->{layout}->set_width; 1393 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $self->{layout}->set_width ($self->{max_w} || -1);
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1396
1157 my ($w, $h) = $self->{layout}->size; 1397 my ($w, $h) = $self->{layout}->size;
1158 1398
1159 if (exists $self->{template}) { 1399 if (exists $self->{template}) {
1400 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1401 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1402
1162 my ($w2, $h2) = $self->{template}->size; 1403 my ($w2, $h2) = $self->{template}->size;
1163 1404
1164 $w = List::Util::max $w, $w2; 1405 $w = List::Util::max $w, $w2;
1179 1420
1180sub set_fontsize { 1421sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1422 my ($self, $fontsize) = @_;
1182 1423
1183 $self->{fontsize} = $fontsize; 1424 $self->{fontsize} = $fontsize;
1425 delete $self->{texture};
1426
1427 $self->update;
1184 $self->check_size; 1428 $self->check_size;
1185} 1429}
1186 1430
1187sub _draw { 1431sub _draw {
1188 my ($self) = @_; 1432 my ($self) = @_;
1189 1433
1190 my $tex = $self->{texture} ||= do { 1434 my $tex = $self->{texture} ||= do {
1435 $self->{layout}->set_font ($self->{font}) if $self->{font};
1191 $self->{layout}->set_width ($self->{w}); 1436 $self->{layout}->set_width ($self->{w});
1192 $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);
1193 new_from_layout CFClient::Texture $self->{layout} 1438 new_from_layout CFClient::Texture $self->{layout}
1194 }; 1439 };
1195 1440
1228 1473
1229sub new { 1474sub new {
1230 my $class = shift; 1475 my $class = shift;
1231 1476
1232 $class->SUPER::new ( 1477 $class->SUPER::new (
1233 fg => [1, 1, 1], 1478 fg => [1, 1, 1],
1234 bg => [0, 0, 0, 0.2], 1479 bg => [0, 0, 0, 0.2],
1235 active_bg => [1, 1, 1, 0.5], 1480 active_bg => [1, 1, 1, 0.5],
1236 active_fg => [0, 0, 0], 1481 active_fg => [0, 0, 0],
1237 can_hover => 1, 1482 can_hover => 1,
1238 can_focus => 1, 1483 can_focus => 1,
1239 valign => 0, 1484 valign => 0,
1240 can_events => 1, 1485 can_events => 1,
1241 @_ 1486 @_
1242 ) 1487 )
1243} 1488}
1244 1489
1398 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1399 1644
1400 my $sym = $ev->{sym}; 1645 my $sym = $ev->{sym};
1401 1646
1402 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} = '';
1403 $self->emit (activate => $self->get_text); 1652 $self->emit (activate => $txt);
1404 $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 }
1405 1676
1406 } else { 1677 } else {
1407 $self->SUPER::key_down ($ev); 1678 $self->SUPER::key_down ($ev);
1408 } 1679 }
1409 1680
1423 1694
1424sub new { 1695sub new {
1425 my $class = shift; 1696 my $class = shift;
1426 1697
1427 $class->SUPER::new ( 1698 $class->SUPER::new (
1428 padding => 4, 1699 padding => 4,
1429 fg => [1, 1, 1], 1700 fg => [1, 1, 1],
1430 bg => [1, 1, 1, 0.2], 1701 bg => [1, 1, 1, 0.2],
1431 active_fg => [0, 0, 1], 1702 active_fg => [0, 0, 1],
1432 can_hover => 1, 1703 can_hover => 1,
1433 align => 0, 1704 align => 0,
1434 valign => 0, 1705 valign => 0,
1435 can_events => 1, 1706 can_events => 1,
1436 @_ 1707 @_
1437 ) 1708 )
1438} 1709}
1439 1710
1598 1869
1599package CFClient::UI::VGauge; 1870package CFClient::UI::VGauge;
1600 1871
1601our @ISA = CFClient::UI::Base::; 1872our @ISA = CFClient::UI::Base::;
1602 1873
1874use List::Util qw(min max);
1875
1603use CFClient::OpenGL; 1876use CFClient::OpenGL;
1604 1877
1605my %tex = ( 1878my %tex = (
1606 food => [ 1879 food => [
1607 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1880 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1608 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1881 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1609 ], 1882 ],
1610 grace => [ 1883 grace => [
1611 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1884 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1612 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/
1613 ], 1886 ],
1614 hp => [ 1887 hp => [
1615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1616 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1889 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1617 ], 1890 ],
1618 mana => [ 1891 mana => [
1619 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1892 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1620 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/
1621 ], 1894 ],
1622); 1895);
1623 1896
1624# eg. VGauge->new (gauge => 'food'), default gauge: food 1897# eg. VGauge->new (gauge => 'food'), default gauge: food
1625sub new { 1898sub new {
1644} 1917}
1645 1918
1646sub set_max { 1919sub set_max {
1647 my ($self, $max) = @_; 1920 my ($self, $max) = @_;
1648 1921
1922 return if $self->{max_val} == $max;
1923
1649 $self->{max_val} = $max; 1924 $self->{max_val} = $max;
1925 $self->update;
1650} 1926}
1651 1927
1652sub set_value { 1928sub set_value {
1653 my ($self, $val, $max) = @_; 1929 my ($self, $val, $max) = @_;
1654 1930
1655 $self->set_max ($max) 1931 $self->set_max ($max)
1656 if defined $max; 1932 if defined $max;
1657 1933
1658 $max = $self->{max_val}; 1934 return if $self->{val} == $val;
1935
1659 $self->{val} = $val; 1936 $self->{val} = $val;
1660
1661 $self->update; 1937 $self->update;
1662} 1938}
1663 1939
1664sub _draw { 1940sub _draw {
1665 my ($self) = @_; 1941 my ($self) = @_;
1666 1942
1667 my $tex = $tex{$self->{type}}; 1943 my $tex = $tex{$self->{type}};
1944 my ($t1, $t2, $t3) = @$tex;
1668 1945
1669 my ($w, $h) = ($self->{w}, $self->{h}); 1946 my ($w, $h) = ($self->{w}, $self->{h});
1670 1947
1671 if ($self->{vertical}) { 1948 if ($self->{vertical}) {
1672 glRotate 90, 0, 0, 1; 1949 glRotate 90, 0, 0, 1;
1674 1951
1675 ($w, $h) = ($h, $w); 1952 ($w, $h) = ($h, $w);
1676 } 1953 }
1677 1954
1678 my $ycut = $self->{val} / ($self->{max_val} || 1); 1955 my $ycut = $self->{val} / ($self->{max_val} || 1);
1679 $ycut = 1 if $self->{val} > $self->{max_val};
1680 1956
1681 my $t1 = $tex->[0]; 1957 my $ycut1 = max 0, min 1, $ycut;
1682 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);
1683 1962
1684 glEnable GL_BLEND; 1963 glEnable GL_BLEND;
1685 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1964 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1686 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1687 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1688 1967
1689 my $h1 = $self->{h} - $ycut * $self->{h};
1690 my $h2 = $ycut * $self->{h};
1691
1692 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1968 glBindTexture GL_TEXTURE_2D, $t1->{name};
1693 glBegin GL_QUADS; 1969 glBegin GL_QUADS;
1694 glTexCoord 0 , 0; glVertex 0 , 0; 1970 glTexCoord 0 , 0; glVertex 0 , 0;
1695 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1971 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1696 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1972 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1697 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1973 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1698 glEnd; 1974 glEnd;
1699 1975
1976 my $ycut1 = List::Util::min 1, $ycut;
1700 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1977 glBindTexture GL_TEXTURE_2D, $t2->{name};
1701 glBegin GL_QUADS; 1978 glBegin GL_QUADS;
1702 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1979 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1980 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1704 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1981 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1705 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1982 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1706 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 }
1707 1994
1708 glDisable GL_BLEND; 1995 glDisable GL_BLEND;
1709 glDisable GL_TEXTURE_2D; 1996 glDisable GL_TEXTURE_2D;
1710} 1997}
1711 1998
1717 2004
1718sub new { 2005sub new {
1719 my ($class, %arg) = @_; 2006 my ($class, %arg) = @_;
1720 2007
1721 my $self = $class->SUPER::new ( 2008 my $self = $class->SUPER::new (
1722 tooltip => $arg{type}, 2009 tooltip => $arg{type},
2010 can_hover => 1,
2011 can_events => 1,
1723 %arg, 2012 %arg,
1724 ); 2013 );
1725 2014
1726 $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");
1727 $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);
1728 $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");
1729 2018
1730 $self 2019 $self
1731} 2020}
1732 2021
1735 2024
1736 $self->{value}->set_fontsize ($fsize); 2025 $self->{value}->set_fontsize ($fsize);
1737 $self->{max} ->set_fontsize ($fsize); 2026 $self->{max} ->set_fontsize ($fsize);
1738} 2027}
1739 2028
2029sub set_max {
2030 my ($self, $max) = @_;
2031
2032 $self->{gauge}->set_max ($max);
2033 $self->{max}->set_text ($max);
2034}
2035
1740sub set_value { 2036sub set_value {
1741 my ($self, $val, $max) = @_; 2037 my ($self, $val, $max) = @_;
1742 2038
1743 $self->set_max ($max) 2039 $self->set_max ($max)
1744 if defined $max; 2040 if defined $max;
1745 2041
1746 $self->{gauge}->set_value ($val, $max); 2042 $self->{gauge}->set_value ($val, $max);
1747 $self->{value}->set_text ($val); 2043 $self->{value}->set_text ($val);
1748}
1749
1750sub set_max {
1751 my ($self, $max) = @_;
1752
1753 $self->{gauge}->set_max ($max);
1754 $self->{max}->set_text ($max);
1755} 2044}
1756 2045
1757############################################################################# 2046#############################################################################
1758 2047
1759package CFClient::UI::Slider; 2048package CFClient::UI::Slider;
1778 # TODO: calculations are off 2067 # TODO: calculations are off
1779 my $self = $class->SUPER::new ( 2068 my $self = $class->SUPER::new (
1780 fg => [1, 1, 1], 2069 fg => [1, 1, 1],
1781 active_fg => [0, 0, 0], 2070 active_fg => [0, 0, 0],
1782 range => [0, 0, 100, 10], 2071 range => [0, 0, 100, 10],
1783 req_w => 20, 2072 req_w => $::WIDTH / 80,
1784 req_h => 20, 2073 req_h => $::WIDTH / 80,
1785 vertical => 0, 2074 vertical => 0,
1786 can_hover => 1, 2075 can_hover => 1,
1787 inner_pad => 5, 2076 inner_pad => 5,
1788 @_ 2077 @_
1789 ); 2078 );
1899 2188
1900sub new { 2189sub new {
1901 my $class = shift; 2190 my $class = shift;
1902 2191
1903 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
1904 fontsize => 1, 2193 fontsize => 1,
2194 can_events => 0,
2195 #font => default_font
1905 @_, 2196 @_,
1906 2197
1907 layout => (new CFClient::Layout), 2198 layout => (new CFClient::Layout),
1908 par => [], 2199 par => [],
1909 height => 0, 2200 height => 0,
1910 children => [ 2201 children => [
1911 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
1912 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
1913 ], 2204 ],
1914 ); 2205 );
1915 2206
1916 $self->{children}[1]->connect (changed => sub { 2207 $self->{children}[1]->connect (changed => sub { $self->update });
1917 $self->update;
1918 });
1919 2208
1920 $self 2209 $self
1921} 2210}
1922 2211
1923sub set_fontsize { 2212sub set_fontsize {
1931 my ($self, $text) = @_; 2220 my ($self, $text) = @_;
1932 2221
1933 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
1934 2223
1935 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1936 $layout->set_width ($self->{w}); 2225 $layout->set_width ($self->{children}[0]{w});
1937 $layout->set_text ($text); 2226 $layout->set_text ($text);
1938 2227
1939 ($layout->size)[1] 2228 ($layout->size)[1]
1940} 2229}
1941 2230
1949sub size_allocate { 2238sub size_allocate {
1950 my ($self, $w, $h) = @_; 2239 my ($self, $w, $h) = @_;
1951 2240
1952 $self->SUPER::size_allocate ($w, $h); 2241 $self->SUPER::size_allocate ($w, $h);
1953 2242
2243 $self->{layout}->set_font ($self->{font}) if $self->{font};
1954 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2244 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $self->{layout}->set_width ($self->{children}[0]{w}); 2245 $self->{layout}->set_width ($self->{children}[0]{w});
1956 2246
1957 $self->reflow; 2247 $self->reflow;
1958} 2248}
1993 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1994 2284
1995 delete $self->{texture}; 2285 delete $self->{texture};
1996 } 2286 }
1997 2287
1998 $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 {
1999 glClearColor 0, 0, 0, 1; 2289 glClearColor 0, 0, 0, 0;
2000 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
2001 2291
2002 glEnable GL_BLEND; 2292 glEnable GL_BLEND;
2003 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2004 glEnable GL_TEXTURE_2D; 2294 glEnable GL_TEXTURE_2D;
2011 2301
2012 my $y = 0; 2302 my $y = 0;
2013 2303
2014 my $layout = $self->{layout}; 2304 my $layout = $self->{layout};
2015 2305
2306 $layout->set_font ($self->{font}) if $self->{font};
2307
2016 for my $par (@{$self->{par}}) { 2308 for my $par (@{$self->{par}}) {
2017 my $h = $par->[0]; 2309 my $h = $par->[0];
2018 2310
2019 if ($y0 < $y + $h && $y < $y1) { 2311 if ($y0 < $y + $h && $y < $y1) {
2020 $layout->set_text ($par->[2]); 2312 $layout->set_text ($par->[2]);
2034} 2326}
2035 2327
2036sub _draw { 2328sub _draw {
2037 my ($self) = @_; 2329 my ($self) = @_;
2038 2330
2039 if ($self->{texture}) { 2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2040 glEnable GL_TEXTURE_2D; 2333 glEnable GL_TEXTURE_2D;
2041 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;
2042 $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});
2043 glDisable GL_TEXTURE_2D; 2337 glDisable GL_TEXTURE_2D;
2044 } 2338 glDisable GL_BLEND;
2045 2339
2046 $self->{children}[1]->draw; 2340 $self->{children}[1]->draw;
2047 2341
2048} 2342}
2049 2343
2097 2391
2098sub new { 2392sub new {
2099 my $class = shift; 2393 my $class = shift;
2100 2394
2101 my $self = $class->SUPER::new ( 2395 my $self = $class->SUPER::new (
2102 state => 0, 2396 state => 0,
2103 connect_activate => \&toggle_flopper, 2397 connect_activate => \&toggle_flopper,
2104 can_events => 1,
2105 @_ 2398 @_
2106 ); 2399 );
2107 2400
2108 if ($self->{state}) { 2401 if ($self->{state}) {
2109 $self->{state} = 0; 2402 $self->{state} = 0;
2129 $self->emit (changed => $self->{state}); 2422 $self->emit (changed => $self->{state});
2130} 2423}
2131 2424
2132############################################################################# 2425#############################################################################
2133 2426
2427package CFClient::UI::Tooltip;
2428
2429our @ISA = CFClient::UI::Bin::;
2430
2431use CFClient::OpenGL;
2432
2433sub new {
2434 my $class = shift;
2435
2436 $class->SUPER::new (
2437 @_,
2438 can_events => 0,
2439 )
2440}
2441
2442sub set_markup {
2443 my ($self, $text) = @_;
2444
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2446 $self->{label}->set_markup ($text);
2447 $self->add ($self->{label});
2448}
2449
2450sub size_request {
2451 my ($self) = @_;
2452
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456
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);
2464}
2465
2466sub _draw {
2467 my ($self) = @_;
2468
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375;
2471
2472 my ($w, $h) = @$self{qw(w h)};
2473
2474 glColor 1, 0.8, 0.4;
2475 glBegin GL_QUADS;
2476 glVertex 0 , 0;
2477 glVertex 0 , $h;
2478 glVertex $w, $h;
2479 glVertex $w, 0;
2480 glEnd;
2481
2482 glColor 0, 0, 0;
2483 glBegin GL_LINE_LOOP;
2484 glVertex 0 , 0;
2485 glVertex 0 , $h;
2486 glVertex $w, $h;
2487 glVertex $w, 0;
2488 glEnd;
2489
2490 glPopMatrix;
2491
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw;
2494}
2495
2496#############################################################################
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
2134package CFClient::UI::Root; 2715package CFClient::UI::Root;
2135 2716
2136our @ISA = CFClient::UI::Container::; 2717our @ISA = CFClient::UI::Container::;
2137 2718
2138use CFClient::OpenGL; 2719use CFClient::OpenGL;
2139 2720
2140sub check_size { 2721sub check_size {
2141 my ($self) = @_; 2722 my ($self) = @_;
2142 2723
2143 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2724 $self->configure (0, 0, $self->{w}, $self->{h});
2144} 2725}
2145 2726
2146sub size_request { 2727sub size_request {
2147 ($::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;
2148} 2754}
2149 2755
2150sub configure { 2756sub configure {
2151 my ($self, $x, $y, $w, $h) = @_; 2757 my ($self, $x, $y, $w, $h) = @_;
2152 2758
2153 $self->SUPER::configure ($x, $y, $w, $h); 2759 $self->SUPER::configure ($x, $y, $w, $h);
2154 2760
2155 for my $child (@{$self->{children}}) { 2761 for my $child ($self->children) {
2156 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)};
2157 2763
2158 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2764 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2159 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2765 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2160 $child->configure ($X, $Y, $W,$H); 2766 $child->configure ($X, $Y, $W, $H);
2161 } 2767 }
2162} 2768}
2163 2769
2164sub _topleft { 2770sub _topleft {
2165 my ($self, $x, $y) = @_; 2771 my ($self, $x, $y) = @_;
2213############################################################################# 2819#############################################################################
2214 2820
2215package CFClient::UI; 2821package CFClient::UI;
2216 2822
2217$ROOT = new CFClient::UI::Root; 2823$ROOT = new CFClient::UI::Root;
2218$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 2824$TOOLTIP = new CFClient::UI::Tooltip;
2219 2825
22201 28261
2221 2827

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines