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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.153 by root, Sun Apr 23 02:14:33 2006 UTC vs.
Revision 1.189 by root, Mon May 8 22:17:24 2006 UTC

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

Diff Legend

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