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.156 by elmex, Sun Apr 23 02:50:42 2006 UTC vs.
Revision 1.191 by root, Tue May 9 22:27:53 2006 UTC

… …
14our $BUTTON_STATE; 14our $BUTTON_STATE;
15 15
16sub check_tooltip { 16sub check_tooltip {
17 if (!$GRAB) { 17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 19 if (length $widget->{tooltip}) {
20 20
21 if ($TOOLTIP->{owner} != $widget) { 21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 22 $TOOLTIP->{owner} = $widget;
23 23
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
… …
39 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
40} 48}
41 49
42# class methods for events 50# class methods for events
43sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
45} 54}
46 55
47sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
49} 59}
50 60
51sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
52 my ($ev) = @_; 62 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 71 check_tooltip;
62 } 72 }
63 73
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 75
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
67} 80}
68 81
69sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
70 my ($ev) = @_; 83 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
72 85
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 87
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 89
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
78 94
79 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 97 $grab->update if $grab;
82 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 115
100 check_tooltip; 116 check_tooltip;
101 } 117 }
102 118
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
104} 123}
105 124
106# convert position array to integers 125# convert position array to integers
107sub harmonize { 126sub harmonize {
108 my ($vals) = @_; 127 my ($vals) = @_;
… …
126 145
127sub new { 146sub new {
128 my $class = shift; 147 my $class = shift;
129 148
130 my $self = bless { 149 my $self = bless {
131 x => 0, 150 x => 0,
132 y => 0, 151 y => 0,
133 z => 0, 152 z => 0,
134 can_events => 1, 153 can_events => 1,
135 @_ 154 @_
136 }, $class; 155 }, $class;
137 156
138 for (keys %$self) { 157 for (keys %$self) {
… …
142 } 161 }
143 162
144 $self 163 $self
145} 164}
146 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
147sub show { 173sub show {
148 my ($self) = @_; 174 my ($self) = @_;
149 175
150 return if $self->{parent}; 176 return if $self->{parent};
151 177
… …
153} 179}
154 180
155sub hide { 181sub hide {
156 my ($self) = @_; 182 my ($self) = @_;
157 183
158 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
159 186
160 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
161} 189}
162 190
163sub move { 191sub move {
164 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
165 193
… …
168 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
169 197
170 $self->update; 198 $self->update;
171} 199}
172 200
173sub needs_redraw { 201sub set_size {
174 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
175} 208}
176 209
177sub size_request { 210sub size_request {
178 require Carp; 211 require Carp;
179 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
199 $self->{y} = $y; 232 $self->{y} = $y;
200 $self->update; 233 $self->update;
201 } 234 }
202 235
203 if ($self->{w} != $w || $self->{h} != $h) { 236 if ($self->{w} != $w || $self->{h} != $h) {
204 $self->{w} = $w; 237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
205 $self->{h} = $h;
206
207 $self->size_allocate ($w, $h);
208 $self->update;
209 } 238 }
210} 239}
211 240
212sub size_allocate { 241sub size_allocate {
213 # nothing to be done 242 # nothing to be done
214} 243}
215 244
216# return top left coordinates 245sub children {
217sub _topleft { 246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258}
259
260sub set_max_size {
218 my ($self, $x, $y) = @_; 261 my ($self, $w, $h) = @_;
219 262
220 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h;
221} 265}
222 266
223# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
224sub coord2local { 268sub coord2local {
225 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
226 270
227 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
228 ($x - $X, $y - $Y)
229} 272}
230 273
231# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
232sub coord2global { 275sub coord2global {
233 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
234 277
235 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
236 ($x + $X, $y + $Y)
237} 279}
238 280
239sub focus_in { 281sub focus_in {
240 my ($self) = @_; 282 my ($self) = @_;
241 283
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 343 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 344 glVertex $x , $y + $self->{h};
303 glEnd; 345 glEnd;
304 glDisable GL_BLEND; 346 glDisable GL_BLEND;
305 } 347 }
348
349 if ($ENV{PCLIENT_DEBUG}) {
350 glPushMatrix;
351 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0;
355 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h};
358 glEnd;
359 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 }
306} 362}
307 363
308sub _draw { 364sub _draw {
309 my ($self) = @_; 365 my ($self) = @_;
310 366
… …
324} 380}
325 381
326sub set_parent { 382sub set_parent {
327 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
328 384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
329 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
330} 387}
331 388
332sub check_size { 389sub check_size {
333 my ($self) = @_; 390 my ($self) = @_;
334 391
335 return unless $self->{parent}; 392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
336
337 my ($w, $h) = $self->size_request;
338
339 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w;
341 $self->{req_h} = $h;
342
343 $self->{parent}->check_size;
344 }
345} 393}
346 394
347sub update { 395sub update {
348 my ($self) = @_; 396 my ($self) = @_;
349 397
… …
358} 406}
359 407
360sub emit { 408sub emit {
361 my ($self, $signal, @args) = @_; 409 my ($self, $signal, @args) = @_;
362 410
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 411 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
364 $cb->($self, @args);
365 }
366} 412}
367 413
368sub DESTROY { 414sub DESTROY {
369 my ($self) = @_; 415 my ($self) = @_;
370 416
… …
437sub new { 483sub new {
438 my ($class, %arg) = @_; 484 my ($class, %arg) = @_;
439 485
440 my $children = delete $arg{children} || []; 486 my $children = delete $arg{children} || [];
441 487
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 488 my $self = $class->SUPER::new (
489 children => [],
490 can_events => 0,
491 %arg,
492 );
443 $self->add ($_) for @$children; 493 $self->add ($_) for @$children;
444 494
445 $self 495 $self
446} 496}
447 497
448sub add { 498sub add {
449 my ($self, $child) = @_; 499 my ($self, @widgets) = @_;
450 500
451 $child->set_parent ($self); 501 $_->set_parent ($self)
502 for @widgets;
452 503
453 use sort 'stable'; 504 use sort 'stable';
454 505
455 $self->{children} = [ 506 $self->{children} = [
456 sort { $a->{z} <=> $b->{z} } 507 sort { $a->{z} <=> $b->{z} }
457 @{$self->{children}}, $child 508 @{$self->{children}}, @widgets
458 ]; 509 ];
459 510
460 $child->check_size; 511 $_->check_size
512 for @widgets;
513
514 $self->update;
515}
516
517sub children {
518 @{ $_[0]{children} }
461} 519}
462 520
463sub remove { 521sub remove {
464 my ($self, $child) = @_; 522 my ($self, $child) = @_;
465 523
466 delete $child->{parent}; 524 delete $child->{parent};
525 $child->hide;
467 526
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528
529 $self->check_size;
530 $self->update;
531}
532
533sub clear {
534 my ($self) = @_;
535
536 my $children = delete $self->{children};
537 $self->{children} = [];
538
539 for (@$children) {
540 delete $_->{parent};
541 $_->hide;
542 }
469 543
470 $self->check_size; 544 $self->check_size;
471 $self->update; 545 $self->update;
472} 546}
473 547
… …
551} 625}
552 626
553sub update { 627sub update {
554 my ($self) = @_; 628 my ($self) = @_;
555 629
556 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
557 $self->render_chld;
558 $self->SUPER::update; 631 $self->SUPER::update;
559}
560
561sub render_chld {
562 my ($self) = @_;
563
564 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
565 glClearColor 0, 0, 0, 1;
566 glClear GL_COLOR_BUFFER_BIT;
567 $self->child->draw;
568 };
569} 632}
570 633
571sub size_allocate { 634sub size_allocate {
572 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
573 636
574 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
575 640
641sub _render {
642 $_[0]{children}[0]->draw;
643}
644
645sub render_child {
646 my ($self) = @_;
647
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT;
651
576 $self->render_chld; 652 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 };
577} 661}
578 662
579sub _draw { 663sub _draw {
580 my ($self) = @_; 664 my ($self) = @_;
581 665
… …
583 667
584 my $tex = $self->{texture} 668 my $tex = $self->{texture}
585 or return; 669 or return;
586 670
587 glEnable GL_BLEND; 671 glEnable GL_BLEND;
588 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
589 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1;
591 676
592 $tex->draw_quad (0, 0, $w, $h); 677 $tex->draw_quad (0, 0, $w, $h);
593 678
594 glDisable GL_BLEND; 679 glDisable GL_BLEND;
595 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
… …
599 684
600package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
601 686
602our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
603 688
604sub new { die }
605
606sub size_request { 689sub size_request {
607 my ($self) = @_; 690 my ($self) = @_;
608 691
609 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
610 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
611 694
612 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
613} 696}
614 697
615sub _draw { 698sub size_allocate {
616 my ($self) = @_; 699 my ($self, $w, $h) = @_;
617 700
618 $self->{children}[1]->draw; 701 $self->update;
619} 702}
620 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
706
707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
751package CFClient::UI::ScrolledWindow;
752
753our @ISA = CFClient::UI::HBox::;
754
755sub new {
756 my $class = shift;
757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
768 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort),
770 slider => $slider,
771 @_,
772 );
773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
778 $self
779}
780
781#TODO# update range on size_allocate depeneing on child
782# update viewport offset on scroll
621 783
622############################################################################# 784#############################################################################
623 785
624package CFClient::UI::Frame; 786package CFClient::UI::Frame;
625 787
… …
636 border => 0.8, 798 border => 0.8,
637 @_ 799 @_
638 ); 800 );
639 801
640 $self 802 $self
641}
642
643sub set_size {
644 my ($self, $w, $h) = @_;
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648}
649
650sub size_request {
651 my ($self) = @_;
652 ($self->{req_w}, $self->{req_h})
653}
654
655sub size_allocate {
656 my ($self, $w, $h) = @_;
657 $self->{w} = $w;
658 $self->{h} = $h;
659 $self->child->configure (0, 0, $w, $h);
660} 803}
661 804
662sub _draw { 805sub _draw {
663 my ($self) = @_; 806 my ($self) = @_;
664 807
… …
699 my $class = shift; 842 my $class = shift;
700 843
701 # TODO: user_x, user_y, overwrite moveto? 844 # TODO: user_x, user_y, overwrite moveto?
702 845
703 my $self = $class->SUPER::new ( 846 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 847 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 848 border_bg => [1, 1, 1, 1],
706 border => 0.8, 849 border => 0.6,
707 can_events => 1, 850 can_events => 1,
708 @_ 851 @_
709 ); 852 );
710 853
711 $self->{title} &&= new CFClient::UI::Label 854 $self->{title} &&= new CFClient::UI::Label
712 align => 0, 855 align => 0,
713 valign => 1, 856 valign => 1,
714 text => $self->{title}, 857 text => $self->{title},
715 fontsize => 1; 858 fontsize => $self->{border};
716 859
717 $self 860 $self
718} 861}
719 862
720sub border { 863sub border {
721 int $_[0]{border} * $::FONTSIZE 864 int $_[0]{border} * $::FONTSIZE
722} 865}
723 866
724sub size_request { 867sub size_request {
725 my ($self) = @_; 868 my ($self) = @_;
726
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728 869
729 my ($w, $h) = $self->SUPER::size_request; 870 my ($w, $h) = $self->SUPER::size_request;
730 871
731 ( 872 (
732 $w + $self->border * 2, 873 $w + $self->border * 2,
… …
747} 888}
748 889
749sub button_down { 890sub button_down {
750 my ($self, $ev, $x, $y) = @_; 891 my ($self, $ev, $x, $y) = @_;
751 892
893 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 894 my $border = $self->border;
753 895
754 if ($x < $self->{w} && $x >= $self->{w} - $border 896 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 897 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 898
899 if ($lr & $td) {
900 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 901 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 902 my ($bw, $bh) = ($self->{w}, $self->{h});
759 903
904 my $mx = $x < $border;
905 my $my = $y < $border;
906
760 $self->{motion} = sub { 907 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 908 my ($ev, $x, $y) = @_;
762 909
763 ($x, $y) = ($ev->{x}, $ev->{y}); 910 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy;
764 912
765 $self->{user_w} = $bw + $x - $ox; 913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
766 $self->{user_h} = $bh + $y - $oy; 914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
767 $self->check_size; 916 $self->check_size;
768 }; 917 };
769 918
770 } elsif ($x >= 0 && $x < $self->{w} 919 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 920 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 921 my ($bx, $by) = ($self->{x}, $self->{y});
775 922
776 $self->{motion} = sub { 923 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
… …
813 $tex[1]->draw_quad (0, 0, $w, $border); 960 $tex[1]->draw_quad (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
817 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
818 my $bg = $tex[0]; 966 my $bg = $tex[0];
819 967
820 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
822 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
823 971
824 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
825 973
826 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
827 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
828 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
829 $bg->draw_quad ($border, $border, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
830 978
831 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
833 982
834 $self->{title}->draw if $self->{title}; 983 $self->{title}->draw if $self->{title};
984
835 $self->child->draw; 985 $self->child->draw;
836} 986}
837 987
838############################################################################# 988#############################################################################
839 989
… …
861 $self->{children}[$y][$x] = $child; 1011 $self->{children}[$y][$x] = $child;
862 1012
863 $child->check_size; 1013 $child->check_size;
864} 1014}
865 1015
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
866# TODO: move to container class maybe? send childs a signal on removal? 1020# TODO: move to container class maybe? send childs a signal on removal?
867sub clear { 1021sub clear {
868 my ($self) = @_; 1022 my ($self) = @_;
869 1023
1024 my @children = $self->children;
870 delete $self->{children}; 1025 delete $self->{children};
1026
1027 for (@children) {
1028 delete $_->{parent};
1029 $_->hide;
1030 }
1031
871 $self->update; 1032 $self->update;
872} 1033}
873 1034
874sub get_wh { 1035sub get_wh {
875 my ($self) = @_; 1036 my ($self) = @_;
… …
1098 1259
1099sub new { 1260sub new {
1100 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1101 1262
1102 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1265 #font => default_font
1104 fontsize => 1, 1266 fontsize => 1,
1105 text => "", 1267 text => "",
1106 align => -1, 1268 align => -1,
1107 valign => -1, 1269 valign => -1,
1108 padding => 2, 1270 padding => 2,
1109 layout => new CFClient::Layout, 1271 layout => new CFClient::Layout,
1110 can_events => 0, 1272 can_events => 0,
1111 %arg 1273 %arg
1112 ); 1274 );
1113 1275
1114 if (exists $self->{template}) { 1276 if (exists $self->{template}) {
… …
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1122 1284
1123 $self 1285 $self
1124} 1286}
1125 1287
1126sub escape_text { 1288sub escape {
1127 local $_ = $_[1]; 1289 local $_ = $_[1];
1128 1290
1129 s/&/&amp;/g; 1291 s/&/&amp;/g;
1130 s/>/&gt;/g; 1292 s/>/&gt;/g;
1131 s/</&lt;/g; 1293 s/</&lt;/g;
1132 1294
1133 $_[1] 1295 $_[1]
1134} 1296}
1135 1297
1298sub update {
1299 my ($self) = @_;
1300
1301 delete $self->{texture};
1302 $self->SUPER::update;
1303}
1304
1136sub set_text { 1305sub set_text {
1137 my ($self, $text) = @_; 1306 my ($self, $text) = @_;
1138 1307
1308 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text";
1310
1139 $self->{layout}->set_text ($text); 1311 $self->{layout}->set_text ($text);
1140 1312
1141 delete $self->{texture}; 1313 $self->update;
1142 $self->check_size; 1314 $self->check_size;
1143 $self->update;
1144} 1315}
1145 1316
1146sub set_markup { 1317sub set_markup {
1147 my ($self, $markup) = @_; 1318 my ($self, $markup) = @_;
1148 1319
1320 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup";
1322
1149 $self->{layout}->set_markup ($markup); 1323 $self->{layout}->set_markup ($markup);
1150 1324
1151 delete $self->{texture}; 1325 $self->update;
1152 $self->check_size; 1326 $self->check_size;
1153 $self->update;
1154} 1327}
1155 1328
1156sub size_request { 1329sub size_request {
1157 my ($self) = @_; 1330 my ($self) = @_;
1158 1331
1159 $self->{layout}->set_width; 1332 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $self->{layout}->set_width ($self->{max_w} || -1);
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1335
1162 my ($w, $h) = $self->{layout}->size; 1336 my ($w, $h) = $self->{layout}->size;
1163 1337
1164 if (exists $self->{template}) { 1338 if (exists $self->{template}) {
1339 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1340 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1341
1167 my ($w2, $h2) = $self->{template}->size; 1342 my ($w2, $h2) = $self->{template}->size;
1168 1343
1169 $w = List::Util::max $w, $w2; 1344 $w = List::Util::max $w, $w2;
… …
1185sub set_fontsize { 1360sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1361 my ($self, $fontsize) = @_;
1187 1362
1188 $self->{fontsize} = $fontsize; 1363 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1364 delete $self->{texture};
1365
1366 $self->update;
1190 $self->check_size; 1367 $self->check_size;
1191 $self->update;
1192} 1368}
1193 1369
1194sub _draw { 1370sub _draw {
1195 my ($self) = @_; 1371 my ($self) = @_;
1196 1372
1197 my $tex = $self->{texture} ||= do { 1373 my $tex = $self->{texture} ||= do {
1374 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1375 $self->{layout}->set_width ($self->{w});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1200 new_from_layout CFClient::Texture $self->{layout} 1377 new_from_layout CFClient::Texture $self->{layout}
1201 }; 1378 };
1202 1379
… …
1235 1412
1236sub new { 1413sub new {
1237 my $class = shift; 1414 my $class = shift;
1238 1415
1239 $class->SUPER::new ( 1416 $class->SUPER::new (
1240 fg => [1, 1, 1], 1417 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1418 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1419 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1420 active_fg => [0, 0, 0],
1244 can_hover => 1, 1421 can_hover => 1,
1245 can_focus => 1, 1422 can_focus => 1,
1246 valign => 0, 1423 valign => 0,
1247 can_events => 1, 1424 can_events => 1,
1248 @_ 1425 @_
1249 ) 1426 )
1250} 1427}
1251 1428
… …
1405 my ($self, $ev) = @_; 1582 my ($self, $ev) = @_;
1406 1583
1407 my $sym = $ev->{sym}; 1584 my $sym = $ev->{sym};
1408 1585
1409 if ($sym == 13) { 1586 if ($sym == 13) {
1587 unshift @{$self->{history}},
1588 my $txt = $self->get_text;
1589 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1591 $self->emit (activate => $txt);
1411 $self->update; 1592 $self->update;
1593
1594 } elsif ($sym == CFClient::SDLK_UP) {
1595 if ($self->{history_pointer} < 0) {
1596 $self->{history_saveback} = $self->get_text;
1597 }
1598 if (@{$self->{history} || []} > 0) {
1599 $self->{history_pointer}++;
1600 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1601 $self->{history_pointer} = @{$self->{history} || []} - 1;
1602 }
1603 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1604 }
1605
1606 } elsif ($sym == CFClient::SDLK_DOWN) {
1607 $self->{history_pointer}--;
1608 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1609
1610 if ($self->{history_pointer} >= 0) {
1611 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1612 } else {
1613 $self->set_text ($self->{history_saveback});
1614 }
1412 1615
1413 } else { 1616 } else {
1414 $self->SUPER::key_down ($ev); 1617 $self->SUPER::key_down ($ev);
1415 } 1618 }
1416 1619
… …
1430 1633
1431sub new { 1634sub new {
1432 my $class = shift; 1635 my $class = shift;
1433 1636
1434 $class->SUPER::new ( 1637 $class->SUPER::new (
1435 padding => 4, 1638 padding => 4,
1436 fg => [1, 1, 1], 1639 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2], 1640 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1641 active_fg => [0, 0, 1],
1439 can_hover => 1, 1642 can_hover => 1,
1440 align => 0, 1643 align => 0,
1441 valign => 0, 1644 valign => 0,
1442 can_events => 1, 1645 can_events => 1,
1443 @_ 1646 @_
1444 ) 1647 )
1445} 1648}
1446 1649
… …
1605 1808
1606package CFClient::UI::VGauge; 1809package CFClient::UI::VGauge;
1607 1810
1608our @ISA = CFClient::UI::Base::; 1811our @ISA = CFClient::UI::Base::;
1609 1812
1813use List::Util qw(min max);
1814
1610use CFClient::OpenGL; 1815use CFClient::OpenGL;
1611 1816
1612my %tex = ( 1817my %tex = (
1613 food => [ 1818 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1819 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1820 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1821 ],
1617 grace => [ 1822 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1824 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1825 ],
1621 hp => [ 1826 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1827 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1828 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1829 ],
1625 mana => [ 1830 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1831 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1832 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1833 ],
1629); 1834);
1630 1835
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1836# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1837sub new {
… …
1651} 1856}
1652 1857
1653sub set_max { 1858sub set_max {
1654 my ($self, $max) = @_; 1859 my ($self, $max) = @_;
1655 1860
1861 return if $self->{max_val} == $max;
1862
1656 $self->{max_val} = $max; 1863 $self->{max_val} = $max;
1864 $self->update;
1657} 1865}
1658 1866
1659sub set_value { 1867sub set_value {
1660 my ($self, $val, $max) = @_; 1868 my ($self, $val, $max) = @_;
1661 1869
1662 $self->set_max ($max) 1870 $self->set_max ($max)
1663 if defined $max; 1871 if defined $max;
1664 1872
1665 $max = $self->{max_val}; 1873 return if $self->{val} == $val;
1874
1666 $self->{val} = $val; 1875 $self->{val} = $val;
1667
1668 $self->update; 1876 $self->update;
1669} 1877}
1670 1878
1671sub _draw { 1879sub _draw {
1672 my ($self) = @_; 1880 my ($self) = @_;
1673 1881
1674 my $tex = $tex{$self->{type}}; 1882 my $tex = $tex{$self->{type}};
1883 my ($t1, $t2, $t3) = @$tex;
1675 1884
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1885 my ($w, $h) = ($self->{w}, $self->{h});
1677 1886
1678 if ($self->{vertical}) { 1887 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1888 glRotate 90, 0, 0, 1;
… …
1681 1890
1682 ($w, $h) = ($h, $w); 1891 ($w, $h) = ($h, $w);
1683 } 1892 }
1684 1893
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1894 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1895
1688 my $t1 = $tex->[0]; 1896 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 1897 my $ycut2 = max 0, min 1, $ycut - 1;
1898
1899 my $h1 = $self->{h} * (1 - $ycut1);
1900 my $h2 = $self->{h} * (1 - $ycut2);
1690 1901
1691 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1904 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1905 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1906
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1907 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1908 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1909 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1910 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1911 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1912 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1913 glEnd;
1706 1914
1915 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1916 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1917 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1918 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1919 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1920 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1921 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 1922 glEnd;
1923
1924 if ($t3) {
1925 glBindTexture GL_TEXTURE_2D, $t3->{name};
1926 glBegin GL_QUADS;
1927 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1928 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1929 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1930 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1931 glEnd;
1932 }
1714 1933
1715 glDisable GL_BLEND; 1934 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1935 glDisable GL_TEXTURE_2D;
1717} 1936}
1718 1937
… …
1724 1943
1725sub new { 1944sub new {
1726 my ($class, %arg) = @_; 1945 my ($class, %arg) = @_;
1727 1946
1728 my $self = $class->SUPER::new ( 1947 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 1948 tooltip => $arg{type},
1949 can_hover => 1,
1950 can_events => 1,
1730 %arg, 1951 %arg,
1731 ); 1952 );
1732 1953
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1954 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1734 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1955 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1735 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1956 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 1957
1737 $self 1958 $self
1738} 1959}
1739 1960
1740sub set_fontsize { 1961sub set_fontsize {
… …
1742 1963
1743 $self->{value}->set_fontsize ($fsize); 1964 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 1965 $self->{max} ->set_fontsize ($fsize);
1745} 1966}
1746 1967
1968sub set_max {
1969 my ($self, $max) = @_;
1970
1971 $self->{gauge}->set_max ($max);
1972 $self->{max}->set_text ($max);
1973}
1974
1747sub set_value { 1975sub set_value {
1748 my ($self, $val, $max) = @_; 1976 my ($self, $val, $max) = @_;
1749 1977
1750 $self->set_max ($max) 1978 $self->set_max ($max)
1751 if defined $max; 1979 if defined $max;
1752 1980
1753 $self->{gauge}->set_value ($val, $max); 1981 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 1982 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762} 1983}
1763 1984
1764############################################################################# 1985#############################################################################
1765 1986
1766package CFClient::UI::Slider; 1987package CFClient::UI::Slider;
… …
1785 # TODO: calculations are off 2006 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1789 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1790 req_w => 20, 2011 req_w => $::WIDTH / 80,
1791 req_h => 20, 2012 req_h => $::WIDTH / 80,
1792 vertical => 0, 2013 vertical => 0,
1793 can_hover => 1, 2014 can_hover => 1,
1794 inner_pad => 5, 2015 inner_pad => 5,
1795 @_ 2016 @_
1796 ); 2017 );
… …
1906 2127
1907sub new { 2128sub new {
1908 my $class = shift; 2129 my $class = shift;
1909 2130
1910 my $self = $class->SUPER::new ( 2131 my $self = $class->SUPER::new (
1911 fontsize => 1, 2132 fontsize => 1,
2133 can_events => 0,
2134 #font => default_font
1912 @_, 2135 @_,
1913 2136
1914 layout => (new CFClient::Layout), 2137 layout => (new CFClient::Layout),
1915 par => [], 2138 par => [],
1916 height => 0, 2139 height => 0,
1917 children => [ 2140 children => [
1918 (new CFClient::UI::Empty expand => 1), 2141 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2142 (new CFClient::UI::Slider vertical => 1),
1920 ], 2143 ],
1921 ); 2144 );
1922 2145
1923 $self->{children}[1]->connect (changed => sub { 2146 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2147
1927 $self 2148 $self
1928} 2149}
1929 2150
1930sub set_fontsize { 2151sub set_fontsize {
… …
1938 my ($self, $text) = @_; 2159 my ($self, $text) = @_;
1939 2160
1940 my $layout = $self->{layout}; 2161 my $layout = $self->{layout};
1941 2162
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2164 $layout->set_width ($self->{children}[0]{w});
1944 $layout->set_text ($text); 2165 $layout->set_text ($text);
1945 2166
1946 ($layout->size)[1] 2167 ($layout->size)[1]
1947} 2168}
1948 2169
… …
1956sub size_allocate { 2177sub size_allocate {
1957 my ($self, $w, $h) = @_; 2178 my ($self, $w, $h) = @_;
1958 2179
1959 $self->SUPER::size_allocate ($w, $h); 2180 $self->SUPER::size_allocate ($w, $h);
1960 2181
2182 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2183 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1962 $self->{layout}->set_width ($self->{children}[0]{w}); 2184 $self->{layout}->set_width ($self->{children}[0]{w});
1963 2185
1964 $self->reflow; 2186 $self->reflow;
1965} 2187}
… …
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2001 2223
2002 delete $self->{texture}; 2224 delete $self->{texture};
2003 } 2225 }
2004 2226
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2006 glClearColor 0, 0, 0, 1; 2228 glClearColor 0, 0, 0, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2229 glClear GL_COLOR_BUFFER_BIT;
2008 2230
2009 glEnable GL_BLEND; 2231 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2233 glEnable GL_TEXTURE_2D;
… …
2018 2240
2019 my $y = 0; 2241 my $y = 0;
2020 2242
2021 my $layout = $self->{layout}; 2243 my $layout = $self->{layout};
2022 2244
2245 $layout->set_font ($self->{font}) if $self->{font};
2246
2023 for my $par (@{$self->{par}}) { 2247 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2248 my $h = $par->[0];
2025 2249
2026 if ($y0 < $y + $h && $y < $y1) { 2250 if ($y0 < $y + $h && $y < $y1) {
2027 $layout->set_text ($par->[2]); 2251 $layout->set_text ($par->[2]);
… …
2041} 2265}
2042 2266
2043sub _draw { 2267sub _draw {
2044 my ($self) = @_; 2268 my ($self) = @_;
2045 2269
2046 if ($self->{texture}) { 2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2047 glEnable GL_TEXTURE_2D; 2272 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2276 glDisable GL_TEXTURE_2D;
2051 } 2277 glDisable GL_BLEND;
2052 2278
2053 $self->{children}[1]->draw; 2279 $self->{children}[1]->draw;
2054 2280
2055} 2281}
2056 2282
… …
2104 2330
2105sub new { 2331sub new {
2106 my $class = shift; 2332 my $class = shift;
2107 2333
2108 my $self = $class->SUPER::new ( 2334 my $self = $class->SUPER::new (
2109 state => 0, 2335 state => 0,
2110 connect_activate => \&toggle_flopper, 2336 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2337 @_
2113 ); 2338 );
2114 2339
2115 if ($self->{state}) { 2340 if ($self->{state}) {
2116 $self->{state} = 0; 2341 $self->{state} = 0;
… …
2151 @_, 2376 @_,
2152 can_events => 0, 2377 can_events => 0,
2153 ) 2378 )
2154} 2379}
2155 2380
2156sub set_text { 2381sub set_markup {
2157 my ($self, $text) = @_; 2382 my ($self, $text) = @_;
2158 2383
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2160 $self->{label}->set_text ($text); 2385 $self->{label}->set_markup ($text);
2161 $self->add ($self->{label}); 2386 $self->add ($self->{label});
2162} 2387}
2163 2388
2164sub size_request { 2389sub size_request {
2165 my ($self) = @_; 2390 my ($self) = @_;
2166 2391
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2395
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2396 ($w + 4, $h + 4)
2397}
2398
2399sub size_allocate {
2400 my ($self, $w, $h) = @_;
2401
2402 $self->SUPER::size_allocate ($w - 4, $h - 4);
2173} 2403}
2174 2404
2175sub _draw { 2405sub _draw {
2176 my ($self) = @_; 2406 my ($self) = @_;
2177 2407
… …
2202 $self->SUPER::_draw; 2432 $self->SUPER::_draw;
2203} 2433}
2204 2434
2205############################################################################# 2435#############################################################################
2206 2436
2437package CFClient::UI::Face;
2438
2439our @ISA = CFClient::UI::Base::;
2440
2441use CFClient::OpenGL;
2442
2443sub new {
2444 my $class = shift;
2445
2446 $class->SUPER::new (
2447 aspect => 1,
2448 @_,
2449 )
2450}
2451
2452sub size_request {
2453 (32, 8)
2454}
2455
2456sub _draw {
2457 my ($self) = @_;
2458
2459 return unless $::CONN;#d# manage and cache textures differently
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2461
2462 # TODO animation
2463 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 }
2473}
2474
2475#############################################################################
2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_,
2549 );
2550
2551 $self
2552}
2553
2554sub set_items {
2555 my ($self, $items) = @_;
2556
2557 $self->{scrolled}->clear;
2558 return unless $items;
2559
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2561
2562 $self->{real_items} = \@items;
2563
2564 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2570 }
2571
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573}
2574
2575sub size_request {
2576 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h});
2578}
2579
2580#############################################################################
2581
2582package CFClient::UI::Menu;
2583
2584our @ISA = CFClient::UI::FancyFrame::;
2585
2586use CFClient::OpenGL;
2587
2588sub new {
2589 my $class = shift;
2590
2591 my $self = $class->SUPER::new (
2592 items => [],
2593 z => 100,
2594 @_,
2595 );
2596
2597 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2598
2599 for my $item (@{ $self->{items} }) {
2600 my ($widget, $cb) = @$item;
2601
2602 # handle various types of items, only text for now
2603 if (!ref $widget) {
2604 $widget = new CFClient::UI::Label
2605 can_hover => 1,
2606 can_events => 1,
2607 text => $widget;
2608 }
2609
2610 $self->{item}{$widget} = $item;
2611
2612 $self->{vbox}->add ($widget);
2613 }
2614
2615 $self
2616}
2617
2618# popup given the event (must be a mouse button down event currently)
2619sub popup {
2620 my ($self, $ev) = @_;
2621
2622 $self->emit ("popdown");
2623
2624 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self;
2626 $self->{button} = $ev->{button};
2627
2628 $self->show;
2629 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2630}
2631
2632sub mouse_motion {
2633 my ($self, $ev, $x, $y) = @_;
2634
2635 # TODO: should use vbox->find_widget or so
2636 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2637 $self->{hover} = $self->{item}{$HOVER};
2638}
2639
2640sub button_up {
2641 my ($self, $ev, $x, $y) = @_;
2642
2643 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB;
2645 $self->hide;
2646
2647 $self->emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover};
2649 }
2650}
2651
2652#############################################################################
2653
2207package CFClient::UI::Root; 2654package CFClient::UI::Root;
2208 2655
2209our @ISA = CFClient::UI::Container::; 2656our @ISA = CFClient::UI::Container::;
2210 2657
2211use CFClient::OpenGL; 2658use CFClient::OpenGL;
2212 2659
2213sub check_size { 2660sub new {
2214 my ($self) = @_; 2661 my $class = shift;
2215 2662
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2663 $class->SUPER::new (
2217} 2664 @_,
2218 2665 )
2219sub size_request {
2220 ($::WIDTH, $::HEIGHT)
2221} 2666}
2222 2667
2223sub configure { 2668sub configure {
2224 my ($self, $x, $y, $w, $h) = @_; 2669 my ($self, $x, $y, $w, $h) = @_;
2225 2670
2226 $self->SUPER::configure ($x, $y, $w, $h); 2671 $self->{w} = $w;
2672 $self->{h} = $h;
2673}
2227 2674
2675sub check_size {
2676 my ($self) = @_;
2677
2678 $self->size_allocate ($self->{w}, $self->{h})
2679 if $self->{w};
2680}
2681
2682sub size_request {
2683 my ($self) = @_;
2684
2685 ($self->{w}, $self->{h})
2686}
2687
2688sub size_allocate {
2689 my ($self, $w, $h) = @_;
2690
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706
2228 for my $child (@{$self->{children}}) { 2707 for my $child ($self->children) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230 2709
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2710 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2233 $child->configure ($X, $Y, $W,$H); 2712 $child->configure ($X, $Y, $W, $H);
2234 } 2713 }
2235}
2236 2714
2237sub _topleft { 2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717}
2718
2719sub coord2local {
2238 my ($self, $x, $y) = @_; 2720 my ($self, $x, $y) = @_;
2239 2721
2240 ($x, $y) 2722 ($x, $y)
2241} 2723}
2242 2724
2725sub coord2global {
2726 my ($self, $x, $y) = @_;
2727
2728 ($x, $y)
2729}
2730
2243sub update { 2731sub update {
2244 my ($self) = @_; 2732 my ($self) = @_;
2245 2733
2246 $self->check_size; 2734 $self->check_size;
2247 ::refresh (); 2735 $::WANT_REFRESH++;
2248} 2736}
2249 2737
2250sub add { 2738sub add {
2251 my ($self, $child) = @_; 2739 my ($self, $child) = @_;
2252 2740
2253 # integerize window positions 2741 # integerise window positions
2254 $child->{x} = int $child->{x}; 2742 $child->{x} = int $child->{x};
2255 $child->{y} = int $child->{y}; 2743 $child->{y} = int $child->{y};
2256 2744
2257 $self->SUPER::add ($child); 2745 $self->SUPER::add ($child);
2258} 2746}
… …
2261 my ($self, $id, $cb) = @_; 2749 my ($self, $id, $cb) = @_;
2262 2750
2263 $self->{refresh_hook}{$id} = $cb; 2751 $self->{refresh_hook}{$id} = $cb;
2264} 2752}
2265 2753
2266sub draw { 2754sub draw {
2267 my ($self) = @_; 2755 my ($self) = @_;
2268 2756
2757 if ($self->{check_size}) {
2758 my @queue = ([], []);
2759
2760 for (;;) {
2761 if ($self->{check_size}) {
2762 # heuristic: check containers last
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2764 for values %{delete $self->{check_size}}
2765 }
2766
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2768
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request;
2772
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2774 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h;
2776
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2778
2779 $widget->{parent}->check_size
2780 if $widget->{parent};
2781 }
2782 }
2783 }
2784
2785 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_;
2788
2789 $widget->{w} = $w;
2790 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h);
2793 }
2794 }
2795
2269 while (my $rcb = delete $self->{refresh_hook}) { 2796 while ($self->{refresh_hook}) {
2270 $_->() for values %$rcb; 2797 $_->()
2798 for values %{delete $self->{refresh_hook}};
2271 } 2799 }
2272 2800
2273 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2801 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2274 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2275 glClear GL_COLOR_BUFFER_BIT; 2803 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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