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.192 by root, Tue May 9 22:49:32 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
… …
331} 380}
332 381
333sub set_parent { 382sub set_parent {
334 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
335 384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
336 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
337} 387}
338 388
339sub check_size { 389sub check_size {
340 my ($self) = @_; 390 my ($self) = @_;
341 391
342 return unless $self->{parent}; 392 $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} 393}
353 394
354sub update { 395sub update {
355 my ($self) = @_; 396 my ($self) = @_;
356 397
… …
365} 406}
366 407
367sub emit { 408sub emit {
368 my ($self, $signal, @args) = @_; 409 my ($self, $signal, @args) = @_;
369 410
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 411 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 412}
374 413
375sub DESTROY { 414sub DESTROY {
376 my ($self) = @_; 415 my ($self) = @_;
377 416
… …
444sub new { 483sub new {
445 my ($class, %arg) = @_; 484 my ($class, %arg) = @_;
446 485
447 my $children = delete $arg{children} || []; 486 my $children = delete $arg{children} || [];
448 487
449 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 488 my $self = $class->SUPER::new (
489 children => [],
490 can_events => 0,
491 %arg,
492 );
450 $self->add ($_) for @$children; 493 $self->add ($_) for @$children;
451 494
452 $self 495 $self
453} 496}
454 497
455sub add { 498sub add {
456 my ($self, $child) = @_; 499 my ($self, @widgets) = @_;
457 500
458 $child->set_parent ($self); 501 $_->set_parent ($self)
502 for @widgets;
459 503
460 use sort 'stable'; 504 use sort 'stable';
461 505
462 $self->{children} = [ 506 $self->{children} = [
463 sort { $a->{z} <=> $b->{z} } 507 sort { $a->{z} <=> $b->{z} }
464 @{$self->{children}}, $child 508 @{$self->{children}}, @widgets
465 ]; 509 ];
466 510
467 $child->check_size; 511 $_->check_size
512 for @widgets;
513
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) = @_;
… …
1105 1259
1106sub new { 1260sub new {
1107 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1108 1262
1109 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1111 #font => default_font 1265 #font => default_font
1112 fontsize => 1, 1266 fontsize => 1,
1113 text => "", 1267 text => "",
1114 align => -1, 1268 align => -1,
1115 valign => -1, 1269 valign => -1,
1116 padding => 2, 1270 padding => 2,
1117 layout => new CFClient::Layout, 1271 layout => new CFClient::Layout,
1118 can_events => 0, 1272 can_events => 0,
1119 %arg 1273 %arg
1120 ); 1274 );
1121 1275
1122 if (exists $self->{template}) { 1276 if (exists $self->{template}) {
… …
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1130 1284
1131 $self 1285 $self
1132} 1286}
1133 1287
1134sub escape_text { 1288sub escape {
1135 local $_ = $_[1]; 1289 local $_ = $_[1];
1136 1290
1137 s/&/&amp;/g; 1291 s/&/&amp;/g;
1138 s/>/&gt;/g; 1292 s/>/&gt;/g;
1139 s/</&lt;/g; 1293 s/</&lt;/g;
1140 1294
1141 $_[1] 1295 $_[1]
1142} 1296}
1143 1297
1298sub update {
1299 my ($self) = @_;
1300
1301 delete $self->{texture};
1302 $self->SUPER::update;
1303}
1304
1144sub set_text { 1305sub set_text {
1145 my ($self, $text) = @_; 1306 my ($self, $text) = @_;
1146 1307
1308 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text";
1310
1147 $self->{layout}->set_text ($text); 1311 $self->{layout}->set_text ($text);
1148 1312
1149 delete $self->{texture}; 1313 $self->update;
1150 $self->check_size; 1314 $self->check_size;
1151 $self->update;
1152} 1315}
1153 1316
1154sub set_markup { 1317sub set_markup {
1155 my ($self, $markup) = @_; 1318 my ($self, $markup) = @_;
1156 1319
1320 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup";
1322
1157 $self->{layout}->set_markup ($markup); 1323 $self->{layout}->set_markup ($markup);
1158 1324
1159 delete $self->{texture}; 1325 $self->update;
1160 $self->check_size; 1326 $self->check_size;
1161 $self->update;
1162} 1327}
1163 1328
1164sub size_request { 1329sub size_request {
1165 my ($self) = @_; 1330 my ($self) = @_;
1166 1331
… …
1195sub set_fontsize { 1360sub set_fontsize {
1196 my ($self, $fontsize) = @_; 1361 my ($self, $fontsize) = @_;
1197 1362
1198 $self->{fontsize} = $fontsize; 1363 $self->{fontsize} = $fontsize;
1199 delete $self->{texture}; 1364 delete $self->{texture};
1365
1366 $self->update;
1200 $self->check_size; 1367 $self->check_size;
1201 $self->update;
1202} 1368}
1203 1369
1204sub _draw { 1370sub _draw {
1205 my ($self) = @_; 1371 my ($self) = @_;
1206 1372
… …
1246 1412
1247sub new { 1413sub new {
1248 my $class = shift; 1414 my $class = shift;
1249 1415
1250 $class->SUPER::new ( 1416 $class->SUPER::new (
1251 fg => [1, 1, 1], 1417 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1418 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1419 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1420 active_fg => [0, 0, 0],
1255 can_hover => 1, 1421 can_hover => 1,
1256 can_focus => 1, 1422 can_focus => 1,
1257 valign => 0, 1423 valign => 0,
1258 can_events => 1, 1424 can_events => 1,
1259 @_ 1425 @_
1260 ) 1426 )
1261} 1427}
1262 1428
… …
1416 my ($self, $ev) = @_; 1582 my ($self, $ev) = @_;
1417 1583
1418 my $sym = $ev->{sym}; 1584 my $sym = $ev->{sym};
1419 1585
1420 if ($sym == 13) { 1586 if ($sym == 13) {
1587 unshift @{$self->{history}},
1588 my $txt = $self->get_text;
1589 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = '';
1421 $self->emit (activate => $self->get_text); 1591 $self->emit (activate => $txt);
1422 $self->update; 1592 $self->update;
1593
1594 } elsif ($sym == CFClient::SDLK_UP) {
1595 if ($self->{history_pointer} < 0) {
1596 $self->{history_saveback} = $self->get_text;
1597 }
1598 if (@{$self->{history} || []} > 0) {
1599 $self->{history_pointer}++;
1600 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1601 $self->{history_pointer} = @{$self->{history} || []} - 1;
1602 }
1603 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1604 }
1605
1606 } elsif ($sym == CFClient::SDLK_DOWN) {
1607 $self->{history_pointer}--;
1608 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1609
1610 if ($self->{history_pointer} >= 0) {
1611 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1612 } else {
1613 $self->set_text ($self->{history_saveback});
1614 }
1423 1615
1424 } else { 1616 } else {
1425 $self->SUPER::key_down ($ev); 1617 $self->SUPER::key_down ($ev);
1426 } 1618 }
1427 1619
… …
1441 1633
1442sub new { 1634sub new {
1443 my $class = shift; 1635 my $class = shift;
1444 1636
1445 $class->SUPER::new ( 1637 $class->SUPER::new (
1446 padding => 4, 1638 padding => 4,
1447 fg => [1, 1, 1], 1639 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2], 1640 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1641 active_fg => [0, 0, 1],
1450 can_hover => 1, 1642 can_hover => 1,
1451 align => 0, 1643 align => 0,
1452 valign => 0, 1644 valign => 0,
1453 can_events => 1, 1645 can_events => 1,
1454 @_ 1646 @_
1455 ) 1647 )
1456} 1648}
1457 1649
… …
1616 1808
1617package CFClient::UI::VGauge; 1809package CFClient::UI::VGauge;
1618 1810
1619our @ISA = CFClient::UI::Base::; 1811our @ISA = CFClient::UI::Base::;
1620 1812
1813use List::Util qw(min max);
1814
1621use CFClient::OpenGL; 1815use CFClient::OpenGL;
1622 1816
1623my %tex = ( 1817my %tex = (
1624 food => [ 1818 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1819 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1820 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1821 ],
1628 grace => [ 1822 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1824 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631 ], 1825 ],
1632 hp => [ 1826 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1827 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1828 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1829 ],
1636 mana => [ 1830 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1831 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1832 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639 ], 1833 ],
1640); 1834);
1641 1835
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1836# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1837sub new {
… …
1662} 1856}
1663 1857
1664sub set_max { 1858sub set_max {
1665 my ($self, $max) = @_; 1859 my ($self, $max) = @_;
1666 1860
1861 return if $self->{max_val} == $max;
1862
1667 $self->{max_val} = $max; 1863 $self->{max_val} = $max;
1864 $self->update;
1668} 1865}
1669 1866
1670sub set_value { 1867sub set_value {
1671 my ($self, $val, $max) = @_; 1868 my ($self, $val, $max) = @_;
1672 1869
1673 $self->set_max ($max) 1870 $self->set_max ($max)
1674 if defined $max; 1871 if defined $max;
1675 1872
1676 $max = $self->{max_val}; 1873 return if $self->{val} == $val;
1874
1677 $self->{val} = $val; 1875 $self->{val} = $val;
1678
1679 $self->update; 1876 $self->update;
1680} 1877}
1681 1878
1682sub _draw { 1879sub _draw {
1683 my ($self) = @_; 1880 my ($self) = @_;
1684 1881
1685 my $tex = $tex{$self->{type}}; 1882 my $tex = $tex{$self->{type}};
1883 my ($t1, $t2, $t3) = @$tex;
1686 1884
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1885 my ($w, $h) = ($self->{w}, $self->{h});
1688 1886
1689 if ($self->{vertical}) { 1887 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1888 glRotate 90, 0, 0, 1;
… …
1692 1890
1693 ($w, $h) = ($h, $w); 1891 ($w, $h) = ($h, $w);
1694 } 1892 }
1695 1893
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1894 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1895
1699 my $t1 = $tex->[0]; 1896 my $ycut1 = max 0, min 1, $ycut;
1700 my $t2 = $tex->[1]; 1897 my $ycut2 = max 0, min 1, $ycut - 1;
1898
1899 my $h1 = $self->{h} * (1 - $ycut1);
1900 my $h2 = $self->{h} * (1 - $ycut2);
1701 1901
1702 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1904 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1905 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1906
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1907 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1908 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1909 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1910 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1911 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1912 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1913 glEnd;
1717 1914
1915 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1916 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1917 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1918 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1919 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1920 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1921 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 glEnd; 1922 glEnd;
1923
1924 if ($t3) {
1925 glBindTexture GL_TEXTURE_2D, $t3->{name};
1926 glBegin GL_QUADS;
1927 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1928 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1929 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1930 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1931 glEnd;
1932 }
1725 1933
1726 glDisable GL_BLEND; 1934 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1935 glDisable GL_TEXTURE_2D;
1728} 1936}
1729 1937
… …
1735 1943
1736sub new { 1944sub new {
1737 my ($class, %arg) = @_; 1945 my ($class, %arg) = @_;
1738 1946
1739 my $self = $class->SUPER::new ( 1947 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1948 tooltip => $arg{type},
1949 can_hover => 1,
1950 can_events => 1,
1741 %arg, 1951 %arg,
1742 ); 1952 );
1743 1953
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1954 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1955 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1956 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 1957
1748 $self 1958 $self
1749} 1959}
1750 1960
1751sub set_fontsize { 1961sub set_fontsize {
… …
1753 1963
1754 $self->{value}->set_fontsize ($fsize); 1964 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 1965 $self->{max} ->set_fontsize ($fsize);
1756} 1966}
1757 1967
1968sub set_max {
1969 my ($self, $max) = @_;
1970
1971 $self->{gauge}->set_max ($max);
1972 $self->{max}->set_text ($max);
1973}
1974
1758sub set_value { 1975sub set_value {
1759 my ($self, $val, $max) = @_; 1976 my ($self, $val, $max) = @_;
1760 1977
1761 $self->set_max ($max) 1978 $self->set_max ($max)
1762 if defined $max; 1979 if defined $max;
1763 1980
1764 $self->{gauge}->set_value ($val, $max); 1981 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 1982 $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} 1983}
1774 1984
1775############################################################################# 1985#############################################################################
1776 1986
1777package CFClient::UI::Slider; 1987package CFClient::UI::Slider;
… …
1796 # TODO: calculations are off 2006 # TODO: calculations are off
1797 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1798 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1799 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1800 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1801 req_w => 20, 2011 req_w => $::WIDTH / 80,
1802 req_h => 20, 2012 req_h => $::WIDTH / 80,
1803 vertical => 0, 2013 vertical => 0,
1804 can_hover => 1, 2014 can_hover => 1,
1805 inner_pad => 5, 2015 inner_pad => 5,
1806 @_ 2016 @_
1807 ); 2017 );
… …
1917 2127
1918sub new { 2128sub new {
1919 my $class = shift; 2129 my $class = shift;
1920 2130
1921 my $self = $class->SUPER::new ( 2131 my $self = $class->SUPER::new (
1922 fontsize => 1, 2132 fontsize => 1,
2133 can_events => 0,
1923 #font => default_font 2134 #font => default_font
1924 @_, 2135 @_,
1925 2136
1926 layout => (new CFClient::Layout), 2137 layout => (new CFClient::Layout),
1927 par => [], 2138 par => [],
1928 height => 0, 2139 height => 0,
1929 children => [ 2140 children => [
1930 (new CFClient::UI::Empty expand => 1), 2141 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2142 (new CFClient::UI::Slider vertical => 1),
1932 ], 2143 ],
1933 ); 2144 );
1934 2145
1935 $self->{children}[1]->connect (changed => sub { 2146 $self->{children}[1]->connect (changed => sub { $self->update });
1936 $self->update;
1937 });
1938 2147
1939 $self 2148 $self
1940} 2149}
1941 2150
1942sub set_fontsize { 2151sub set_fontsize {
… …
1950 my ($self, $text) = @_; 2159 my ($self, $text) = @_;
1951 2160
1952 my $layout = $self->{layout}; 2161 my $layout = $self->{layout};
1953 2162
1954 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $layout->set_width ($self->{w}); 2164 $layout->set_width ($self->{children}[0]{w});
1956 $layout->set_text ($text); 2165 $layout->set_text ($text);
1957 2166
1958 ($layout->size)[1] 2167 ($layout->size)[1]
1959} 2168}
1960 2169
… …
2013 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2014 2223
2015 delete $self->{texture}; 2224 delete $self->{texture};
2016 } 2225 }
2017 2226
2018 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2019 glClearColor 0, 0, 0, 1; 2228 glClearColor 0, 0, 0, 0;
2020 glClear GL_COLOR_BUFFER_BIT; 2229 glClear GL_COLOR_BUFFER_BIT;
2021 2230
2022 glEnable GL_BLEND; 2231 glEnable GL_BLEND;
2023 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2024 glEnable GL_TEXTURE_2D; 2233 glEnable GL_TEXTURE_2D;
… …
2056} 2265}
2057 2266
2058sub _draw { 2267sub _draw {
2059 my ($self) = @_; 2268 my ($self) = @_;
2060 2269
2061 if ($self->{texture}) { 2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2062 glEnable GL_TEXTURE_2D; 2272 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1;
2064 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2065 glDisable GL_TEXTURE_2D; 2276 glDisable GL_TEXTURE_2D;
2066 } 2277 glDisable GL_BLEND;
2067 2278
2068 $self->{children}[1]->draw; 2279 $self->{children}[1]->draw;
2069 2280
2070} 2281}
2071 2282
… …
2119 2330
2120sub new { 2331sub new {
2121 my $class = shift; 2332 my $class = shift;
2122 2333
2123 my $self = $class->SUPER::new ( 2334 my $self = $class->SUPER::new (
2124 state => 0, 2335 state => 0,
2125 connect_activate => \&toggle_flopper, 2336 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2337 @_
2128 ); 2338 );
2129 2339
2130 if ($self->{state}) { 2340 if ($self->{state}) {
2131 $self->{state} = 0; 2341 $self->{state} = 0;
… …
2166 @_, 2376 @_,
2167 can_events => 0, 2377 can_events => 0,
2168 ) 2378 )
2169} 2379}
2170 2380
2171sub set_text { 2381sub set_markup {
2172 my ($self, $text) = @_; 2382 my ($self, $text) = @_;
2173 2383
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2175 $self->{label}->set_text ($text); 2385 $self->{label}->set_markup ($text);
2176 $self->add ($self->{label}); 2386 $self->add ($self->{label});
2177} 2387}
2178 2388
2179sub size_request { 2389sub size_request {
2180 my ($self) = @_; 2390 my ($self) = @_;
2181 2391
2182 $self->child->set_max_size ($::WIDTH * 0.2); 2392 $self->child->set_max_size ($::WIDTH * 0.3);
2183 2393
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2395
2186 ($w + 4, $h + 4) 2396 ($w + 4, $h + 4)
2397}
2398
2399sub size_allocate {
2400 my ($self, $w, $h) = @_;
2401
2402 $self->SUPER::size_allocate ($w - 4, $h - 4);
2187} 2403}
2188 2404
2189sub _draw { 2405sub _draw {
2190 my ($self) = @_; 2406 my ($self) = @_;
2191 2407
… …
2216 $self->SUPER::_draw; 2432 $self->SUPER::_draw;
2217} 2433}
2218 2434
2219############################################################################# 2435#############################################################################
2220 2436
2437package CFClient::UI::Face;
2438
2439our @ISA = CFClient::UI::Base::;
2440
2441use CFClient::OpenGL;
2442
2443sub new {
2444 my $class = shift;
2445
2446 $class->SUPER::new (
2447 aspect => 1,
2448 @_,
2449 )
2450}
2451
2452sub size_request {
2453 (32, 8)
2454}
2455
2456sub _draw {
2457 my ($self) = @_;
2458
2459 return unless $::CONN;#d# manage and cache textures differently
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2461
2462 # TODO animation
2463 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 }
2473}
2474
2475#############################################################################
2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = delete $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525
2526 $self->add (new CFClient::UI::Face
2527 can_events => 0,
2528 face => $item->{face},
2529 anim => $item->{anim},
2530 animspeed => $item->{animspeed},
2531 );
2532
2533 $self->add (new CFClient::UI::Label
2534 can_events => 0,
2535 text => $desc,
2536 );
2537
2538 $self
2539}
2540
2541#############################################################################
2542
2543package CFClient::UI::Inventory;
2544
2545our @ISA = CFClient::UI::ScrolledWindow::;
2546
2547sub new {
2548 my $class = shift;
2549
2550 my $self = $class->SUPER::new (
2551 scrolled => (new CFClient::UI::VBox),
2552 @_,
2553 );
2554
2555 $self
2556}
2557
2558sub set_items {
2559 my ($self, $items) = @_;
2560
2561 $self->{scrolled}->clear;
2562 return unless $items;
2563
2564 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2565
2566 $self->{real_items} = \@items;
2567
2568 for my $item (@items) {
2569 my $desc = $item->{nrof} < 2
2570 ? $item->{name}
2571 : "$item->{nrof} $item->{name_pl}";
2572
2573 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2574 }
2575
2576# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2577}
2578
2579sub size_request {
2580 my ($self) = @_;
2581 ($self->{req_w}, $self->{req_h});
2582}
2583
2584#############################################################################
2585
2586package CFClient::UI::Menu;
2587
2588our @ISA = CFClient::UI::FancyFrame::;
2589
2590use CFClient::OpenGL;
2591
2592sub new {
2593 my $class = shift;
2594
2595 my $self = $class->SUPER::new (
2596 items => [],
2597 z => 100,
2598 @_,
2599 );
2600
2601 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2602
2603 for my $item (@{ $self->{items} }) {
2604 my ($widget, $cb) = @$item;
2605
2606 # handle various types of items, only text for now
2607 if (!ref $widget) {
2608 $widget = new CFClient::UI::Label
2609 can_hover => 1,
2610 can_events => 1,
2611 text => $widget;
2612 }
2613
2614 $self->{item}{$widget} = $item;
2615
2616 $self->{vbox}->add ($widget);
2617 }
2618
2619 $self
2620}
2621
2622# popup given the event (must be a mouse button down event currently)
2623sub popup {
2624 my ($self, $ev) = @_;
2625
2626 $self->emit ("popdown");
2627
2628 # maybe save $GRAB? must be careful about events...
2629 $GRAB = $self;
2630 $self->{button} = $ev->{button};
2631
2632 $self->show;
2633 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2634}
2635
2636sub mouse_motion {
2637 my ($self, $ev, $x, $y) = @_;
2638
2639 # TODO: should use vbox->find_widget or so
2640 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2641 $self->{hover} = $self->{item}{$HOVER};
2642}
2643
2644sub button_up {
2645 my ($self, $ev, $x, $y) = @_;
2646
2647 if ($ev->{button} == $self->{button}) {
2648 undef $GRAB;
2649 $self->hide;
2650
2651 $self->emit ("popdown");
2652 $self->{hover}[1]->() if $self->{hover};
2653 }
2654}
2655
2656#############################################################################
2657
2221package CFClient::UI::Root; 2658package CFClient::UI::Root;
2222 2659
2223our @ISA = CFClient::UI::Container::; 2660our @ISA = CFClient::UI::Container::;
2224 2661
2225use CFClient::OpenGL; 2662use CFClient::OpenGL;
2226 2663
2227sub check_size { 2664sub new {
2228 my ($self) = @_; 2665 my $class = shift;
2229 2666
2230 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2667 $class->SUPER::new (
2231} 2668 @_,
2232 2669 )
2233sub size_request {
2234 ($::WIDTH, $::HEIGHT)
2235} 2670}
2236 2671
2237sub configure { 2672sub configure {
2238 my ($self, $x, $y, $w, $h) = @_; 2673 my ($self, $x, $y, $w, $h) = @_;
2239 2674
2240 $self->SUPER::configure ($x, $y, $w, $h); 2675 $self->{w} = $w;
2676 $self->{h} = $h;
2677}
2241 2678
2679sub check_size {
2680 my ($self) = @_;
2681
2682 $self->size_allocate ($self->{w}, $self->{h})
2683 if $self->{w};
2684}
2685
2686sub size_request {
2687 my ($self) = @_;
2688
2689 ($self->{w}, $self->{h})
2690}
2691
2692sub size_allocate {
2693 my ($self, $w, $h) = @_;
2694
2695 my $old_w = $self->{old_w};
2696 my $old_h = $self->{old_h};
2697
2698 if ($old_w && $old_h) {
2699 for my $child ($self->children) {
2700 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2701 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2702 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2703 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2704 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2705 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2706 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2707 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2708 }
2709 }
2710
2242 for my $child (@{$self->{children}}) { 2711 for my $child ($self->children) {
2243 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2712 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2244 2713
2245 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2714 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2246 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2715 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2247 $child->configure ($X, $Y, $W,$H); 2716 $child->configure ($X, $Y, $W, $H);
2248 } 2717 }
2249}
2250 2718
2251sub _topleft { 2719 $self->{old_w} = $w;
2720 $self->{old_h} = $h;
2721}
2722
2723sub coord2local {
2252 my ($self, $x, $y) = @_; 2724 my ($self, $x, $y) = @_;
2253 2725
2254 ($x, $y) 2726 ($x, $y)
2255} 2727}
2256 2728
2729sub coord2global {
2730 my ($self, $x, $y) = @_;
2731
2732 ($x, $y)
2733}
2734
2257sub update { 2735sub update {
2258 my ($self) = @_; 2736 my ($self) = @_;
2259 2737
2260 $self->check_size; 2738 $self->check_size;
2261 ::refresh (); 2739 $::WANT_REFRESH++;
2262} 2740}
2263 2741
2264sub add { 2742sub add {
2265 my ($self, $child) = @_; 2743 my ($self, $child) = @_;
2266 2744
2267 # integerize window positions 2745 # integerise window positions
2268 $child->{x} = int $child->{x}; 2746 $child->{x} = int $child->{x};
2269 $child->{y} = int $child->{y}; 2747 $child->{y} = int $child->{y};
2270 2748
2271 $self->SUPER::add ($child); 2749 $self->SUPER::add ($child);
2272} 2750}
… …
2275 my ($self, $id, $cb) = @_; 2753 my ($self, $id, $cb) = @_;
2276 2754
2277 $self->{refresh_hook}{$id} = $cb; 2755 $self->{refresh_hook}{$id} = $cb;
2278} 2756}
2279 2757
2280sub draw { 2758sub draw {
2281 my ($self) = @_; 2759 my ($self) = @_;
2282 2760
2761 if ($self->{check_size}) {
2762 my @queue = ([], []);
2763
2764 for (;;) {
2765 if ($self->{check_size}) {
2766 # heuristic: check containers last
2767 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2768 for values %{delete $self->{check_size}}
2769 }
2770
2771 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2772
2773 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2774 ? @$widget{qw(user_w user_h)}
2775 : $widget->size_request;
2776
2777 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2778 $widget->{req_w} = $w;
2779 $widget->{req_h} = $h;
2780
2781 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2782
2783 $widget->{parent}->check_size
2784 if $widget->{parent};
2785 }
2786 }
2787 }
2788
2789 while ($self->{size_alloc}) {
2790 for (values %{delete $self->{size_alloc}}) {
2791 my ($widget, $w, $h) = @$_;
2792
2793 $widget->{w} = $w;
2794 $widget->{h} = $h;
2795 $widget->size_allocate ($w, $h);
2796 $widget->emit (size_allocate => $w, $h);
2797 }
2798 }
2799
2283 while (my $rcb = delete $self->{refresh_hook}) { 2800 while ($self->{refresh_hook}) {
2284 $_->() for values %$rcb; 2801 $_->()
2802 for values %{delete $self->{refresh_hook}};
2285 } 2803 }
2286 2804
2287 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2805 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2288 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2289 glClear GL_COLOR_BUFFER_BIT; 2807 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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