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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.155 by root, Sun Apr 23 02:22:54 2006 UTC vs.
Revision 1.193 by root, Wed May 10 21:12:26 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 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $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
… …
325 381
326sub set_parent { 382sub set_parent {
327 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
328 384
329 Scalar::Util::weaken ($self->{parent} = $parent); 385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
330} 389}
331 390
332sub check_size { 391sub check_size {
333 my ($self) = @_; 392 my ($self) = @_;
334 393
335 return unless $self->{parent}; 394 $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} 395}
346 396
347sub update { 397sub update {
348 my ($self) = @_; 398 my ($self) = @_;
349 399
… …
358} 408}
359 409
360sub emit { 410sub emit {
361 my ($self, $signal, @args) = @_; 411 my ($self, $signal, @args) = @_;
362 412
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
364 $cb->($self, @args);
365 }
366} 414}
367 415
368sub DESTROY { 416sub DESTROY {
369 my ($self) = @_; 417 my ($self) = @_;
370 418
… …
437sub new { 485sub new {
438 my ($class, %arg) = @_; 486 my ($class, %arg) = @_;
439 487
440 my $children = delete $arg{children} || []; 488 my $children = delete $arg{children} || [];
441 489
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 490 my $self = $class->SUPER::new (
491 children => [],
492 can_events => 0,
493 %arg,
494 );
443 $self->add ($_) for @$children; 495 $self->add ($_) for @$children;
444 496
445 $self 497 $self
446} 498}
447 499
448sub add { 500sub add {
449 my ($self, $child) = @_; 501 my ($self, @widgets) = @_;
450 502
451 $child->set_parent ($self); 503 $_->set_parent ($self)
504 for @widgets;
452 505
453 use sort 'stable'; 506 use sort 'stable';
454 507
455 $self->{children} = [ 508 $self->{children} = [
456 sort { $a->{z} <=> $b->{z} } 509 sort { $a->{z} <=> $b->{z} }
457 @{$self->{children}}, $child 510 @{$self->{children}}, @widgets
458 ]; 511 ];
459 512
460 $child->check_size; 513 $self->check_size;
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) = @_;
… …
1052} 1213}
1053 1214
1054sub size_allocate { 1215sub size_allocate {
1055 my ($self, $w, $h) = @_; 1216 my ($self, $w, $h) = @_;
1056 1217
1218 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1219
1057 my $children = $self->{children}; 1220 my $children = $self->{children};
1058 1221
1059 my @h = map $_->{req_h}, @$children; 1222 my @h = map $_->{req_h}, @$children;
1060 1223
1061 my $req_h = List::Util::sum @h; 1224 my $req_h = List::Util::sum @h;
… …
1098 1261
1099sub new { 1262sub new {
1100 my ($class, %arg) = @_; 1263 my ($class, %arg) = @_;
1101 1264
1102 my $self = $class->SUPER::new ( 1265 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1266 fg => [1, 1, 1],
1267 #font => default_font
1104 fontsize => 1, 1268 fontsize => 1,
1105 text => "", 1269 text => "",
1106 align => -1, 1270 align => -1,
1107 valign => -1, 1271 valign => -1,
1108 padding => 2, 1272 padding => 2,
1109 layout => new CFClient::Layout, 1273 layout => new CFClient::Layout,
1110 can_events => 0, 1274 can_events => 0,
1111 %arg 1275 %arg
1112 ); 1276 );
1113 1277
1114 if (exists $self->{template}) { 1278 if (exists $self->{template}) {
… …
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1285 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1122 1286
1123 $self 1287 $self
1124} 1288}
1125 1289
1126sub escape_text { 1290sub escape {
1127 local $_ = $_[1]; 1291 local $_ = $_[1];
1128 1292
1129 s/&/&amp;/g; 1293 s/&/&amp;/g;
1130 s/>/&gt;/g; 1294 s/>/&gt;/g;
1131 s/</&lt;/g; 1295 s/</&lt;/g;
1132 1296
1133 $_[1] 1297 $_[1]
1134} 1298}
1135 1299
1300sub update {
1301 my ($self) = @_;
1302
1303 delete $self->{texture};
1304 $self->SUPER::update;
1305}
1306
1136sub set_text { 1307sub set_text {
1137 my ($self, $text) = @_; 1308 my ($self, $text) = @_;
1138 1309
1310 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text";
1312
1139 $self->{layout}->set_text ($text); 1313 $self->{layout}->set_text ($text);
1140 1314
1141 delete $self->{texture}; 1315 $self->update;
1142 $self->check_size; 1316 $self->check_size;
1143 $self->update;
1144} 1317}
1145 1318
1146sub set_markup { 1319sub set_markup {
1147 my ($self, $markup) = @_; 1320 my ($self, $markup) = @_;
1148 1321
1322 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup";
1324
1149 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1150 1326
1151 delete $self->{texture}; 1327 $self->update;
1152 $self->check_size; 1328 $self->check_size;
1153 $self->update;
1154} 1329}
1155 1330
1156sub size_request { 1331sub size_request {
1157 my ($self) = @_; 1332 my ($self) = @_;
1158 1333
1159 $self->{layout}->set_width; 1334 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1);
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1337
1162 my ($w, $h) = $self->{layout}->size; 1338 my ($w, $h) = $self->{layout}->size;
1163 1339
1164 if (exists $self->{template}) { 1340 if (exists $self->{template}) {
1341 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1342 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1343
1167 my ($w2, $h2) = $self->{template}->size; 1344 my ($w2, $h2) = $self->{template}->size;
1168 1345
1169 $w = List::Util::max $w, $w2; 1346 $w = List::Util::max $w, $w2;
… …
1185sub set_fontsize { 1362sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1187 1364
1188 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1190 $self->check_size; 1369 $self->check_size;
1191 $self->update;
1192} 1370}
1193 1371
1194sub _draw { 1372sub _draw {
1195 my ($self) = @_; 1373 my ($self) = @_;
1196 1374
1197 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1377 $self->{layout}->set_width ($self->{w});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1378 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1200 new_from_layout CFClient::Texture $self->{layout} 1379 new_from_layout CFClient::Texture $self->{layout}
1201 }; 1380 };
1202 1381
… …
1235 1414
1236sub new { 1415sub new {
1237 my $class = shift; 1416 my $class = shift;
1238 1417
1239 $class->SUPER::new ( 1418 $class->SUPER::new (
1240 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1244 can_hover => 1, 1423 can_hover => 1,
1245 can_focus => 1, 1424 can_focus => 1,
1246 valign => 0, 1425 valign => 0,
1247 can_events => 1, 1426 can_events => 1,
1248 @_ 1427 @_
1249 ) 1428 )
1250} 1429}
1251 1430
… …
1405 my ($self, $ev) = @_; 1584 my ($self, $ev) = @_;
1406 1585
1407 my $sym = $ev->{sym}; 1586 my $sym = $ev->{sym};
1408 1587
1409 if ($sym == 13) { 1588 if ($sym == 13) {
1589 unshift @{$self->{history}},
1590 my $txt = $self->get_text;
1591 $self->{history_pointer} = -1;
1592 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1593 $self->emit (activate => $txt);
1411 $self->update; 1594 $self->update;
1595
1596 } elsif ($sym == CFClient::SDLK_UP) {
1597 if ($self->{history_pointer} < 0) {
1598 $self->{history_saveback} = $self->get_text;
1599 }
1600 if (@{$self->{history} || []} > 0) {
1601 $self->{history_pointer}++;
1602 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1603 $self->{history_pointer} = @{$self->{history} || []} - 1;
1604 }
1605 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1606 }
1607
1608 } elsif ($sym == CFClient::SDLK_DOWN) {
1609 $self->{history_pointer}--;
1610 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1611
1612 if ($self->{history_pointer} >= 0) {
1613 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1614 } else {
1615 $self->set_text ($self->{history_saveback});
1616 }
1412 1617
1413 } else { 1618 } else {
1414 $self->SUPER::key_down ($ev); 1619 $self->SUPER::key_down ($ev);
1415 } 1620 }
1416 1621
… …
1430 1635
1431sub new { 1636sub new {
1432 my $class = shift; 1637 my $class = shift;
1433 1638
1434 $class->SUPER::new ( 1639 $class->SUPER::new (
1435 padding => 4, 1640 padding => 4,
1436 fg => [1, 1, 1], 1641 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2], 1642 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1643 active_fg => [0, 0, 1],
1439 can_hover => 1, 1644 can_hover => 1,
1440 align => 0, 1645 align => 0,
1441 valign => 0, 1646 valign => 0,
1442 can_events => 1, 1647 can_events => 1,
1443 @_ 1648 @_
1444 ) 1649 )
1445} 1650}
1446 1651
… …
1605 1810
1606package CFClient::UI::VGauge; 1811package CFClient::UI::VGauge;
1607 1812
1608our @ISA = CFClient::UI::Base::; 1813our @ISA = CFClient::UI::Base::;
1609 1814
1815use List::Util qw(min max);
1816
1610use CFClient::OpenGL; 1817use CFClient::OpenGL;
1611 1818
1612my %tex = ( 1819my %tex = (
1613 food => [ 1820 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1821 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1822 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1823 ],
1617 grace => [ 1824 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1825 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1826 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1827 ],
1621 hp => [ 1828 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1829 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1830 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1831 ],
1625 mana => [ 1832 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1834 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1835 ],
1629); 1836);
1630 1837
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1838# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1839sub new {
… …
1651} 1858}
1652 1859
1653sub set_max { 1860sub set_max {
1654 my ($self, $max) = @_; 1861 my ($self, $max) = @_;
1655 1862
1863 return if $self->{max_val} == $max;
1864
1656 $self->{max_val} = $max; 1865 $self->{max_val} = $max;
1866 $self->update;
1657} 1867}
1658 1868
1659sub set_value { 1869sub set_value {
1660 my ($self, $val, $max) = @_; 1870 my ($self, $val, $max) = @_;
1661 1871
1662 $self->set_max ($max) 1872 $self->set_max ($max)
1663 if defined $max; 1873 if defined $max;
1664 1874
1665 $max = $self->{max_val}; 1875 return if $self->{val} == $val;
1876
1666 $self->{val} = $val; 1877 $self->{val} = $val;
1667
1668 $self->update; 1878 $self->update;
1669} 1879}
1670 1880
1671sub _draw { 1881sub _draw {
1672 my ($self) = @_; 1882 my ($self) = @_;
1673 1883
1674 my $tex = $tex{$self->{type}}; 1884 my $tex = $tex{$self->{type}};
1885 my ($t1, $t2, $t3) = @$tex;
1675 1886
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1887 my ($w, $h) = ($self->{w}, $self->{h});
1677 1888
1678 if ($self->{vertical}) { 1889 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1890 glRotate 90, 0, 0, 1;
… …
1681 1892
1682 ($w, $h) = ($h, $w); 1893 ($w, $h) = ($h, $w);
1683 } 1894 }
1684 1895
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1896 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1897
1688 my $t1 = $tex->[0]; 1898 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 1899 my $ycut2 = max 0, min 1, $ycut - 1;
1900
1901 my $h1 = $self->{h} * (1 - $ycut1);
1902 my $h2 = $self->{h} * (1 - $ycut2);
1690 1903
1691 glEnable GL_BLEND; 1904 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1905 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1906 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1907 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1908
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1909 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1910 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1911 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1912 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1913 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1914 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1915 glEnd;
1706 1916
1917 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1918 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1919 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1920 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1921 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1922 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1923 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 1924 glEnd;
1925
1926 if ($t3) {
1927 glBindTexture GL_TEXTURE_2D, $t3->{name};
1928 glBegin GL_QUADS;
1929 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1930 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1931 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1932 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1933 glEnd;
1934 }
1714 1935
1715 glDisable GL_BLEND; 1936 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1937 glDisable GL_TEXTURE_2D;
1717} 1938}
1718 1939
… …
1724 1945
1725sub new { 1946sub new {
1726 my ($class, %arg) = @_; 1947 my ($class, %arg) = @_;
1727 1948
1728 my $self = $class->SUPER::new ( 1949 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 1950 tooltip => $arg{type},
1951 can_hover => 1,
1952 can_events => 1,
1730 %arg, 1953 %arg,
1731 ); 1954 );
1732 1955
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1956 $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); 1957 $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"); 1958 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 1959
1737 $self 1960 $self
1738} 1961}
1739 1962
… …
1742 1965
1743 $self->{value}->set_fontsize ($fsize); 1966 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 1967 $self->{max} ->set_fontsize ($fsize);
1745} 1968}
1746 1969
1970sub set_max {
1971 my ($self, $max) = @_;
1972
1973 $self->{gauge}->set_max ($max);
1974 $self->{max}->set_text ($max);
1975}
1976
1747sub set_value { 1977sub set_value {
1748 my ($self, $val, $max) = @_; 1978 my ($self, $val, $max) = @_;
1749 1979
1750 $self->set_max ($max) 1980 $self->set_max ($max)
1751 if defined $max; 1981 if defined $max;
1752 1982
1753 $self->{gauge}->set_value ($val, $max); 1983 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 1984 $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} 1985}
1763 1986
1764############################################################################# 1987#############################################################################
1765 1988
1766package CFClient::UI::Slider; 1989package CFClient::UI::Slider;
… …
1785 # TODO: calculations are off 2008 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 2009 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2010 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 2011 active_fg => [0, 0, 0],
1789 range => [0, 0, 100, 10], 2012 range => [0, 0, 100, 10],
1790 req_w => 20, 2013 req_w => $::WIDTH / 80,
1791 req_h => 20, 2014 req_h => $::WIDTH / 80,
1792 vertical => 0, 2015 vertical => 0,
1793 can_hover => 1, 2016 can_hover => 1,
1794 inner_pad => 5, 2017 inner_pad => 5,
1795 @_ 2018 @_
1796 ); 2019 );
… …
1906 2129
1907sub new { 2130sub new {
1908 my $class = shift; 2131 my $class = shift;
1909 2132
1910 my $self = $class->SUPER::new ( 2133 my $self = $class->SUPER::new (
1911 fontsize => 1, 2134 fontsize => 1,
2135 can_events => 0,
2136 #font => default_font
1912 @_, 2137 @_,
1913 2138
1914 layout => (new CFClient::Layout), 2139 layout => (new CFClient::Layout),
1915 par => [], 2140 par => [],
1916 height => 0, 2141 height => 0,
1917 children => [ 2142 children => [
1918 (new CFClient::UI::Empty expand => 1), 2143 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2144 (new CFClient::UI::Slider vertical => 1),
1920 ], 2145 ],
1921 ); 2146 );
1922 2147
1923 $self->{children}[1]->connect (changed => sub { 2148 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2149
1927 $self 2150 $self
1928} 2151}
1929 2152
1930sub set_fontsize { 2153sub set_fontsize {
… …
1938 my ($self, $text) = @_; 2161 my ($self, $text) = @_;
1939 2162
1940 my $layout = $self->{layout}; 2163 my $layout = $self->{layout};
1941 2164
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2166 $layout->set_width ($self->{children}[0]{w});
1944 $layout->set_text ($text); 2167 $layout->set_text ($text);
1945 2168
1946 ($layout->size)[1] 2169 ($layout->size)[1]
1947} 2170}
1948 2171
… …
1956sub size_allocate { 2179sub size_allocate {
1957 my ($self, $w, $h) = @_; 2180 my ($self, $w, $h) = @_;
1958 2181
1959 $self->SUPER::size_allocate ($w, $h); 2182 $self->SUPER::size_allocate ($w, $h);
1960 2183
2184 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2185 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1962 $self->{layout}->set_width ($self->{children}[0]{w}); 2186 $self->{layout}->set_width ($self->{children}[0]{w});
1963 2187
1964 $self->reflow; 2188 $self->reflow;
1965} 2189}
… …
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2224 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2001 2225
2002 delete $self->{texture}; 2226 delete $self->{texture};
2003 } 2227 }
2004 2228
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2229 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2006 glClearColor 0, 0, 0, 1; 2230 glClearColor 0, 0, 0, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2231 glClear GL_COLOR_BUFFER_BIT;
2008 2232
2009 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2235 glEnable GL_TEXTURE_2D;
… …
2018 2242
2019 my $y = 0; 2243 my $y = 0;
2020 2244
2021 my $layout = $self->{layout}; 2245 my $layout = $self->{layout};
2022 2246
2247 $layout->set_font ($self->{font}) if $self->{font};
2248
2023 for my $par (@{$self->{par}}) { 2249 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2250 my $h = $par->[0];
2025 2251
2026 if ($y0 < $y + $h && $y < $y1) { 2252 if ($y0 < $y + $h && $y < $y1) {
2027 $layout->set_text ($par->[2]); 2253 $layout->set_text ($par->[2]);
… …
2041} 2267}
2042 2268
2043sub _draw { 2269sub _draw {
2044 my ($self) = @_; 2270 my ($self) = @_;
2045 2271
2046 if ($self->{texture}) { 2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2047 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276 glColor 1, 1, 1, 1;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2277 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2278 glDisable GL_TEXTURE_2D;
2051 } 2279 glDisable GL_BLEND;
2052 2280
2053 $self->{children}[1]->draw; 2281 $self->{children}[1]->draw;
2054 2282
2055} 2283}
2056 2284
… …
2104 2332
2105sub new { 2333sub new {
2106 my $class = shift; 2334 my $class = shift;
2107 2335
2108 my $self = $class->SUPER::new ( 2336 my $self = $class->SUPER::new (
2109 state => 0, 2337 state => 0,
2110 connect_activate => \&toggle_flopper, 2338 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2339 @_
2113 ); 2340 );
2114 2341
2115 if ($self->{state}) { 2342 if ($self->{state}) {
2116 $self->{state} = 0; 2343 $self->{state} = 0;
… …
2151 @_, 2378 @_,
2152 can_events => 0, 2379 can_events => 0,
2153 ) 2380 )
2154} 2381}
2155 2382
2156sub set_text { 2383sub set_markup {
2157 my ($self, $text) = @_; 2384 my ($self, $text) = @_;
2158 2385
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2386 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2160 $self->{label}->set_text ($text); 2387 $self->{label}->set_markup ($text);
2161 $self->add ($self->{label}); 2388 $self->add ($self->{label});
2162} 2389}
2163 2390
2164sub size_request { 2391sub size_request {
2165 my ($self) = @_; 2392 my ($self) = @_;
2166 2393
2394 $self->child->set_max_size ($::WIDTH * 0.3);
2395
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2397
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2398 ($w + 4, $h + 4)
2399}
2400
2401sub size_allocate {
2402 my ($self, $w, $h) = @_;
2403
2404 $self->SUPER::size_allocate ($w - 4, $h - 4);
2173} 2405}
2174 2406
2175sub _draw { 2407sub _draw {
2176 my ($self) = @_; 2408 my ($self) = @_;
2177 2409
… …
2202 $self->SUPER::_draw; 2434 $self->SUPER::_draw;
2203} 2435}
2204 2436
2205############################################################################# 2437#############################################################################
2206 2438
2439package CFClient::UI::Face;
2440
2441our @ISA = CFClient::UI::Base::;
2442
2443use CFClient::OpenGL;
2444
2445sub new {
2446 my $class = shift;
2447
2448 $class->SUPER::new (
2449 aspect => 1,
2450 @_,
2451 )
2452}
2453
2454sub size_request {
2455 (32, 8)
2456}
2457
2458sub _draw {
2459 my ($self) = @_;
2460
2461 return unless $::CONN;#d# manage and cache textures differently
2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2463
2464 # TODO animation
2465 if ($tex) {
2466 glEnable GL_BLEND;
2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1;
2471 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D;
2473 glDisable GL_BLEND;
2474 }
2475}
2476
2477#############################################################################
2478
2479package CFClient::UI::InventoryItem;
2480
2481our @ISA = CFClient::UI::HBox::;
2482
2483sub new {
2484 my $class = shift;
2485
2486 my %args = @_;
2487
2488 my $item = delete $args{item};
2489
2490 my $desc = $item->{nrof} < 2
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494
2495 my $self = $class->SUPER::new (
2496 can_hover => 1,
2497 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_;
2502
2503 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) {
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519 ],
2520 )->popup ($ev);
2521 }
2522
2523 1
2524 },
2525 %args
2526 );
2527
2528 $self->add (new CFClient::UI::Face
2529 can_events => 0,
2530 face => $item->{face},
2531 anim => $item->{anim},
2532 animspeed => $item->{animspeed},
2533 );
2534
2535 $self->add (new CFClient::UI::Label
2536 can_events => 0,
2537 text => $desc,
2538 );
2539
2540 $self
2541}
2542
2543#############################################################################
2544
2545package CFClient::UI::Inventory;
2546
2547our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549sub new {
2550 my $class = shift;
2551
2552 my $self = $class->SUPER::new (
2553 scrolled => (new CFClient::UI::VBox),
2554 @_,
2555 );
2556
2557 $self
2558}
2559
2560sub set_items {
2561 my ($self, $items) = @_;
2562
2563 $self->{scrolled}->clear;
2564 return unless $items;
2565
2566 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2567
2568 $self->{real_items} = \@items;
2569
2570 for my $item (@items) {
2571 my $desc = $item->{nrof} < 2
2572 ? $item->{name}
2573 : "$item->{nrof} $item->{name_pl}";
2574
2575 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2576 }
2577
2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579}
2580
2581sub size_request {
2582 my ($self) = @_;
2583 ($self->{req_w}, $self->{req_h});
2584}
2585
2586#############################################################################
2587
2588package CFClient::UI::Menu;
2589
2590our @ISA = CFClient::UI::FancyFrame::;
2591
2592use CFClient::OpenGL;
2593
2594sub new {
2595 my $class = shift;
2596
2597 my $self = $class->SUPER::new (
2598 items => [],
2599 z => 100,
2600 @_,
2601 );
2602
2603 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2604
2605 for my $item (@{ $self->{items} }) {
2606 my ($widget, $cb) = @$item;
2607
2608 # handle various types of items, only text for now
2609 if (!ref $widget) {
2610 $widget = new CFClient::UI::Label
2611 can_hover => 1,
2612 can_events => 1,
2613 text => $widget;
2614 }
2615
2616 $self->{item}{$widget} = $item;
2617
2618 $self->{vbox}->add ($widget);
2619 }
2620
2621 $self
2622}
2623
2624# popup given the event (must be a mouse button down event currently)
2625sub popup {
2626 my ($self, $ev) = @_;
2627
2628 $self->emit ("popdown");
2629
2630 # maybe save $GRAB? must be careful about events...
2631 $GRAB = $self;
2632 $self->{button} = $ev->{button};
2633
2634 $self->show;
2635 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2636}
2637
2638sub mouse_motion {
2639 my ($self, $ev, $x, $y) = @_;
2640
2641 # TODO: should use vbox->find_widget or so
2642 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2643 $self->{hover} = $self->{item}{$HOVER};
2644}
2645
2646sub button_up {
2647 my ($self, $ev, $x, $y) = @_;
2648
2649 if ($ev->{button} == $self->{button}) {
2650 undef $GRAB;
2651 $self->hide;
2652
2653 $self->emit ("popdown");
2654 $self->{hover}[1]->() if $self->{hover};
2655 }
2656}
2657
2658#############################################################################
2659
2207package CFClient::UI::Root; 2660package CFClient::UI::Root;
2208 2661
2209our @ISA = CFClient::UI::Container::; 2662our @ISA = CFClient::UI::Container::;
2210 2663
2211use CFClient::OpenGL; 2664use CFClient::OpenGL;
2212 2665
2213sub check_size { 2666sub new {
2214 my ($self) = @_; 2667 my $class = shift;
2215 2668
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2669 $class->SUPER::new (
2217} 2670 @_,
2218 2671 )
2219sub size_request {
2220 ($::WIDTH, $::HEIGHT)
2221} 2672}
2222 2673
2223sub configure { 2674sub configure {
2224 my ($self, $x, $y, $w, $h) = @_; 2675 my ($self, $x, $y, $w, $h) = @_;
2225 2676
2226 $self->SUPER::configure ($x, $y, $w, $h); 2677 $self->{w} = $w;
2678 $self->{h} = $h;
2679}
2227 2680
2681sub check_size {
2682 my ($self) = @_;
2683
2684 $self->size_allocate ($self->{w}, $self->{h})
2685 if $self->{w};
2686}
2687
2688sub size_request {
2689 my ($self) = @_;
2690
2691 ($self->{w}, $self->{h})
2692}
2693
2694sub size_allocate {
2695 my ($self, $w, $h) = @_;
2696
2697 my $old_w = $self->{old_w};
2698 my $old_h = $self->{old_h};
2699
2700 if ($old_w && $old_h) {
2701 for my $child ($self->children) {
2702 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710 }
2711 }
2712
2228 for my $child (@{$self->{children}}) { 2713 for my $child ($self->children) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2714 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230 2715
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2716 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2233 $child->configure ($X, $Y, $W,$H); 2718 $child->configure ($X, $Y, $W, $H);
2234 } 2719 }
2235}
2236 2720
2237sub _topleft { 2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723}
2724
2725sub coord2local {
2238 my ($self, $x, $y) = @_; 2726 my ($self, $x, $y) = @_;
2239 2727
2240 ($x, $y) 2728 ($x, $y)
2241} 2729}
2242 2730
2731sub coord2global {
2732 my ($self, $x, $y) = @_;
2733
2734 ($x, $y)
2735}
2736
2243sub update { 2737sub update {
2244 my ($self) = @_; 2738 my ($self) = @_;
2245 2739
2246 $self->check_size; 2740 $self->check_size;
2247 ::refresh (); 2741 $::WANT_REFRESH++;
2248} 2742}
2249 2743
2250sub add { 2744sub add {
2251 my ($self, $child) = @_; 2745 my ($self, $child) = @_;
2252 2746
2253 # integerize window positions 2747 # integerise window positions
2254 $child->{x} = int $child->{x}; 2748 $child->{x} = int $child->{x};
2255 $child->{y} = int $child->{y}; 2749 $child->{y} = int $child->{y};
2256 2750
2257 $self->SUPER::add ($child); 2751 $self->SUPER::add ($child);
2258} 2752}
… …
2261 my ($self, $id, $cb) = @_; 2755 my ($self, $id, $cb) = @_;
2262 2756
2263 $self->{refresh_hook}{$id} = $cb; 2757 $self->{refresh_hook}{$id} = $cb;
2264} 2758}
2265 2759
2266sub draw { 2760sub draw {
2267 my ($self) = @_; 2761 my ($self) = @_;
2268 2762
2763 if ($self->{check_size}) {
2764 my @queue = ([], []);
2765
2766 for (;;) {
2767 if ($self->{check_size}) {
2768 # heuristic: check containers last
2769 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2770 for values %{delete $self->{check_size}}
2771 }
2772
2773 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2774
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request;
2778
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2780 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781
2782 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h;
2784
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2786
2787 $widget->{parent}->check_size
2788 if $widget->{parent};
2789 }
2790 }
2791 }
2792
2793 while ($self->{size_alloc}) {
2794 for (values %{delete $self->{size_alloc}}) {
2795 my ($widget, $w, $h) = @$_;
2796
2797 $w = 0 if $w < 0;
2798 $h = 0 if $h < 0;
2799
2800 $widget->{w} = $w;
2801 $widget->{h} = $h;
2802 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h);
2804 }
2805 }
2806
2269 while (my $rcb = delete $self->{refresh_hook}) { 2807 while ($self->{refresh_hook}) {
2270 $_->() for values %$rcb; 2808 $_->()
2809 for values %{delete $self->{refresh_hook}};
2271 } 2810 }
2272 2811
2273 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2812 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2274 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2275 glClear GL_COLOR_BUFFER_BIT; 2814 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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