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.157 by root, Sun Apr 23 21:47:32 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
245sub children {
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
216sub set_max_size { 260sub set_max_size {
217 my ($self, $w, $h) = @_; 261 my ($self, $w, $h) = @_;
218 262
219 delete $self->{max_w}; $self->{max_w} = $w if $w; 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
220 delete $self->{max_h}; $self->{max_h} = $h if $h; 264 delete $self->{max_h}; $self->{max_h} = $h if $h;
221}
222
223# return top left coordinates
224sub _topleft {
225 my ($self, $x, $y) = @_;
226
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
228} 265}
229 266
230# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
231sub coord2local { 268sub coord2local {
232 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
233 270
234 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
235 ($x - $X, $y - $Y)
236} 272}
237 273
238# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
239sub coord2global { 275sub coord2global {
240 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
241 277
242 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
243 ($x + $X, $y + $Y)
244} 279}
245 280
246sub focus_in { 281sub focus_in {
247 my ($self) = @_; 282 my ($self) = @_;
248 283
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 343 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 344 glVertex $x , $y + $self->{h};
310 glEnd; 345 glEnd;
311 glDisable GL_BLEND; 346 glDisable GL_BLEND;
312 } 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 }
313} 362}
314 363
315sub _draw { 364sub _draw {
316 my ($self) = @_; 365 my ($self) = @_;
317 366
… …
332 381
333sub set_parent { 382sub set_parent {
334 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
335 384
336 Scalar::Util::weaken ($self->{parent} = $parent); 385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
337} 389}
338 390
339sub check_size { 391sub check_size {
340 my ($self) = @_; 392 my ($self) = @_;
341 393
342 return unless $self->{parent}; 394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
343
344 my ($w, $h) = $self->size_request;
345
346 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w;
348 $self->{req_h} = $h;
349
350 $self->{parent}->check_size;
351 }
352} 395}
353 396
354sub update { 397sub update {
355 my ($self) = @_; 398 my ($self) = @_;
356 399
… …
365} 408}
366 409
367sub emit { 410sub emit {
368 my ($self, $signal, @args) = @_; 411 my ($self, $signal, @args) = @_;
369 412
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 414}
374 415
375sub DESTROY { 416sub DESTROY {
376 my ($self) = @_; 417 my ($self) = @_;
377 418
… …
444sub new { 485sub new {
445 my ($class, %arg) = @_; 486 my ($class, %arg) = @_;
446 487
447 my $children = delete $arg{children} || []; 488 my $children = delete $arg{children} || [];
448 489
449 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 );
450 $self->add ($_) for @$children; 495 $self->add ($_) for @$children;
451 496
452 $self 497 $self
453} 498}
454 499
455sub add { 500sub add {
456 my ($self, $child) = @_; 501 my ($self, @widgets) = @_;
457 502
458 $child->set_parent ($self); 503 $_->set_parent ($self)
504 for @widgets;
459 505
460 use sort 'stable'; 506 use sort 'stable';
461 507
462 $self->{children} = [ 508 $self->{children} = [
463 sort { $a->{z} <=> $b->{z} } 509 sort { $a->{z} <=> $b->{z} }
464 @{$self->{children}}, $child 510 @{$self->{children}}, @widgets
465 ]; 511 ];
466 512
467 $child->check_size; 513 $self->check_size;
514 $self->update;
515}
516
517sub children {
518 @{ $_[0]{children} }
468} 519}
469 520
470sub remove { 521sub remove {
471 my ($self, $child) = @_; 522 my ($self, $child) = @_;
472 523
473 delete $child->{parent}; 524 delete $child->{parent};
525 $child->hide;
474 526
475 $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 }
476 543
477 $self->check_size; 544 $self->check_size;
478 $self->update; 545 $self->update;
479} 546}
480 547
… …
558} 625}
559 626
560sub update { 627sub update {
561 my ($self) = @_; 628 my ($self) = @_;
562 629
563 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
564 $self->render_chld;
565 $self->SUPER::update; 631 $self->SUPER::update;
566}
567
568sub render_chld {
569 my ($self) = @_;
570
571 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
572 glClearColor 0, 0, 0, 1;
573 glClear GL_COLOR_BUFFER_BIT;
574 $self->child->draw;
575 };
576} 632}
577 633
578sub size_allocate { 634sub size_allocate {
579 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
580 636
581 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
582 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
583 $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 };
584} 661}
585 662
586sub _draw { 663sub _draw {
587 my ($self) = @_; 664 my ($self) = @_;
588 665
… …
590 667
591 my $tex = $self->{texture} 668 my $tex = $self->{texture}
592 or return; 669 or return;
593 670
594 glEnable GL_BLEND; 671 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
596 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
597 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;
598 676
599 $tex->draw_quad (0, 0, $w, $h); 677 $tex->draw_quad (0, 0, $w, $h);
600 678
601 glDisable GL_BLEND; 679 glDisable GL_BLEND;
602 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
… …
606 684
607package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
608 686
609our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
610 688
611sub new { die }
612
613sub size_request { 689sub size_request {
614 my ($self) = @_; 690 my ($self) = @_;
615 691
616 @$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)};
617 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
618 694
619 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
620} 696}
621 697
622sub _draw { 698sub size_allocate {
623 my ($self) = @_; 699 my ($self, $w, $h) = @_;
624 700
625 $self->{children}[1]->draw; 701 $self->update;
626} 702}
627 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
628 783
629############################################################################# 784#############################################################################
630 785
631package CFClient::UI::Frame; 786package CFClient::UI::Frame;
632 787
… …
643 border => 0.8, 798 border => 0.8,
644 @_ 799 @_
645 ); 800 );
646 801
647 $self 802 $self
648}
649
650sub set_size {
651 my ($self, $w, $h) = @_;
652 $self->{req_w} = $w;
653 $self->{req_h} = $h;
654 $self->check_size;
655}
656
657sub size_request {
658 my ($self) = @_;
659 ($self->{req_w}, $self->{req_h})
660}
661
662sub size_allocate {
663 my ($self, $w, $h) = @_;
664 $self->{w} = $w;
665 $self->{h} = $h;
666 $self->child->configure (0, 0, $w, $h);
667} 803}
668 804
669sub _draw { 805sub _draw {
670 my ($self) = @_; 806 my ($self) = @_;
671 807
… …
706 my $class = shift; 842 my $class = shift;
707 843
708 # TODO: user_x, user_y, overwrite moveto? 844 # TODO: user_x, user_y, overwrite moveto?
709 845
710 my $self = $class->SUPER::new ( 846 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 847 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 848 border_bg => [1, 1, 1, 1],
713 border => 0.8, 849 border => 0.6,
714 can_events => 1, 850 can_events => 1,
715 @_ 851 @_
716 ); 852 );
717 853
718 $self->{title} &&= new CFClient::UI::Label 854 $self->{title} &&= new CFClient::UI::Label
719 align => 0, 855 align => 0,
720 valign => 1, 856 valign => 1,
721 text => $self->{title}, 857 text => $self->{title},
722 fontsize => 1; 858 fontsize => $self->{border};
723 859
724 $self 860 $self
725} 861}
726 862
727sub border { 863sub border {
728 int $_[0]{border} * $::FONTSIZE 864 int $_[0]{border} * $::FONTSIZE
729} 865}
730 866
731sub size_request { 867sub size_request {
732 my ($self) = @_; 868 my ($self) = @_;
733
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735 869
736 my ($w, $h) = $self->SUPER::size_request; 870 my ($w, $h) = $self->SUPER::size_request;
737 871
738 ( 872 (
739 $w + $self->border * 2, 873 $w + $self->border * 2,
… …
754} 888}
755 889
756sub button_down { 890sub button_down {
757 my ($self, $ev, $x, $y) = @_; 891 my ($self, $ev, $x, $y) = @_;
758 892
893 my ($w, $h) = @$self{qw(w h)};
759 my $border = $self->border; 894 my $border = $self->border;
760 895
761 if ($x < $self->{w} && $x >= $self->{w} - $border 896 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762 && $y < $self->{h} && $y >= $self->{h} - $border) { 897 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763 898
899 if ($lr & $td) {
900 my ($wx, $wy) = ($self->{x}, $self->{y});
764 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 901 my ($ox, $oy) = ($ev->{x}, $ev->{y});
765 my ($bw, $bh) = ($self->{w}, $self->{h}); 902 my ($bw, $bh) = ($self->{w}, $self->{h});
766 903
904 my $mx = $x < $border;
905 my $my = $y < $border;
906
767 $self->{motion} = sub { 907 $self->{motion} = sub {
768 my ($ev, $x, $y) = @_; 908 my ($ev, $x, $y) = @_;
769 909
770 ($x, $y) = ($ev->{x}, $ev->{y}); 910 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy;
771 912
772 $self->{user_w} = $bw + $x - $ox; 913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
773 $self->{user_h} = $bh + $y - $oy; 914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
774 $self->check_size; 916 $self->check_size;
775 }; 917 };
776 918
777 } elsif ($x >= 0 && $x < $self->{w} 919 } elsif ($lr ^ $td) {
778 && $y >= 0 && $y < $border) {
779
780 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 920 my ($ox, $oy) = ($ev->{x}, $ev->{y});
781 my ($bx, $by) = ($self->{x}, $self->{y}); 921 my ($bx, $by) = ($self->{x}, $self->{y});
782 922
783 $self->{motion} = sub { 923 $self->{motion} = sub {
784 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
… …
820 $tex[1]->draw_quad (0, 0, $w, $border); 960 $tex[1]->draw_quad (0, 0, $w, $border);
821 $tex[3]->draw_quad (0, $border, $border, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
822 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
823 $tex[4]->draw_quad (0, $h - $border, $w, $border); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
824 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
825 my $bg = $tex[0]; 966 my $bg = $tex[0];
826 967
827 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
828 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
829 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
830 971
831 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
832 973
833 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
834 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
835 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
836 $bg->draw_quad ($border, $border, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
837 978
838 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
839 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
840 982
841 $self->{title}->draw if $self->{title}; 983 $self->{title}->draw if $self->{title};
984
842 $self->child->draw; 985 $self->child->draw;
843} 986}
844 987
845############################################################################# 988#############################################################################
846 989
… …
868 $self->{children}[$y][$x] = $child; 1011 $self->{children}[$y][$x] = $child;
869 1012
870 $child->check_size; 1013 $child->check_size;
871} 1014}
872 1015
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
873# 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?
874sub clear { 1021sub clear {
875 my ($self) = @_; 1022 my ($self) = @_;
876 1023
1024 my @children = $self->children;
877 delete $self->{children}; 1025 delete $self->{children};
1026
1027 for (@children) {
1028 delete $_->{parent};
1029 $_->hide;
1030 }
1031
878 $self->update; 1032 $self->update;
879} 1033}
880 1034
881sub get_wh { 1035sub get_wh {
882 my ($self) = @_; 1036 my ($self) = @_;
… …
1059} 1213}
1060 1214
1061sub size_allocate { 1215sub size_allocate {
1062 my ($self, $w, $h) = @_; 1216 my ($self, $w, $h) = @_;
1063 1217
1218 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1219
1064 my $children = $self->{children}; 1220 my $children = $self->{children};
1065 1221
1066 my @h = map $_->{req_h}, @$children; 1222 my @h = map $_->{req_h}, @$children;
1067 1223
1068 my $req_h = List::Util::sum @h; 1224 my $req_h = List::Util::sum @h;
… …
1105 1261
1106sub new { 1262sub new {
1107 my ($class, %arg) = @_; 1263 my ($class, %arg) = @_;
1108 1264
1109 my $self = $class->SUPER::new ( 1265 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1266 fg => [1, 1, 1],
1111 #font => default_font 1267 #font => default_font
1112 fontsize => 1, 1268 fontsize => 1,
1113 text => "", 1269 text => "",
1114 align => -1, 1270 align => -1,
1115 valign => -1, 1271 valign => -1,
1116 padding => 2, 1272 padding => 2,
1117 layout => new CFClient::Layout, 1273 layout => new CFClient::Layout,
1118 can_events => 0, 1274 can_events => 0,
1119 %arg 1275 %arg
1120 ); 1276 );
1121 1277
1122 if (exists $self->{template}) { 1278 if (exists $self->{template}) {
… …
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1285 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1130 1286
1131 $self 1287 $self
1132} 1288}
1133 1289
1134sub escape_text { 1290sub escape {
1135 local $_ = $_[1]; 1291 local $_ = $_[1];
1136 1292
1137 s/&/&amp;/g; 1293 s/&/&amp;/g;
1138 s/>/&gt;/g; 1294 s/>/&gt;/g;
1139 s/</&lt;/g; 1295 s/</&lt;/g;
1140 1296
1141 $_[1] 1297 $_[1]
1142} 1298}
1143 1299
1300sub update {
1301 my ($self) = @_;
1302
1303 delete $self->{texture};
1304 $self->SUPER::update;
1305}
1306
1144sub set_text { 1307sub set_text {
1145 my ($self, $text) = @_; 1308 my ($self, $text) = @_;
1146 1309
1310 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text";
1312
1147 $self->{layout}->set_text ($text); 1313 $self->{layout}->set_text ($text);
1148 1314
1149 delete $self->{texture}; 1315 $self->update;
1150 $self->check_size; 1316 $self->check_size;
1151 $self->update;
1152} 1317}
1153 1318
1154sub set_markup { 1319sub set_markup {
1155 my ($self, $markup) = @_; 1320 my ($self, $markup) = @_;
1156 1321
1322 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup";
1324
1157 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1158 1326
1159 delete $self->{texture}; 1327 $self->update;
1160 $self->check_size; 1328 $self->check_size;
1161 $self->update;
1162} 1329}
1163 1330
1164sub size_request { 1331sub size_request {
1165 my ($self) = @_; 1332 my ($self) = @_;
1166 1333
… …
1195sub set_fontsize { 1362sub set_fontsize {
1196 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1197 1364
1198 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1199 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1200 $self->check_size; 1369 $self->check_size;
1201 $self->update;
1202} 1370}
1203 1371
1204sub _draw { 1372sub _draw {
1205 my ($self) = @_; 1373 my ($self) = @_;
1206 1374
… …
1246 1414
1247sub new { 1415sub new {
1248 my $class = shift; 1416 my $class = shift;
1249 1417
1250 $class->SUPER::new ( 1418 $class->SUPER::new (
1251 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1255 can_hover => 1, 1423 can_hover => 1,
1256 can_focus => 1, 1424 can_focus => 1,
1257 valign => 0, 1425 valign => 0,
1258 can_events => 1, 1426 can_events => 1,
1259 @_ 1427 @_
1260 ) 1428 )
1261} 1429}
1262 1430
… …
1416 my ($self, $ev) = @_; 1584 my ($self, $ev) = @_;
1417 1585
1418 my $sym = $ev->{sym}; 1586 my $sym = $ev->{sym};
1419 1587
1420 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} = '';
1421 $self->emit (activate => $self->get_text); 1593 $self->emit (activate => $txt);
1422 $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 }
1423 1617
1424 } else { 1618 } else {
1425 $self->SUPER::key_down ($ev); 1619 $self->SUPER::key_down ($ev);
1426 } 1620 }
1427 1621
… …
1441 1635
1442sub new { 1636sub new {
1443 my $class = shift; 1637 my $class = shift;
1444 1638
1445 $class->SUPER::new ( 1639 $class->SUPER::new (
1446 padding => 4, 1640 padding => 4,
1447 fg => [1, 1, 1], 1641 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2], 1642 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1643 active_fg => [0, 0, 1],
1450 can_hover => 1, 1644 can_hover => 1,
1451 align => 0, 1645 align => 0,
1452 valign => 0, 1646 valign => 0,
1453 can_events => 1, 1647 can_events => 1,
1454 @_ 1648 @_
1455 ) 1649 )
1456} 1650}
1457 1651
… …
1616 1810
1617package CFClient::UI::VGauge; 1811package CFClient::UI::VGauge;
1618 1812
1619our @ISA = CFClient::UI::Base::; 1813our @ISA = CFClient::UI::Base::;
1620 1814
1815use List::Util qw(min max);
1816
1621use CFClient::OpenGL; 1817use CFClient::OpenGL;
1622 1818
1623my %tex = ( 1819my %tex = (
1624 food => [ 1820 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1821 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1822 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1823 ],
1628 grace => [ 1824 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1825 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 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/
1631 ], 1827 ],
1632 hp => [ 1828 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1829 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1830 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1831 ],
1636 mana => [ 1832 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 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/
1639 ], 1835 ],
1640); 1836);
1641 1837
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1838# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1839sub new {
… …
1662} 1858}
1663 1859
1664sub set_max { 1860sub set_max {
1665 my ($self, $max) = @_; 1861 my ($self, $max) = @_;
1666 1862
1863 return if $self->{max_val} == $max;
1864
1667 $self->{max_val} = $max; 1865 $self->{max_val} = $max;
1866 $self->update;
1668} 1867}
1669 1868
1670sub set_value { 1869sub set_value {
1671 my ($self, $val, $max) = @_; 1870 my ($self, $val, $max) = @_;
1672 1871
1673 $self->set_max ($max) 1872 $self->set_max ($max)
1674 if defined $max; 1873 if defined $max;
1675 1874
1676 $max = $self->{max_val}; 1875 return if $self->{val} == $val;
1876
1677 $self->{val} = $val; 1877 $self->{val} = $val;
1678
1679 $self->update; 1878 $self->update;
1680} 1879}
1681 1880
1682sub _draw { 1881sub _draw {
1683 my ($self) = @_; 1882 my ($self) = @_;
1684 1883
1685 my $tex = $tex{$self->{type}}; 1884 my $tex = $tex{$self->{type}};
1885 my ($t1, $t2, $t3) = @$tex;
1686 1886
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1887 my ($w, $h) = ($self->{w}, $self->{h});
1688 1888
1689 if ($self->{vertical}) { 1889 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1890 glRotate 90, 0, 0, 1;
… …
1692 1892
1693 ($w, $h) = ($h, $w); 1893 ($w, $h) = ($h, $w);
1694 } 1894 }
1695 1895
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1896 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1897
1699 my $t1 = $tex->[0]; 1898 my $ycut1 = max 0, min 1, $ycut;
1700 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);
1701 1903
1702 glEnable GL_BLEND; 1904 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1905 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1906 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1907 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1908
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1909 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1910 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1911 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1912 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1913 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1914 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1915 glEnd;
1717 1916
1917 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1918 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1919 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1920 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1921 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1922 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1923 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 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 }
1725 1935
1726 glDisable GL_BLEND; 1936 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1937 glDisable GL_TEXTURE_2D;
1728} 1938}
1729 1939
… …
1735 1945
1736sub new { 1946sub new {
1737 my ($class, %arg) = @_; 1947 my ($class, %arg) = @_;
1738 1948
1739 my $self = $class->SUPER::new ( 1949 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1950 tooltip => $arg{type},
1951 can_hover => 1,
1952 can_events => 1,
1741 %arg, 1953 %arg,
1742 ); 1954 );
1743 1955
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1956 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1957 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1958 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 1959
1748 $self 1960 $self
1749} 1961}
1750 1962
1751sub set_fontsize { 1963sub set_fontsize {
… …
1753 1965
1754 $self->{value}->set_fontsize ($fsize); 1966 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 1967 $self->{max} ->set_fontsize ($fsize);
1756} 1968}
1757 1969
1970sub set_max {
1971 my ($self, $max) = @_;
1972
1973 $self->{gauge}->set_max ($max);
1974 $self->{max}->set_text ($max);
1975}
1976
1758sub set_value { 1977sub set_value {
1759 my ($self, $val, $max) = @_; 1978 my ($self, $val, $max) = @_;
1760 1979
1761 $self->set_max ($max) 1980 $self->set_max ($max)
1762 if defined $max; 1981 if defined $max;
1763 1982
1764 $self->{gauge}->set_value ($val, $max); 1983 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 1984 $self->{value}->set_text ($val);
1766}
1767
1768sub set_max {
1769 my ($self, $max) = @_;
1770
1771 $self->{gauge}->set_max ($max);
1772 $self->{max}->set_text ($max);
1773} 1985}
1774 1986
1775############################################################################# 1987#############################################################################
1776 1988
1777package CFClient::UI::Slider; 1989package CFClient::UI::Slider;
… …
1796 # TODO: calculations are off 2008 # TODO: calculations are off
1797 my $self = $class->SUPER::new ( 2009 my $self = $class->SUPER::new (
1798 fg => [1, 1, 1], 2010 fg => [1, 1, 1],
1799 active_fg => [0, 0, 0], 2011 active_fg => [0, 0, 0],
1800 range => [0, 0, 100, 10], 2012 range => [0, 0, 100, 10],
1801 req_w => 20, 2013 req_w => $::WIDTH / 80,
1802 req_h => 20, 2014 req_h => $::WIDTH / 80,
1803 vertical => 0, 2015 vertical => 0,
1804 can_hover => 1, 2016 can_hover => 1,
1805 inner_pad => 5, 2017 inner_pad => 5,
1806 @_ 2018 @_
1807 ); 2019 );
… …
1917 2129
1918sub new { 2130sub new {
1919 my $class = shift; 2131 my $class = shift;
1920 2132
1921 my $self = $class->SUPER::new ( 2133 my $self = $class->SUPER::new (
1922 fontsize => 1, 2134 fontsize => 1,
2135 can_events => 0,
1923 #font => default_font 2136 #font => default_font
1924 @_, 2137 @_,
1925 2138
1926 layout => (new CFClient::Layout), 2139 layout => (new CFClient::Layout),
1927 par => [], 2140 par => [],
1928 height => 0, 2141 height => 0,
1929 children => [ 2142 children => [
1930 (new CFClient::UI::Empty expand => 1), 2143 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2144 (new CFClient::UI::Slider vertical => 1),
1932 ], 2145 ],
1933 ); 2146 );
1934 2147
1935 $self->{children}[1]->connect (changed => sub { 2148 $self->{children}[1]->connect (changed => sub { $self->update });
1936 $self->update;
1937 });
1938 2149
1939 $self 2150 $self
1940} 2151}
1941 2152
1942sub set_fontsize { 2153sub set_fontsize {
… …
1950 my ($self, $text) = @_; 2161 my ($self, $text) = @_;
1951 2162
1952 my $layout = $self->{layout}; 2163 my $layout = $self->{layout};
1953 2164
1954 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $layout->set_width ($self->{w}); 2166 $layout->set_width ($self->{children}[0]{w});
1956 $layout->set_text ($text); 2167 $layout->set_text ($text);
1957 2168
1958 ($layout->size)[1] 2169 ($layout->size)[1]
1959} 2170}
1960 2171
… …
2013 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2224 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2014 2225
2015 delete $self->{texture}; 2226 delete $self->{texture};
2016 } 2227 }
2017 2228
2018 $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 {
2019 glClearColor 0, 0, 0, 1; 2230 glClearColor 0, 0, 0, 0;
2020 glClear GL_COLOR_BUFFER_BIT; 2231 glClear GL_COLOR_BUFFER_BIT;
2021 2232
2022 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2023 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2024 glEnable GL_TEXTURE_2D; 2235 glEnable GL_TEXTURE_2D;
… …
2056} 2267}
2057 2268
2058sub _draw { 2269sub _draw {
2059 my ($self) = @_; 2270 my ($self) = @_;
2060 2271
2061 if ($self->{texture}) { 2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2062 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2063 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;
2064 $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});
2065 glDisable GL_TEXTURE_2D; 2278 glDisable GL_TEXTURE_2D;
2066 } 2279 glDisable GL_BLEND;
2067 2280
2068 $self->{children}[1]->draw; 2281 $self->{children}[1]->draw;
2069 2282
2070} 2283}
2071 2284
… …
2119 2332
2120sub new { 2333sub new {
2121 my $class = shift; 2334 my $class = shift;
2122 2335
2123 my $self = $class->SUPER::new ( 2336 my $self = $class->SUPER::new (
2124 state => 0, 2337 state => 0,
2125 connect_activate => \&toggle_flopper, 2338 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2339 @_
2128 ); 2340 );
2129 2341
2130 if ($self->{state}) { 2342 if ($self->{state}) {
2131 $self->{state} = 0; 2343 $self->{state} = 0;
… …
2166 @_, 2378 @_,
2167 can_events => 0, 2379 can_events => 0,
2168 ) 2380 )
2169} 2381}
2170 2382
2171sub set_text { 2383sub set_markup {
2172 my ($self, $text) = @_; 2384 my ($self, $text) = @_;
2173 2385
2174 $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];
2175 $self->{label}->set_text ($text); 2387 $self->{label}->set_markup ($text);
2176 $self->add ($self->{label}); 2388 $self->add ($self->{label});
2177} 2389}
2178 2390
2179sub size_request { 2391sub size_request {
2180 my ($self) = @_; 2392 my ($self) = @_;
2181 2393
2182 $self->child->set_max_size ($::WIDTH * 0.2); 2394 $self->child->set_max_size ($::WIDTH * 0.3);
2183 2395
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2397
2186 ($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);
2187} 2405}
2188 2406
2189sub _draw { 2407sub _draw {
2190 my ($self) = @_; 2408 my ($self) = @_;
2191 2409
… …
2216 $self->SUPER::_draw; 2434 $self->SUPER::_draw;
2217} 2435}
2218 2436
2219############################################################################# 2437#############################################################################
2220 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
2221package CFClient::UI::Root; 2660package CFClient::UI::Root;
2222 2661
2223our @ISA = CFClient::UI::Container::; 2662our @ISA = CFClient::UI::Container::;
2224 2663
2225use CFClient::OpenGL; 2664use CFClient::OpenGL;
2226 2665
2227sub check_size { 2666sub new {
2228 my ($self) = @_; 2667 my $class = shift;
2229 2668
2230 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2669 $class->SUPER::new (
2231} 2670 @_,
2232 2671 )
2233sub size_request {
2234 ($::WIDTH, $::HEIGHT)
2235} 2672}
2236 2673
2237sub configure { 2674sub configure {
2238 my ($self, $x, $y, $w, $h) = @_; 2675 my ($self, $x, $y, $w, $h) = @_;
2239 2676
2240 $self->SUPER::configure ($x, $y, $w, $h); 2677 $self->{w} = $w;
2678 $self->{h} = $h;
2679}
2241 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
2242 for my $child (@{$self->{children}}) { 2713 for my $child ($self->children) {
2243 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)};
2244 2715
2245 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2716 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2246 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2247 $child->configure ($X, $Y, $W,$H); 2718 $child->configure ($X, $Y, $W, $H);
2248 } 2719 }
2249}
2250 2720
2251sub _topleft { 2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723}
2724
2725sub coord2local {
2252 my ($self, $x, $y) = @_; 2726 my ($self, $x, $y) = @_;
2253 2727
2254 ($x, $y) 2728 ($x, $y)
2255} 2729}
2256 2730
2731sub coord2global {
2732 my ($self, $x, $y) = @_;
2733
2734 ($x, $y)
2735}
2736
2257sub update { 2737sub update {
2258 my ($self) = @_; 2738 my ($self) = @_;
2259 2739
2260 $self->check_size; 2740 $self->check_size;
2261 ::refresh (); 2741 $::WANT_REFRESH++;
2262} 2742}
2263 2743
2264sub add { 2744sub add {
2265 my ($self, $child) = @_; 2745 my ($self, $child) = @_;
2266 2746
2267 # integerize window positions 2747 # integerise window positions
2268 $child->{x} = int $child->{x}; 2748 $child->{x} = int $child->{x};
2269 $child->{y} = int $child->{y}; 2749 $child->{y} = int $child->{y};
2270 2750
2271 $self->SUPER::add ($child); 2751 $self->SUPER::add ($child);
2272} 2752}
… …
2275 my ($self, $id, $cb) = @_; 2755 my ($self, $id, $cb) = @_;
2276 2756
2277 $self->{refresh_hook}{$id} = $cb; 2757 $self->{refresh_hook}{$id} = $cb;
2278} 2758}
2279 2759
2280sub draw { 2760sub draw {
2281 my ($self) = @_; 2761 my ($self) = @_;
2282 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
2283 while (my $rcb = delete $self->{refresh_hook}) { 2807 while ($self->{refresh_hook}) {
2284 $_->() for values %$rcb; 2808 $_->()
2809 for values %{delete $self->{refresh_hook}};
2285 } 2810 }
2286 2811
2287 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2812 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2288 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2289 glClear GL_COLOR_BUFFER_BIT; 2814 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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