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.152 by root, Sun Apr 23 01:05:03 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
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
23 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
25 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
26 } 39 }
27 40
28 return; 41 return;
29 } 42 }
30 } 43 }
… …
34 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
35} 48}
36 49
37# class methods for events 50# class methods for events
38sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
40} 54}
41 55
42sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
44} 59}
45 60
46sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
47 my ($ev) = @_; 62 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 71 check_tooltip;
57 } 72 }
58 73
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 75
61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
62} 80}
63 81
64sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
65 my ($ev) = @_; 83 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
67 85
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 87
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 89
72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
73 94
74 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 97 $grab->update if $grab;
77 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 115
95 check_tooltip; 116 check_tooltip;
96 } 117 }
97 118
98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
99} 123}
100 124
101# convert position array to integers 125# convert position array to integers
102sub harmonize { 126sub harmonize {
103 my ($vals) = @_; 127 my ($vals) = @_;
… …
121 145
122sub new { 146sub new {
123 my $class = shift; 147 my $class = shift;
124 148
125 my $self = bless { 149 my $self = bless {
126 x => 0, 150 x => 0,
127 y => 0, 151 y => 0,
128 z => 0, 152 z => 0,
129 can_events => 1, 153 can_events => 1,
130 @_ 154 @_
131 }, $class; 155 }, $class;
132 156
133 for (keys %$self) { 157 for (keys %$self) {
… …
137 } 161 }
138 162
139 $self 163 $self
140} 164}
141 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
142sub show { 173sub show {
143 my ($self) = @_; 174 my ($self) = @_;
144 175
145 return if $self->{parent}; 176 return if $self->{parent};
146 177
… …
148} 179}
149 180
150sub hide { 181sub hide {
151 my ($self) = @_; 182 my ($self) = @_;
152 183
153 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
154 186
155 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
156} 189}
157 190
158sub move { 191sub move {
159 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
160 193
… …
163 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
164 197
165 $self->update; 198 $self->update;
166} 199}
167 200
168sub needs_redraw { 201sub set_size {
169 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
170} 208}
171 209
172sub size_request { 210sub size_request {
173 require Carp; 211 require Carp;
174 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
194 $self->{y} = $y; 232 $self->{y} = $y;
195 $self->update; 233 $self->update;
196 } 234 }
197 235
198 if ($self->{w} != $w || $self->{h} != $h) { 236 if ($self->{w} != $w || $self->{h} != $h) {
199 $self->{w} = $w; 237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
200 $self->{h} = $h;
201
202 $self->size_allocate ($w, $h);
203 $self->update;
204 } 238 }
205} 239}
206 240
207sub size_allocate { 241sub size_allocate {
208 # nothing to be done 242 # nothing to be done
209} 243}
210 244
211# return top left coordinates 245sub children {
212sub _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 {
213 my ($self, $x, $y) = @_; 261 my ($self, $w, $h) = @_;
214 262
215 $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;
216} 265}
217 266
218# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
219sub coord2local { 268sub coord2local {
220 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
221 270
222 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
223 ($x - $X, $y - $Y)
224} 272}
225 273
226# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
227sub coord2global { 275sub coord2global {
228 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
229 277
230 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
231 ($x + $X, $y + $Y)
232} 279}
233 280
234sub focus_in { 281sub focus_in {
235 my ($self) = @_; 282 my ($self) = @_;
236 283
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 343 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 344 glVertex $x , $y + $self->{h};
298 glEnd; 345 glEnd;
299 glDisable GL_BLEND; 346 glDisable GL_BLEND;
300 } 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 }
301} 362}
302 363
303sub _draw { 364sub _draw {
304 my ($self) = @_; 365 my ($self) = @_;
305 366
… …
320 381
321sub set_parent { 382sub set_parent {
322 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
323 384
324 Scalar::Util::weaken ($self->{parent} = $parent); 385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
325} 389}
326 390
327sub check_size { 391sub check_size {
328 my ($self) = @_; 392 my ($self) = @_;
329 393
330 return unless $self->{parent}; 394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
331
332 my ($w, $h) = $self->size_request;
333
334 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w;
336 $self->{req_h} = $h;
337
338 $self->{parent}->check_size;
339 }
340} 395}
341 396
342sub update { 397sub update {
343 my ($self) = @_; 398 my ($self) = @_;
344 399
… …
353} 408}
354 409
355sub emit { 410sub emit {
356 my ($self, $signal, @args) = @_; 411 my ($self, $signal, @args) = @_;
357 412
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 414}
362 415
363sub DESTROY { 416sub DESTROY {
364 my ($self) = @_; 417 my ($self) = @_;
365 418
… …
432sub new { 485sub new {
433 my ($class, %arg) = @_; 486 my ($class, %arg) = @_;
434 487
435 my $children = delete $arg{children} || []; 488 my $children = delete $arg{children} || [];
436 489
437 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 );
438 $self->add ($_) for @$children; 495 $self->add ($_) for @$children;
439 496
440 $self 497 $self
441} 498}
442 499
443sub add { 500sub add {
444 my ($self, $child) = @_; 501 my ($self, @widgets) = @_;
445 502
446 $child->set_parent ($self); 503 $_->set_parent ($self)
504 for @widgets;
447 505
448 use sort 'stable'; 506 use sort 'stable';
449 507
450 $self->{children} = [ 508 $self->{children} = [
451 sort { $a->{z} <=> $b->{z} } 509 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 510 @{$self->{children}}, @widgets
453 ]; 511 ];
454 512
455 $child->check_size; 513 $self->check_size;
514 $self->update;
515}
516
517sub children {
518 @{ $_[0]{children} }
456} 519}
457 520
458sub remove { 521sub remove {
459 my ($self, $child) = @_; 522 my ($self, $child) = @_;
460 523
461 delete $child->{parent}; 524 delete $child->{parent};
525 $child->hide;
462 526
463 $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 }
464 543
465 $self->check_size; 544 $self->check_size;
466 $self->update; 545 $self->update;
467} 546}
468 547
… …
546} 625}
547 626
548sub update { 627sub update {
549 my ($self) = @_; 628 my ($self) = @_;
550 629
551 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 631 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 632}
565 633
566sub size_allocate { 634sub size_allocate {
567 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
568 636
569 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
570 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
571 $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 };
572} 661}
573 662
574sub _draw { 663sub _draw {
575 my ($self) = @_; 664 my ($self) = @_;
576 665
… …
578 667
579 my $tex = $self->{texture} 668 my $tex = $self->{texture}
580 or return; 669 or return;
581 670
582 glEnable GL_BLEND; 671 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
585 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;
586 676
587 $tex->draw_quad (0, 0, $w, $h); 677 $tex->draw_quad (0, 0, $w, $h);
588 678
589 glDisable GL_BLEND; 679 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
… …
594 684
595package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
596 686
597our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
598 688
599sub new { die }
600
601sub size_request { 689sub size_request {
602 my ($self) = @_; 690 my ($self) = @_;
603 691
604 @$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)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
606 694
607 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
608} 696}
609 697
610sub _draw { 698sub size_allocate {
611 my ($self) = @_; 699 my ($self, $w, $h) = @_;
612 700
613 $self->{children}[1]->draw; 701 $self->update;
614} 702}
615 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
616 783
617############################################################################# 784#############################################################################
618 785
619package CFClient::UI::Frame; 786package CFClient::UI::Frame;
620 787
… …
631 border => 0.8, 798 border => 0.8,
632 @_ 799 @_
633 ); 800 );
634 801
635 $self 802 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643}
644
645sub size_request {
646 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h})
648}
649
650sub size_allocate {
651 my ($self, $w, $h) = @_;
652 $self->{w} = $w;
653 $self->{h} = $h;
654 $self->child->configure (0, 0, $w, $h);
655} 803}
656 804
657sub _draw { 805sub _draw {
658 my ($self) = @_; 806 my ($self) = @_;
659 807
… …
694 my $class = shift; 842 my $class = shift;
695 843
696 # TODO: user_x, user_y, overwrite moveto? 844 # TODO: user_x, user_y, overwrite moveto?
697 845
698 my $self = $class->SUPER::new ( 846 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 847 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 848 border_bg => [1, 1, 1, 1],
701 border => 0.8, 849 border => 0.6,
702 can_events => 1, 850 can_events => 1,
703 @_ 851 @_
704 ); 852 );
705 853
706 $self->{title} &&= new CFClient::UI::Label 854 $self->{title} &&= new CFClient::UI::Label
707 align => 0, 855 align => 0,
708 valign => 1, 856 valign => 1,
709 text => $self->{title}, 857 text => $self->{title},
710 fontsize => 1; 858 fontsize => $self->{border};
711 859
712 $self 860 $self
713} 861}
714 862
715sub border { 863sub border {
716 int $_[0]{border} * $::FONTSIZE 864 int $_[0]{border} * $::FONTSIZE
717} 865}
718 866
719sub size_request { 867sub size_request {
720 my ($self) = @_; 868 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723 869
724 my ($w, $h) = $self->SUPER::size_request; 870 my ($w, $h) = $self->SUPER::size_request;
725 871
726 ( 872 (
727 $w + $self->border * 2, 873 $w + $self->border * 2,
… …
742} 888}
743 889
744sub button_down { 890sub button_down {
745 my ($self, $ev, $x, $y) = @_; 891 my ($self, $ev, $x, $y) = @_;
746 892
893 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 894 my $border = $self->border;
748 895
749 if ($x < $self->{w} && $x >= $self->{w} - $border 896 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 897 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 898
899 if ($lr & $td) {
900 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 901 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 902 my ($bw, $bh) = ($self->{w}, $self->{h});
754 903
904 my $mx = $x < $border;
905 my $my = $y < $border;
906
755 $self->{motion} = sub { 907 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 908 my ($ev, $x, $y) = @_;
757 909
758 ($x, $y) = ($ev->{x}, $ev->{y}); 910 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy;
759 912
760 $self->{user_w} = $bw + $x - $ox; 913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
761 $self->{user_h} = $bh + $y - $oy; 914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
762 $self->check_size; 916 $self->check_size;
763 }; 917 };
764 918
765 } elsif ($x >= 0 && $x < $self->{w} 919 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 920 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 921 my ($bx, $by) = ($self->{x}, $self->{y});
770 922
771 $self->{motion} = sub { 923 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
… …
808 $tex[1]->draw_quad (0, 0, $w, $border); 960 $tex[1]->draw_quad (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
812 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813 my $bg = $tex[0]; 966 my $bg = $tex[0];
814 967
815 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
817 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
818 971
819 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
820 973
821 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
825 978
826 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
828 982
829 $self->{title}->draw if $self->{title}; 983 $self->{title}->draw if $self->{title};
984
830 $self->child->draw; 985 $self->child->draw;
831} 986}
832 987
833############################################################################# 988#############################################################################
834 989
… …
856 $self->{children}[$y][$x] = $child; 1011 $self->{children}[$y][$x] = $child;
857 1012
858 $child->check_size; 1013 $child->check_size;
859} 1014}
860 1015
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
861# 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?
862sub clear { 1021sub clear {
863 my ($self) = @_; 1022 my ($self) = @_;
864 1023
1024 my @children = $self->children;
865 delete $self->{children}; 1025 delete $self->{children};
1026
1027 for (@children) {
1028 delete $_->{parent};
1029 $_->hide;
1030 }
1031
866 $self->update; 1032 $self->update;
867} 1033}
868 1034
869sub get_wh { 1035sub get_wh {
870 my ($self) = @_; 1036 my ($self) = @_;
… …
1047} 1213}
1048 1214
1049sub size_allocate { 1215sub size_allocate {
1050 my ($self, $w, $h) = @_; 1216 my ($self, $w, $h) = @_;
1051 1217
1218 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1219
1052 my $children = $self->{children}; 1220 my $children = $self->{children};
1053 1221
1054 my @h = map $_->{req_h}, @$children; 1222 my @h = map $_->{req_h}, @$children;
1055 1223
1056 my $req_h = List::Util::sum @h; 1224 my $req_h = List::Util::sum @h;
… …
1093 1261
1094sub new { 1262sub new {
1095 my ($class, %arg) = @_; 1263 my ($class, %arg) = @_;
1096 1264
1097 my $self = $class->SUPER::new ( 1265 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1266 fg => [1, 1, 1],
1267 #font => default_font
1099 fontsize => 1, 1268 fontsize => 1,
1100 text => "", 1269 text => "",
1101 align => -1, 1270 align => -1,
1102 valign => -1, 1271 valign => -1,
1103 padding => 2, 1272 padding => 2,
1104 layout => new CFClient::Layout, 1273 layout => new CFClient::Layout,
1105 can_events => 0, 1274 can_events => 0,
1106 %arg 1275 %arg
1107 ); 1276 );
1108 1277
1109 if (exists $self->{template}) { 1278 if (exists $self->{template}) {
… …
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1285 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1117 1286
1118 $self 1287 $self
1119} 1288}
1120 1289
1121sub escape_text { 1290sub escape {
1122 local $_ = $_[1]; 1291 local $_ = $_[1];
1123 1292
1124 s/&/&amp;/g; 1293 s/&/&amp;/g;
1125 s/>/&gt;/g; 1294 s/>/&gt;/g;
1126 s/</&lt;/g; 1295 s/</&lt;/g;
1127 1296
1128 $_[1] 1297 $_[1]
1129} 1298}
1130 1299
1300sub update {
1301 my ($self) = @_;
1302
1303 delete $self->{texture};
1304 $self->SUPER::update;
1305}
1306
1131sub set_text { 1307sub set_text {
1132 my ($self, $text) = @_; 1308 my ($self, $text) = @_;
1133 1309
1310 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text";
1312
1134 $self->{layout}->set_text ($text); 1313 $self->{layout}->set_text ($text);
1135 1314
1136 delete $self->{texture}; 1315 $self->update;
1137 $self->check_size; 1316 $self->check_size;
1138 $self->update;
1139} 1317}
1140 1318
1141sub set_markup { 1319sub set_markup {
1142 my ($self, $markup) = @_; 1320 my ($self, $markup) = @_;
1143 1321
1322 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup";
1324
1144 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1145 1326
1146 delete $self->{texture}; 1327 $self->update;
1147 $self->check_size; 1328 $self->check_size;
1148 $self->update;
1149} 1329}
1150 1330
1151sub size_request { 1331sub size_request {
1152 my ($self) = @_; 1332 my ($self) = @_;
1153 1333
1154 $self->{layout}->set_width; 1334 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1);
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1337
1157 my ($w, $h) = $self->{layout}->size; 1338 my ($w, $h) = $self->{layout}->size;
1158 1339
1159 if (exists $self->{template}) { 1340 if (exists $self->{template}) {
1341 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1342 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1343
1162 my ($w2, $h2) = $self->{template}->size; 1344 my ($w2, $h2) = $self->{template}->size;
1163 1345
1164 $w = List::Util::max $w, $w2; 1346 $w = List::Util::max $w, $w2;
… …
1180sub set_fontsize { 1362sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1182 1364
1183 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1184 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1185 $self->check_size; 1369 $self->check_size;
1186 $self->update;
1187} 1370}
1188 1371
1189sub _draw { 1372sub _draw {
1190 my ($self) = @_; 1373 my ($self) = @_;
1191 1374
1192 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{w}); 1377 $self->{layout}->set_width ($self->{w});
1194 $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);
1195 new_from_layout CFClient::Texture $self->{layout} 1379 new_from_layout CFClient::Texture $self->{layout}
1196 }; 1380 };
1197 1381
… …
1230 1414
1231sub new { 1415sub new {
1232 my $class = shift; 1416 my $class = shift;
1233 1417
1234 $class->SUPER::new ( 1418 $class->SUPER::new (
1235 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1236 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1237 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1238 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1239 can_hover => 1, 1423 can_hover => 1,
1240 can_focus => 1, 1424 can_focus => 1,
1241 valign => 0, 1425 valign => 0,
1242 can_events => 1, 1426 can_events => 1,
1243 @_ 1427 @_
1244 ) 1428 )
1245} 1429}
1246 1430
… …
1400 my ($self, $ev) = @_; 1584 my ($self, $ev) = @_;
1401 1585
1402 my $sym = $ev->{sym}; 1586 my $sym = $ev->{sym};
1403 1587
1404 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} = '';
1405 $self->emit (activate => $self->get_text); 1593 $self->emit (activate => $txt);
1406 $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 }
1407 1617
1408 } else { 1618 } else {
1409 $self->SUPER::key_down ($ev); 1619 $self->SUPER::key_down ($ev);
1410 } 1620 }
1411 1621
… …
1425 1635
1426sub new { 1636sub new {
1427 my $class = shift; 1637 my $class = shift;
1428 1638
1429 $class->SUPER::new ( 1639 $class->SUPER::new (
1430 padding => 4, 1640 padding => 4,
1431 fg => [1, 1, 1], 1641 fg => [1, 1, 1],
1432 bg => [1, 1, 1, 0.2], 1642 bg => [1, 1, 1, 0.2],
1433 active_fg => [0, 0, 1], 1643 active_fg => [0, 0, 1],
1434 can_hover => 1, 1644 can_hover => 1,
1435 align => 0, 1645 align => 0,
1436 valign => 0, 1646 valign => 0,
1437 can_events => 1, 1647 can_events => 1,
1438 @_ 1648 @_
1439 ) 1649 )
1440} 1650}
1441 1651
… …
1600 1810
1601package CFClient::UI::VGauge; 1811package CFClient::UI::VGauge;
1602 1812
1603our @ISA = CFClient::UI::Base::; 1813our @ISA = CFClient::UI::Base::;
1604 1814
1815use List::Util qw(min max);
1816
1605use CFClient::OpenGL; 1817use CFClient::OpenGL;
1606 1818
1607my %tex = ( 1819my %tex = (
1608 food => [ 1820 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1821 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1822 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1823 ],
1612 grace => [ 1824 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1825 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 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/
1615 ], 1827 ],
1616 hp => [ 1828 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1829 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1830 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 1831 ],
1620 mana => [ 1832 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 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/
1623 ], 1835 ],
1624); 1836);
1625 1837
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 1838# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 1839sub new {
… …
1646} 1858}
1647 1859
1648sub set_max { 1860sub set_max {
1649 my ($self, $max) = @_; 1861 my ($self, $max) = @_;
1650 1862
1863 return if $self->{max_val} == $max;
1864
1651 $self->{max_val} = $max; 1865 $self->{max_val} = $max;
1866 $self->update;
1652} 1867}
1653 1868
1654sub set_value { 1869sub set_value {
1655 my ($self, $val, $max) = @_; 1870 my ($self, $val, $max) = @_;
1656 1871
1657 $self->set_max ($max) 1872 $self->set_max ($max)
1658 if defined $max; 1873 if defined $max;
1659 1874
1660 $max = $self->{max_val}; 1875 return if $self->{val} == $val;
1876
1661 $self->{val} = $val; 1877 $self->{val} = $val;
1662
1663 $self->update; 1878 $self->update;
1664} 1879}
1665 1880
1666sub _draw { 1881sub _draw {
1667 my ($self) = @_; 1882 my ($self) = @_;
1668 1883
1669 my $tex = $tex{$self->{type}}; 1884 my $tex = $tex{$self->{type}};
1885 my ($t1, $t2, $t3) = @$tex;
1670 1886
1671 my ($w, $h) = ($self->{w}, $self->{h}); 1887 my ($w, $h) = ($self->{w}, $self->{h});
1672 1888
1673 if ($self->{vertical}) { 1889 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 1890 glRotate 90, 0, 0, 1;
… …
1676 1892
1677 ($w, $h) = ($h, $w); 1893 ($w, $h) = ($h, $w);
1678 } 1894 }
1679 1895
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 1896 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 1897
1683 my $t1 = $tex->[0]; 1898 my $ycut1 = max 0, min 1, $ycut;
1684 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);
1685 1903
1686 glEnable GL_BLEND; 1904 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1905 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 1906 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1907 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 1908
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1909 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 1910 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 1911 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1912 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1913 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1914 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 1915 glEnd;
1701 1916
1917 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1918 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 1919 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1920 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1921 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1922 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1923 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 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 }
1709 1935
1710 glDisable GL_BLEND; 1936 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 1937 glDisable GL_TEXTURE_2D;
1712} 1938}
1713 1939
… …
1719 1945
1720sub new { 1946sub new {
1721 my ($class, %arg) = @_; 1947 my ($class, %arg) = @_;
1722 1948
1723 my $self = $class->SUPER::new ( 1949 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 1950 tooltip => $arg{type},
1951 can_hover => 1,
1952 can_events => 1,
1725 %arg, 1953 %arg,
1726 ); 1954 );
1727 1955
1728 $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");
1729 $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);
1730 $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");
1731 1959
1732 $self 1960 $self
1733} 1961}
1734 1962
… …
1737 1965
1738 $self->{value}->set_fontsize ($fsize); 1966 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize); 1967 $self->{max} ->set_fontsize ($fsize);
1740} 1968}
1741 1969
1970sub set_max {
1971 my ($self, $max) = @_;
1972
1973 $self->{gauge}->set_max ($max);
1974 $self->{max}->set_text ($max);
1975}
1976
1742sub set_value { 1977sub set_value {
1743 my ($self, $val, $max) = @_; 1978 my ($self, $val, $max) = @_;
1744 1979
1745 $self->set_max ($max) 1980 $self->set_max ($max)
1746 if defined $max; 1981 if defined $max;
1747 1982
1748 $self->{gauge}->set_value ($val, $max); 1983 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val); 1984 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757} 1985}
1758 1986
1759############################################################################# 1987#############################################################################
1760 1988
1761package CFClient::UI::Slider; 1989package CFClient::UI::Slider;
… …
1780 # TODO: calculations are off 2008 # TODO: calculations are off
1781 my $self = $class->SUPER::new ( 2009 my $self = $class->SUPER::new (
1782 fg => [1, 1, 1], 2010 fg => [1, 1, 1],
1783 active_fg => [0, 0, 0], 2011 active_fg => [0, 0, 0],
1784 range => [0, 0, 100, 10], 2012 range => [0, 0, 100, 10],
1785 req_w => 20, 2013 req_w => $::WIDTH / 80,
1786 req_h => 20, 2014 req_h => $::WIDTH / 80,
1787 vertical => 0, 2015 vertical => 0,
1788 can_hover => 1, 2016 can_hover => 1,
1789 inner_pad => 5, 2017 inner_pad => 5,
1790 @_ 2018 @_
1791 ); 2019 );
… …
1901 2129
1902sub new { 2130sub new {
1903 my $class = shift; 2131 my $class = shift;
1904 2132
1905 my $self = $class->SUPER::new ( 2133 my $self = $class->SUPER::new (
1906 fontsize => 1, 2134 fontsize => 1,
2135 can_events => 0,
2136 #font => default_font
1907 @_, 2137 @_,
1908 2138
1909 layout => (new CFClient::Layout), 2139 layout => (new CFClient::Layout),
1910 par => [], 2140 par => [],
1911 height => 0, 2141 height => 0,
1912 children => [ 2142 children => [
1913 (new CFClient::UI::Empty expand => 1), 2143 (new CFClient::UI::Empty expand => 1),
1914 (new CFClient::UI::Slider vertical => 1), 2144 (new CFClient::UI::Slider vertical => 1),
1915 ], 2145 ],
1916 ); 2146 );
1917 2147
1918 $self->{children}[1]->connect (changed => sub { 2148 $self->{children}[1]->connect (changed => sub { $self->update });
1919 $self->update;
1920 });
1921 2149
1922 $self 2150 $self
1923} 2151}
1924 2152
1925sub set_fontsize { 2153sub set_fontsize {
… …
1933 my ($self, $text) = @_; 2161 my ($self, $text) = @_;
1934 2162
1935 my $layout = $self->{layout}; 2163 my $layout = $self->{layout};
1936 2164
1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1938 $layout->set_width ($self->{w}); 2166 $layout->set_width ($self->{children}[0]{w});
1939 $layout->set_text ($text); 2167 $layout->set_text ($text);
1940 2168
1941 ($layout->size)[1] 2169 ($layout->size)[1]
1942} 2170}
1943 2171
… …
1951sub size_allocate { 2179sub size_allocate {
1952 my ($self, $w, $h) = @_; 2180 my ($self, $w, $h) = @_;
1953 2181
1954 $self->SUPER::size_allocate ($w, $h); 2182 $self->SUPER::size_allocate ($w, $h);
1955 2183
2184 $self->{layout}->set_font ($self->{font}) if $self->{font};
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2185 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1957 $self->{layout}->set_width ($self->{children}[0]{w}); 2186 $self->{layout}->set_width ($self->{children}[0]{w});
1958 2187
1959 $self->reflow; 2188 $self->reflow;
1960} 2189}
… …
1995 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2224 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1996 2225
1997 delete $self->{texture}; 2226 delete $self->{texture};
1998 } 2227 }
1999 2228
2000 $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 {
2001 glClearColor 0, 0, 0, 1; 2230 glClearColor 0, 0, 0, 0;
2002 glClear GL_COLOR_BUFFER_BIT; 2231 glClear GL_COLOR_BUFFER_BIT;
2003 2232
2004 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2005 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2006 glEnable GL_TEXTURE_2D; 2235 glEnable GL_TEXTURE_2D;
… …
2013 2242
2014 my $y = 0; 2243 my $y = 0;
2015 2244
2016 my $layout = $self->{layout}; 2245 my $layout = $self->{layout};
2017 2246
2247 $layout->set_font ($self->{font}) if $self->{font};
2248
2018 for my $par (@{$self->{par}}) { 2249 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2250 my $h = $par->[0];
2020 2251
2021 if ($y0 < $y + $h && $y < $y1) { 2252 if ($y0 < $y + $h && $y < $y1) {
2022 $layout->set_text ($par->[2]); 2253 $layout->set_text ($par->[2]);
… …
2036} 2267}
2037 2268
2038sub _draw { 2269sub _draw {
2039 my ($self) = @_; 2270 my ($self) = @_;
2040 2271
2041 if ($self->{texture}) { 2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2042 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2043 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;
2044 $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});
2045 glDisable GL_TEXTURE_2D; 2278 glDisable GL_TEXTURE_2D;
2046 } 2279 glDisable GL_BLEND;
2047 2280
2048 $self->{children}[1]->draw; 2281 $self->{children}[1]->draw;
2049 2282
2050} 2283}
2051 2284
… …
2099 2332
2100sub new { 2333sub new {
2101 my $class = shift; 2334 my $class = shift;
2102 2335
2103 my $self = $class->SUPER::new ( 2336 my $self = $class->SUPER::new (
2104 state => 0, 2337 state => 0,
2105 connect_activate => \&toggle_flopper, 2338 connect_activate => \&toggle_flopper,
2106 can_events => 1,
2107 @_ 2339 @_
2108 ); 2340 );
2109 2341
2110 if ($self->{state}) { 2342 if ($self->{state}) {
2111 $self->{state} = 0; 2343 $self->{state} = 0;
… …
2131 $self->emit (changed => $self->{state}); 2363 $self->emit (changed => $self->{state});
2132} 2364}
2133 2365
2134############################################################################# 2366#############################################################################
2135 2367
2368package CFClient::UI::Tooltip;
2369
2370our @ISA = CFClient::UI::Bin::;
2371
2372use CFClient::OpenGL;
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 @_,
2379 can_events => 0,
2380 )
2381}
2382
2383sub set_markup {
2384 my ($self, $text) = @_;
2385
2386 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2387 $self->{label}->set_markup ($text);
2388 $self->add ($self->{label});
2389}
2390
2391sub size_request {
2392 my ($self) = @_;
2393
2394 $self->child->set_max_size ($::WIDTH * 0.3);
2395
2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397
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);
2405}
2406
2407sub _draw {
2408 my ($self) = @_;
2409
2410 glPushMatrix;
2411 glTranslate 0.375, 0.375;
2412
2413 my ($w, $h) = @$self{qw(w h)};
2414
2415 glColor 1, 0.8, 0.4;
2416 glBegin GL_QUADS;
2417 glVertex 0 , 0;
2418 glVertex 0 , $h;
2419 glVertex $w, $h;
2420 glVertex $w, 0;
2421 glEnd;
2422
2423 glColor 0, 0, 0;
2424 glBegin GL_LINE_LOOP;
2425 glVertex 0 , 0;
2426 glVertex 0 , $h;
2427 glVertex $w, $h;
2428 glVertex $w, 0;
2429 glEnd;
2430
2431 glPopMatrix;
2432
2433 glTranslate 2, 2;
2434 $self->SUPER::_draw;
2435}
2436
2437#############################################################################
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
2136package CFClient::UI::Root; 2660package CFClient::UI::Root;
2137 2661
2138our @ISA = CFClient::UI::Container::; 2662our @ISA = CFClient::UI::Container::;
2139 2663
2140use CFClient::OpenGL; 2664use CFClient::OpenGL;
2141 2665
2142sub check_size { 2666sub new {
2143 my ($self) = @_; 2667 my $class = shift;
2144 2668
2145 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2669 $class->SUPER::new (
2146} 2670 @_,
2147 2671 )
2148sub size_request {
2149 ($::WIDTH, $::HEIGHT)
2150} 2672}
2151 2673
2152sub configure { 2674sub configure {
2153 my ($self, $x, $y, $w, $h) = @_; 2675 my ($self, $x, $y, $w, $h) = @_;
2154 2676
2155 $self->SUPER::configure ($x, $y, $w, $h); 2677 $self->{w} = $w;
2678 $self->{h} = $h;
2679}
2156 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
2157 for my $child (@{$self->{children}}) { 2713 for my $child ($self->children) {
2158 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)};
2159 2715
2160 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2716 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2161 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2162 $child->configure ($X, $Y, $W,$H); 2718 $child->configure ($X, $Y, $W, $H);
2163 } 2719 }
2164}
2165 2720
2166sub _topleft { 2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723}
2724
2725sub coord2local {
2167 my ($self, $x, $y) = @_; 2726 my ($self, $x, $y) = @_;
2168 2727
2169 ($x, $y) 2728 ($x, $y)
2170} 2729}
2171 2730
2731sub coord2global {
2732 my ($self, $x, $y) = @_;
2733
2734 ($x, $y)
2735}
2736
2172sub update { 2737sub update {
2173 my ($self) = @_; 2738 my ($self) = @_;
2174 2739
2175 $self->check_size; 2740 $self->check_size;
2176 ::refresh (); 2741 $::WANT_REFRESH++;
2177} 2742}
2178 2743
2179sub add { 2744sub add {
2180 my ($self, $child) = @_; 2745 my ($self, $child) = @_;
2181 2746
2182 # integerize window positions 2747 # integerise window positions
2183 $child->{x} = int $child->{x}; 2748 $child->{x} = int $child->{x};
2184 $child->{y} = int $child->{y}; 2749 $child->{y} = int $child->{y};
2185 2750
2186 $self->SUPER::add ($child); 2751 $self->SUPER::add ($child);
2187} 2752}
… …
2190 my ($self, $id, $cb) = @_; 2755 my ($self, $id, $cb) = @_;
2191 2756
2192 $self->{refresh_hook}{$id} = $cb; 2757 $self->{refresh_hook}{$id} = $cb;
2193} 2758}
2194 2759
2195sub draw { 2760sub draw {
2196 my ($self) = @_; 2761 my ($self) = @_;
2197 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
2198 while (my $rcb = delete $self->{refresh_hook}) { 2807 while ($self->{refresh_hook}) {
2199 $_->() for values %$rcb; 2808 $_->()
2809 for values %{delete $self->{refresh_hook}};
2200 } 2810 }
2201 2811
2202 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2812 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2203 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2204 glClear GL_COLOR_BUFFER_BIT; 2814 glClear GL_COLOR_BUFFER_BIT;
… …
2215############################################################################# 2825#############################################################################
2216 2826
2217package CFClient::UI; 2827package CFClient::UI;
2218 2828
2219$ROOT = new CFClient::UI::Root; 2829$ROOT = new CFClient::UI::Root;
2220$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 2830$TOOLTIP = new CFClient::UI::Tooltip;
2221 2831
22221 28321
2223 2833

Diff Legend

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