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.182 by root, Sun Apr 30 11:17:08 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 $_->check_size;
261}
262
263sub set_max_size {
264 my ($self, $w, $h) = @_;
265
266 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h;
209} 268}
210 269
211# return top left coordinates 270# return top left coordinates
212sub _topleft { 271sub _topleft {
213 my ($self, $x, $y) = @_; 272 my ($self, $x, $y) = @_;
273
274 $self->{parent}
275 or Carp::confess "no parent widget in _topleft\n";#d#
214 276
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
216} 278}
217 279
218# translate global coordinates to local coordinate system 280# translate global coordinates to local coordinate system
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 358 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 359 glVertex $x , $y + $self->{h};
298 glEnd; 360 glEnd;
299 glDisable GL_BLEND; 361 glDisable GL_BLEND;
300 } 362 }
363
364 if ($ENV{PCLIENT_DEBUG}) {
365 glPushMatrix;
366 glColor 1, 1, 0, 1;
367 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368 glBegin GL_LINE_LOOP;
369 glVertex 0 , 0;
370 glVertex $self->{w}, 0;
371 glVertex $self->{w}, $self->{h};
372 glVertex 0 , $self->{h};
373 glEnd;
374 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 }
301} 377}
302 378
303sub _draw { 379sub _draw {
304 my ($self) = @_; 380 my ($self) = @_;
305 381
… …
325} 401}
326 402
327sub check_size { 403sub check_size {
328 my ($self) = @_; 404 my ($self) = @_;
329 405
330 return unless $self->{parent}; 406 $self->{parent}
407 or return 1;
331 408
332 my ($w, $h) = $self->size_request; 409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
333 412
334 if ($w != $self->{req_w} || $h != $self->{req_h}) { 413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w; 414 $self->{req_w} = $w;
336 $self->{req_h} = $h; 415 $self->{req_h} = $h;
337 416
338 $self->{parent}->check_size; 417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
339 } 426 }
340} 427}
341 428
342sub update { 429sub update {
343 my ($self) = @_; 430 my ($self) = @_;
… …
353} 440}
354 441
355sub emit { 442sub emit {
356 my ($self, $signal, @args) = @_; 443 my ($self, $signal, @args) = @_;
357 444
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 446}
362 447
363sub DESTROY { 448sub DESTROY {
364 my ($self) = @_; 449 my ($self) = @_;
365 450
… …
432sub new { 517sub new {
433 my ($class, %arg) = @_; 518 my ($class, %arg) = @_;
434 519
435 my $children = delete $arg{children} || []; 520 my $children = delete $arg{children} || [];
436 521
437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 522 my $self = $class->SUPER::new (
523 children => [],
524 can_events => 0,
525 %arg,
526 );
438 $self->add ($_) for @$children; 527 $self->add ($_) for @$children;
439 528
440 $self 529 $self
441} 530}
442 531
… …
451 sort { $a->{z} <=> $b->{z} } 540 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 541 @{$self->{children}}, $child
453 ]; 542 ];
454 543
455 $child->check_size; 544 $child->check_size;
545 $self->update;
546}
547
548sub children {
549 @{ $_[0]{children} }
456} 550}
457 551
458sub remove { 552sub remove {
459 my ($self, $child) = @_; 553 my ($self, $child) = @_;
460 554
461 delete $child->{parent}; 555 delete $child->{parent};
556 $child->hide;
462 557
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559
560 $self->check_size;
561 $self->update;
562}
563
564sub clear {
565 my ($self) = @_;
566
567 my $children = delete $self->{children};
568 $self->{children} = [];
569
570 for (@$children) {
571 delete $_->{parent};
572 $_->hide;
573 }
464 574
465 $self->check_size; 575 $self->check_size;
466 $self->update; 576 $self->update;
467} 577}
468 578
… …
546} 656}
547 657
548sub update { 658sub update {
549 my ($self) = @_; 659 my ($self) = @_;
550 660
551 # we want to do this delayed... 661 $ROOT->on_refresh ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 662 $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} 663}
565 664
566sub size_allocate { 665sub size_allocate {
567 my ($self, $w, $h) = @_; 666 my ($self, $w, $h) = @_;
568 667
569 $self->child->configure (0, 0, $w, $h); 668 $self->SUPER::size_allocate ($w, $h);
669 $self->update;
670}
570 671
672sub _render {
673 $_[0]{children}[0]->draw;
674}
675
676sub render_child {
677 my ($self) = @_;
678
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT;
682
571 $self->render_chld; 683 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 };
572} 692}
573 693
574sub _draw { 694sub _draw {
575 my ($self) = @_; 695 my ($self) = @_;
576 696
… …
578 698
579 my $tex = $self->{texture} 699 my $tex = $self->{texture}
580 or return; 700 or return;
581 701
582 glEnable GL_BLEND; 702 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
585 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1;
586 707
587 $tex->draw_quad (0, 0, $w, $h); 708 $tex->draw_quad (0, 0, $w, $h);
588 709
589 glDisable GL_BLEND; 710 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 711 glDisable GL_TEXTURE_2D;
… …
594 715
595package CFClient::UI::ViewPort; 716package CFClient::UI::ViewPort;
596 717
597our @ISA = CFClient::UI::Window::; 718our @ISA = CFClient::UI::Window::;
598 719
599sub new { die }
600
601sub size_request { 720sub size_request {
602 my ($self) = @_; 721 my ($self) = @_;
603 722
604 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 723 @$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)}); 724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
606 725
607 @$self{qw(child_w child_h)} 726 @$self{qw(child_w child_h)}
608} 727}
609 728
610sub _draw { 729sub size_allocate {
611 my ($self) = @_; 730 my ($self, $w, $h) = @_;
612 731
613 $self->{children}[1]->draw; 732 $self->update;
614} 733}
615 734
735sub set_offset {
736 my ($self, $x, $y) = @_;
737
738 $self->{view_x} = int $x;
739 $self->{view_y} = int $y;
740
741 $self->update;
742}
743
744sub _render {
745 my ($self) = @_;
746
747 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748
749 $self->SUPER::_render;
750}
751
752#############################################################################
753
754package CFClient::UI::ScrolledWindow;
755
756our @ISA = CFClient::UI::HBox::;
757
758sub new {
759 my $class = shift;
760
761 my $self;
762
763 my $slider = new CFClient::UI::Slider
764 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
768 },
769 ;
770
771 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort),
773 slider => $slider,
774 @_,
775 );
776
777 $self->{vp}->add ($self->{scrolled});
778 $self->add ($self->{vp});
779 $self->add ($self->{slider});
780
781 $self
782}
783
784#TODO# update range on size_allocate depeneing on child
785# update viewport offset on scroll
616 786
617############################################################################# 787#############################################################################
618 788
619package CFClient::UI::Frame; 789package CFClient::UI::Frame;
620 790
… …
631 border => 0.8, 801 border => 0.8,
632 @_ 802 @_
633 ); 803 );
634 804
635 $self 805 $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} 806}
656 807
657sub _draw { 808sub _draw {
658 my ($self) = @_; 809 my ($self) = @_;
659 810
… …
694 my $class = shift; 845 my $class = shift;
695 846
696 # TODO: user_x, user_y, overwrite moveto? 847 # TODO: user_x, user_y, overwrite moveto?
697 848
698 my $self = $class->SUPER::new ( 849 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 850 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 851 border_bg => [1, 1, 1, 1],
701 border => 0.8, 852 border => 0.6,
702 can_events => 1, 853 can_events => 1,
703 @_ 854 @_
704 ); 855 );
705 856
706 $self->{title} &&= new CFClient::UI::Label 857 $self->{title} &&= new CFClient::UI::Label
707 align => 0, 858 align => 0,
708 valign => 1, 859 valign => 1,
709 text => $self->{title}, 860 text => $self->{title},
710 fontsize => 1; 861 fontsize => $self->{border};
711 862
712 $self 863 $self
713} 864}
714 865
715sub border { 866sub border {
716 int $_[0]{border} * $::FONTSIZE 867 int $_[0]{border} * $::FONTSIZE
717} 868}
718 869
719sub size_request { 870sub size_request {
720 my ($self) = @_; 871 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723 872
724 my ($w, $h) = $self->SUPER::size_request; 873 my ($w, $h) = $self->SUPER::size_request;
725 874
726 ( 875 (
727 $w + $self->border * 2, 876 $w + $self->border * 2,
… …
742} 891}
743 892
744sub button_down { 893sub button_down {
745 my ($self, $ev, $x, $y) = @_; 894 my ($self, $ev, $x, $y) = @_;
746 895
896 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 897 my $border = $self->border;
748 898
749 if ($x < $self->{w} && $x >= $self->{w} - $border 899 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 900 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 901
902 if ($lr & $td) {
903 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 904 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 905 my ($bw, $bh) = ($self->{w}, $self->{h});
754 906
907 my $mx = $x < $border;
908 my $my = $y < $border;
909
755 $self->{motion} = sub { 910 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 911 my ($ev, $x, $y) = @_;
757 912
758 ($x, $y) = ($ev->{x}, $ev->{y}); 913 my $dx = $ev->{x} - $ox;
914 my $dy = $ev->{y} - $oy;
759 915
760 $self->{user_w} = $bw + $x - $ox; 916 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
761 $self->{user_h} = $bh + $y - $oy; 917 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
918 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
762 $self->check_size; 919 $self->check_size;
763 }; 920 };
764 921
765 } elsif ($x >= 0 && $x < $self->{w} 922 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 924 my ($bx, $by) = ($self->{x}, $self->{y});
770 925
771 $self->{motion} = sub { 926 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 927 my ($ev, $x, $y) = @_;
… …
808 $tex[1]->draw_quad (0, 0, $w, $border); 963 $tex[1]->draw_quad (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 964 $tex[3]->draw_quad (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 966 $tex[4]->draw_quad (0, $h - $border, $w, $border);
812 967
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813 my $bg = $tex[0]; 969 my $bg = $tex[0];
814 970
815 # TODO: repeat texture not scale 971 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 972 my $rep_x = $cw / $bg->{w};
817 my $rep_y = $ch / $bg->{h}; 973 my $rep_y = $ch / $bg->{h};
818 974
819 glColor @{ $self->{bg} }; 975 glColor @{ $self->{bg} };
820 976
821 $bg->{s} = $rep_x; 977 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y; 978 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1; 979 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 980 $bg->draw_quad ($border, $border, $cw, $ch);
825 981
826 glDisable GL_TEXTURE_2D; 982 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND; 983 glDisable GL_BLEND;
984 }
828 985
829 $self->{title}->draw if $self->{title}; 986 $self->{title}->draw if $self->{title};
987
830 $self->child->draw; 988 $self->child->draw;
831} 989}
832 990
833############################################################################# 991#############################################################################
834 992
… …
856 $self->{children}[$y][$x] = $child; 1014 $self->{children}[$y][$x] = $child;
857 1015
858 $child->check_size; 1016 $child->check_size;
859} 1017}
860 1018
1019sub children {
1020 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1021}
1022
861# TODO: move to container class maybe? send childs a signal on removal? 1023# TODO: move to container class maybe? send childs a signal on removal?
862sub clear { 1024sub clear {
863 my ($self) = @_; 1025 my ($self) = @_;
864 1026
1027 my @children = $self->children;
865 delete $self->{children}; 1028 delete $self->{children};
1029
1030 for (@children) {
1031 delete $_->{parent};
1032 $_->hide;
1033 }
1034
866 $self->update; 1035 $self->update;
867} 1036}
868 1037
869sub get_wh { 1038sub get_wh {
870 my ($self) = @_; 1039 my ($self) = @_;
… …
1093 1262
1094sub new { 1263sub new {
1095 my ($class, %arg) = @_; 1264 my ($class, %arg) = @_;
1096 1265
1097 my $self = $class->SUPER::new ( 1266 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1267 fg => [1, 1, 1],
1268 #font => default_font
1099 fontsize => 1, 1269 fontsize => 1,
1100 text => "", 1270 text => "",
1101 align => -1, 1271 align => -1,
1102 valign => -1, 1272 valign => -1,
1103 padding => 2, 1273 padding => 2,
1104 layout => new CFClient::Layout, 1274 layout => new CFClient::Layout,
1105 can_events => 0, 1275 can_events => 0,
1106 %arg 1276 %arg
1107 ); 1277 );
1108 1278
1109 if (exists $self->{template}) { 1279 if (exists $self->{template}) {
… …
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1117 1287
1118 $self 1288 $self
1119} 1289}
1120 1290
1121sub escape_text { 1291sub escape {
1122 local $_ = $_[1]; 1292 local $_ = $_[1];
1123 1293
1124 s/&/&amp;/g; 1294 s/&/&amp;/g;
1125 s/>/&gt;/g; 1295 s/>/&gt;/g;
1126 s/</&lt;/g; 1296 s/</&lt;/g;
1127 1297
1128 $_[1] 1298 $_[1]
1129} 1299}
1130 1300
1301sub update {
1302 my ($self) = @_;
1303
1304 delete $self->{texture};
1305 $self->SUPER::update;
1306}
1307
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1131sub set_text { 1314sub set_text {
1132 my ($self, $text) = @_; 1315 my ($self, $text) = @_;
1133 1316
1317 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text";
1319
1134 $self->{layout}->set_text ($text); 1320 $self->{layout}->set_text ($text);
1135 1321
1136 delete $self->{texture}; 1322 delete $self->{texture};
1323 $self->update;
1137 $self->check_size; 1324 $self->check_size;
1138 $self->update;
1139} 1325}
1140 1326
1141sub set_markup { 1327sub set_markup {
1142 my ($self, $markup) = @_; 1328 my ($self, $markup) = @_;
1143 1329
1330 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup";
1332
1144 $self->{layout}->set_markup ($markup); 1333 $self->{layout}->set_markup ($markup);
1145 1334
1146 delete $self->{texture}; 1335 delete $self->{texture};
1336 $self->update;
1147 $self->check_size; 1337 $self->check_size;
1148 $self->update;
1149} 1338}
1150 1339
1151sub size_request { 1340sub size_request {
1152 my ($self) = @_; 1341 my ($self) = @_;
1153 1342
1154 $self->{layout}->set_width; 1343 $self->{layout}->set_font ($self->{font}) if $self->{font};
1344 $self->{layout}->set_width ($self->{max_w} || -1);
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1345 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1346
1157 my ($w, $h) = $self->{layout}->size; 1347 my ($w, $h) = $self->{layout}->size;
1158 1348
1159 if (exists $self->{template}) { 1349 if (exists $self->{template}) {
1350 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1351 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1352
1162 my ($w2, $h2) = $self->{template}->size; 1353 my ($w2, $h2) = $self->{template}->size;
1163 1354
1164 $w = List::Util::max $w, $w2; 1355 $w = List::Util::max $w, $w2;
… …
1188 1379
1189sub _draw { 1380sub _draw {
1190 my ($self) = @_; 1381 my ($self) = @_;
1191 1382
1192 my $tex = $self->{texture} ||= do { 1383 my $tex = $self->{texture} ||= do {
1384 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{w}); 1385 $self->{layout}->set_width ($self->{w});
1194 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1195 new_from_layout CFClient::Texture $self->{layout} 1387 new_from_layout CFClient::Texture $self->{layout}
1196 }; 1388 };
1197 1389
… …
1230 1422
1231sub new { 1423sub new {
1232 my $class = shift; 1424 my $class = shift;
1233 1425
1234 $class->SUPER::new ( 1426 $class->SUPER::new (
1235 fg => [1, 1, 1], 1427 fg => [1, 1, 1],
1236 bg => [0, 0, 0, 0.2], 1428 bg => [0, 0, 0, 0.2],
1237 active_bg => [1, 1, 1, 0.5], 1429 active_bg => [1, 1, 1, 0.5],
1238 active_fg => [0, 0, 0], 1430 active_fg => [0, 0, 0],
1239 can_hover => 1, 1431 can_hover => 1,
1240 can_focus => 1, 1432 can_focus => 1,
1241 valign => 0, 1433 valign => 0,
1242 can_events => 1, 1434 can_events => 1,
1243 @_ 1435 @_
1244 ) 1436 )
1245} 1437}
1246 1438
… …
1400 my ($self, $ev) = @_; 1592 my ($self, $ev) = @_;
1401 1593
1402 my $sym = $ev->{sym}; 1594 my $sym = $ev->{sym};
1403 1595
1404 if ($sym == 13) { 1596 if ($sym == 13) {
1597 unshift @{$self->{history}},
1598 my $txt = $self->get_text;
1599 $self->{history_pointer} = -1;
1600 $self->{history_saveback} = '';
1405 $self->emit (activate => $self->get_text); 1601 $self->emit (activate => $txt);
1406 $self->update; 1602 $self->update;
1603
1604 } elsif ($sym == CFClient::SDLK_UP) {
1605 if ($self->{history_pointer} < 0) {
1606 $self->{history_saveback} = $self->get_text;
1607 }
1608 if (@{$self->{history} || []} > 0) {
1609 $self->{history_pointer}++;
1610 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1611 $self->{history_pointer} = @{$self->{history} || []} - 1;
1612 }
1613 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1614 }
1615
1616 } elsif ($sym == CFClient::SDLK_DOWN) {
1617 $self->{history_pointer}--;
1618 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1619
1620 if ($self->{history_pointer} >= 0) {
1621 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1622 } else {
1623 $self->set_text ($self->{history_saveback});
1624 }
1407 1625
1408 } else { 1626 } else {
1409 $self->SUPER::key_down ($ev); 1627 $self->SUPER::key_down ($ev);
1410 } 1628 }
1411 1629
… …
1425 1643
1426sub new { 1644sub new {
1427 my $class = shift; 1645 my $class = shift;
1428 1646
1429 $class->SUPER::new ( 1647 $class->SUPER::new (
1430 padding => 4, 1648 padding => 4,
1431 fg => [1, 1, 1], 1649 fg => [1, 1, 1],
1432 bg => [1, 1, 1, 0.2], 1650 bg => [1, 1, 1, 0.2],
1433 active_fg => [0, 0, 1], 1651 active_fg => [0, 0, 1],
1434 can_hover => 1, 1652 can_hover => 1,
1435 align => 0, 1653 align => 0,
1436 valign => 0, 1654 valign => 0,
1437 can_events => 1, 1655 can_events => 1,
1438 @_ 1656 @_
1439 ) 1657 )
1440} 1658}
1441 1659
… …
1600 1818
1601package CFClient::UI::VGauge; 1819package CFClient::UI::VGauge;
1602 1820
1603our @ISA = CFClient::UI::Base::; 1821our @ISA = CFClient::UI::Base::;
1604 1822
1823use List::Util qw(min max);
1824
1605use CFClient::OpenGL; 1825use CFClient::OpenGL;
1606 1826
1607my %tex = ( 1827my %tex = (
1608 food => [ 1828 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1829 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1830 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1831 ],
1612 grace => [ 1832 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1834 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1615 ], 1835 ],
1616 hp => [ 1836 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1837 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1838 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 1839 ],
1620 mana => [ 1840 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1841 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1842 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1623 ], 1843 ],
1624); 1844);
1625 1845
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 1846# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 1847sub new {
… …
1646} 1866}
1647 1867
1648sub set_max { 1868sub set_max {
1649 my ($self, $max) = @_; 1869 my ($self, $max) = @_;
1650 1870
1871 return if $self->{max_val} == $max;
1872
1651 $self->{max_val} = $max; 1873 $self->{max_val} = $max;
1874 $self->update;
1652} 1875}
1653 1876
1654sub set_value { 1877sub set_value {
1655 my ($self, $val, $max) = @_; 1878 my ($self, $val, $max) = @_;
1656 1879
1657 $self->set_max ($max) 1880 $self->set_max ($max)
1658 if defined $max; 1881 if defined $max;
1659 1882
1660 $max = $self->{max_val}; 1883 return if $self->{val} == $val;
1884
1661 $self->{val} = $val; 1885 $self->{val} = $val;
1662
1663 $self->update; 1886 $self->update;
1664} 1887}
1665 1888
1666sub _draw { 1889sub _draw {
1667 my ($self) = @_; 1890 my ($self) = @_;
1668 1891
1669 my $tex = $tex{$self->{type}}; 1892 my $tex = $tex{$self->{type}};
1893 my ($t1, $t2, $t3) = @$tex;
1670 1894
1671 my ($w, $h) = ($self->{w}, $self->{h}); 1895 my ($w, $h) = ($self->{w}, $self->{h});
1672 1896
1673 if ($self->{vertical}) { 1897 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 1898 glRotate 90, 0, 0, 1;
… …
1676 1900
1677 ($w, $h) = ($h, $w); 1901 ($w, $h) = ($h, $w);
1678 } 1902 }
1679 1903
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 1904 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 1905
1683 my $t1 = $tex->[0]; 1906 my $ycut1 = max 0, min 1, $ycut;
1684 my $t2 = $tex->[1]; 1907 my $ycut2 = max 0, min 1, $ycut - 1;
1908
1909 my $h1 = $self->{h} * (1 - $ycut1);
1910 my $h2 = $self->{h} * (1 - $ycut2);
1685 1911
1686 glEnable GL_BLEND; 1912 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1913 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 1914 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1915 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 1916
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1917 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 1918 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 1919 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1920 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1921 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1922 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 1923 glEnd;
1701 1924
1925 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1926 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 1927 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1928 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1929 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1930 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1931 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 glEnd; 1932 glEnd;
1933
1934 if ($t3) {
1935 glBindTexture GL_TEXTURE_2D, $t3->{name};
1936 glBegin GL_QUADS;
1937 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1938 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1939 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1940 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1941 glEnd;
1942 }
1709 1943
1710 glDisable GL_BLEND; 1944 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 1945 glDisable GL_TEXTURE_2D;
1712} 1946}
1713 1947
… …
1719 1953
1720sub new { 1954sub new {
1721 my ($class, %arg) = @_; 1955 my ($class, %arg) = @_;
1722 1956
1723 my $self = $class->SUPER::new ( 1957 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 1958 tooltip => $arg{type},
1959 can_hover => 1,
1960 can_events => 1,
1725 %arg, 1961 %arg,
1726 ); 1962 );
1727 1963
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1964 $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); 1965 $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"); 1966 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731 1967
1732 $self 1968 $self
1733} 1969}
1734 1970
… …
1737 1973
1738 $self->{value}->set_fontsize ($fsize); 1974 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize); 1975 $self->{max} ->set_fontsize ($fsize);
1740} 1976}
1741 1977
1978sub set_max {
1979 my ($self, $max) = @_;
1980
1981 $self->{gauge}->set_max ($max);
1982 $self->{max}->set_text ($max);
1983}
1984
1742sub set_value { 1985sub set_value {
1743 my ($self, $val, $max) = @_; 1986 my ($self, $val, $max) = @_;
1744 1987
1745 $self->set_max ($max) 1988 $self->set_max ($max)
1746 if defined $max; 1989 if defined $max;
1747 1990
1748 $self->{gauge}->set_value ($val, $max); 1991 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val); 1992 $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} 1993}
1758 1994
1759############################################################################# 1995#############################################################################
1760 1996
1761package CFClient::UI::Slider; 1997package CFClient::UI::Slider;
… …
1780 # TODO: calculations are off 2016 # TODO: calculations are off
1781 my $self = $class->SUPER::new ( 2017 my $self = $class->SUPER::new (
1782 fg => [1, 1, 1], 2018 fg => [1, 1, 1],
1783 active_fg => [0, 0, 0], 2019 active_fg => [0, 0, 0],
1784 range => [0, 0, 100, 10], 2020 range => [0, 0, 100, 10],
1785 req_w => 20, 2021 req_w => $::WIDTH / 80,
1786 req_h => 20, 2022 req_h => $::WIDTH / 80,
1787 vertical => 0, 2023 vertical => 0,
1788 can_hover => 1, 2024 can_hover => 1,
1789 inner_pad => 5, 2025 inner_pad => 5,
1790 @_ 2026 @_
1791 ); 2027 );
… …
1901 2137
1902sub new { 2138sub new {
1903 my $class = shift; 2139 my $class = shift;
1904 2140
1905 my $self = $class->SUPER::new ( 2141 my $self = $class->SUPER::new (
1906 fontsize => 1, 2142 fontsize => 1,
2143 can_events => 0,
2144 #font => default_font
1907 @_, 2145 @_,
1908 2146
1909 layout => (new CFClient::Layout), 2147 layout => (new CFClient::Layout),
1910 par => [], 2148 par => [],
1911 height => 0, 2149 height => 0,
1912 children => [ 2150 children => [
1913 (new CFClient::UI::Empty expand => 1), 2151 (new CFClient::UI::Empty expand => 1),
1914 (new CFClient::UI::Slider vertical => 1), 2152 (new CFClient::UI::Slider vertical => 1),
1915 ], 2153 ],
1916 ); 2154 );
1917 2155
1918 $self->{children}[1]->connect (changed => sub { 2156 $self->{children}[1]->connect (changed => sub { $self->update });
1919 $self->update;
1920 });
1921 2157
1922 $self 2158 $self
1923} 2159}
1924 2160
1925sub set_fontsize { 2161sub set_fontsize {
… …
1933 my ($self, $text) = @_; 2169 my ($self, $text) = @_;
1934 2170
1935 my $layout = $self->{layout}; 2171 my $layout = $self->{layout};
1936 2172
1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1938 $layout->set_width ($self->{w}); 2174 $layout->set_width ($self->{children}[0]{w});
1939 $layout->set_text ($text); 2175 $layout->set_text ($text);
1940 2176
1941 ($layout->size)[1] 2177 ($layout->size)[1]
1942} 2178}
1943 2179
… …
1951sub size_allocate { 2187sub size_allocate {
1952 my ($self, $w, $h) = @_; 2188 my ($self, $w, $h) = @_;
1953 2189
1954 $self->SUPER::size_allocate ($w, $h); 2190 $self->SUPER::size_allocate ($w, $h);
1955 2191
2192 $self->{layout}->set_font ($self->{font}) if $self->{font};
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2193 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1957 $self->{layout}->set_width ($self->{children}[0]{w}); 2194 $self->{layout}->set_width ($self->{children}[0]{w});
1958 2195
1959 $self->reflow; 2196 $self->reflow;
1960} 2197}
… …
1995 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1996 2233
1997 delete $self->{texture}; 2234 delete $self->{texture};
1998 } 2235 }
1999 2236
2000 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2001 glClearColor 0, 0, 0, 1; 2238 glClearColor 0, 0, 0, 0;
2002 glClear GL_COLOR_BUFFER_BIT; 2239 glClear GL_COLOR_BUFFER_BIT;
2003 2240
2004 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
2005 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2006 glEnable GL_TEXTURE_2D; 2243 glEnable GL_TEXTURE_2D;
… …
2013 2250
2014 my $y = 0; 2251 my $y = 0;
2015 2252
2016 my $layout = $self->{layout}; 2253 my $layout = $self->{layout};
2017 2254
2255 $layout->set_font ($self->{font}) if $self->{font};
2256
2018 for my $par (@{$self->{par}}) { 2257 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2258 my $h = $par->[0];
2020 2259
2021 if ($y0 < $y + $h && $y < $y1) { 2260 if ($y0 < $y + $h && $y < $y1) {
2022 $layout->set_text ($par->[2]); 2261 $layout->set_text ($par->[2]);
… …
2036} 2275}
2037 2276
2038sub _draw { 2277sub _draw {
2039 my ($self) = @_; 2278 my ($self) = @_;
2040 2279
2041 if ($self->{texture}) { 2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2042 glEnable GL_TEXTURE_2D; 2282 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1;
2044 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2045 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
2046 } 2287 glDisable GL_BLEND;
2047 2288
2048 $self->{children}[1]->draw; 2289 $self->{children}[1]->draw;
2049 2290
2050} 2291}
2051 2292
… …
2099 2340
2100sub new { 2341sub new {
2101 my $class = shift; 2342 my $class = shift;
2102 2343
2103 my $self = $class->SUPER::new ( 2344 my $self = $class->SUPER::new (
2104 state => 0, 2345 state => 0,
2105 connect_activate => \&toggle_flopper, 2346 connect_activate => \&toggle_flopper,
2106 can_events => 1,
2107 @_ 2347 @_
2108 ); 2348 );
2109 2349
2110 if ($self->{state}) { 2350 if ($self->{state}) {
2111 $self->{state} = 0; 2351 $self->{state} = 0;
… …
2146 @_, 2386 @_,
2147 can_events => 0, 2387 can_events => 0,
2148 ) 2388 )
2149} 2389}
2150 2390
2151sub set_text { 2391sub set_markup {
2152 my ($self, $text) = @_; 2392 my ($self, $text) = @_;
2153 2393
2154 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8; 2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2155 $self->{label}->set_text ($text); 2395 $self->{label}->set_markup ($text);
2156 $self->add ($self->{label}); 2396 $self->add ($self->{label});
2157} 2397}
2158 2398
2159sub size_request { 2399sub size_request {
2160 my ($self) = @_; 2400 my ($self) = @_;
2161 2401
2402 $self->child->set_max_size ($::WIDTH * 0.3);
2403
2162 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2163 2405
2164 $w = List::Util::min $::WIDTH * 0.2, $w; 2406 ($w + 4, $h + 4)
2407}
2165 2408
2166 ($w, $h) 2409sub size_allocate {
2410 my ($self, $w, $h) = @_;
2411
2412 $self->SUPER::size_allocate ($w - 4, $h - 4);
2413}
2414
2415sub _draw {
2416 my ($self) = @_;
2417
2418 glPushMatrix;
2419 glTranslate 0.375, 0.375;
2420
2421 my ($w, $h) = @$self{qw(w h)};
2422
2423 glColor 1, 0.8, 0.4;
2424 glBegin GL_QUADS;
2425 glVertex 0 , 0;
2426 glVertex 0 , $h;
2427 glVertex $w, $h;
2428 glVertex $w, 0;
2429 glEnd;
2430
2431 glColor 0, 0, 0;
2432 glBegin GL_LINE_LOOP;
2433 glVertex 0 , 0;
2434 glVertex 0 , $h;
2435 glVertex $w, $h;
2436 glVertex $w, 0;
2437 glEnd;
2438
2439 glPopMatrix;
2440
2441 glTranslate 2, 2;
2442 $self->SUPER::_draw;
2443}
2444
2445#############################################################################
2446
2447package CFClient::UI::Face;
2448
2449our @ISA = CFClient::UI::Base::;
2450
2451use CFClient::OpenGL;
2452
2453sub new {
2454 my $class = shift;
2455
2456 $class->SUPER::new (
2457 aspect => 1,
2458 @_,
2459 )
2460}
2461
2462sub size_request {
2463 (32, 8)
2464}
2465
2466sub _draw {
2467 my ($self) = @_;
2468
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2470
2471 # TODO animation
2472 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 }
2482}
2483
2484#############################################################################
2485
2486package CFClient::UI::Menu;
2487
2488our @ISA = CFClient::UI::FancyFrame::;
2489
2490use CFClient::OpenGL;
2491
2492sub new {
2493 my $class = shift;
2494
2495 my $self = $class->SUPER::new (
2496 items => [],
2497 z => 100,
2498 @_,
2499 );
2500
2501 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2502
2503 for my $item (@{ $self->{items} }) {
2504 my ($widget, $cb) = @$item;
2505
2506 # handle various types of items, only text for now
2507 if (!ref $widget) {
2508 $widget = new CFClient::UI::Label
2509 can_hover => 1,
2510 can_events => 1,
2511 text => $widget;
2512 }
2513
2514 $self->{item}{$widget} = $item;
2515
2516 $self->{vbox}->add ($widget);
2517 }
2518
2519 $self
2520}
2521
2522# popup given the event (must be a mouse button down event currently)
2523sub popup {
2524 my ($self, $ev) = @_;
2525
2526 $self->emit ("popdown");
2527
2528 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self;
2530 $self->{button} = $ev->{button};
2531
2532 $self->show;
2533 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2534}
2535
2536sub mouse_motion {
2537 my ($self, $ev, $x, $y) = @_;
2538
2539 # TODO: should use vbox->find_widget or so
2540 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2541 $self->{hover} = $self->{item}{$HOVER};
2542}
2543
2544sub button_up {
2545 my ($self, $ev, $x, $y) = @_;
2546
2547 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB;
2549 $self->hide;
2550
2551 $self->emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover};
2553 }
2167} 2554}
2168 2555
2169############################################################################# 2556#############################################################################
2170 2557
2171package CFClient::UI::Root; 2558package CFClient::UI::Root;
… …
2247 $self->_draw; 2634 $self->_draw;
2248} 2635}
2249 2636
2250############################################################################# 2637#############################################################################
2251 2638
2639package CFClient::UI::Inventory;
2640
2641our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my $self = $class->SUPER::new (
2647 scrolled => (new CFClient::UI::VBox),
2648 @_,
2649 );
2650
2651 $self
2652}
2653
2654sub set_items {
2655 my ($self, $items) = @_;
2656
2657 $self->{scrolled}->clear;
2658 return unless $items;
2659
2660 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662 $self->{real_items} = \@items;
2663
2664 for my $item (@items) {
2665 my $desc = $item->{nrof} < 2
2666 ? $item->{name}
2667 : "$item->{nrof} $item->{name_pl}";
2668
2669 my $hb = new CFClient::UI::HBox;
2670
2671 $hb->add (my $f = new CFClient::UI::Face
2672 can_events => 0,
2673 face => $item->{face},
2674 anim => $item->{anim},
2675 animspeed => $item->{animspeed},
2676 expand => 1,
2677 );
2678 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679 $self->{scrolled}->add ($hb);
2680 }
2681
2682# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683}
2684
2685sub size_request {
2686 my ($self) = @_;
2687 (100, 200)
2688}
2689
2690#############################################################################
2691
2252package CFClient::UI; 2692package CFClient::UI;
2253 2693
2254$ROOT = new CFClient::UI::Root; 2694$ROOT = new CFClient::UI::Root;
2255$TOOLTIP = new CFClient::UI::Tooltip; 2695$TOOLTIP = new CFClient::UI::Tooltip;
2256 2696

Diff Legend

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