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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.193 by root, Wed May 10 21:12:26 2006 UTC

… …
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) {
… …
160} 179}
161 180
162sub hide { 181sub hide {
163 my ($self) = @_; 182 my ($self) = @_;
164 183
165 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
166 186
167 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
168} 189}
169 190
170sub move { 191sub move {
171 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
172 193
… …
211 $self->{y} = $y; 232 $self->{y} = $y;
212 $self->update; 233 $self->update;
213 } 234 }
214 235
215 if ($self->{w} != $w || $self->{h} != $h) { 236 if ($self->{w} != $w || $self->{h} != $h) {
216 $self->{w} = $w; 237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217 $self->{h} = $h;
218
219 $self->size_allocate ($w, $h);
220 $self->update;
221 } 238 }
222} 239}
223 240
224sub size_allocate { 241sub size_allocate {
225 # nothing to be done 242 # nothing to be done
226} 243}
227 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
228sub set_max_size { 260sub set_max_size {
229 my ($self, $w, $h) = @_; 261 my ($self, $w, $h) = @_;
230 262
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 264 delete $self->{max_h}; $self->{max_h} = $h if $h;
233}
234
235# return top left coordinates
236sub _topleft {
237 my ($self, $x, $y) = @_;
238
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 265}
241 266
242# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
243sub coord2local { 268sub coord2local {
244 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
245 270
246 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 272}
249 273
250# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
251sub coord2global { 275sub coord2global {
252 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
253 277
254 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 279}
257 280
258sub focus_in { 281sub focus_in {
259 my ($self) = @_; 282 my ($self) = @_;
260 283
… …
320 glVertex $x + $self->{w}, $y + $self->{h}; 343 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 344 glVertex $x , $y + $self->{h};
322 glEnd; 345 glEnd;
323 glDisable GL_BLEND; 346 glDisable GL_BLEND;
324 } 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 }
325} 362}
326 363
327sub _draw { 364sub _draw {
328 my ($self) = @_; 365 my ($self) = @_;
329 366
… …
344 381
345sub set_parent { 382sub set_parent {
346 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
347 384
348 Scalar::Util::weaken ($self->{parent} = $parent); 385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
349} 389}
350 390
351sub check_size { 391sub check_size {
352 my ($self) = @_; 392 my ($self) = @_;
353 393
354 $self->{parent} 394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
355 or return 1;
356
357 my ($w, $h) = $self->{user_w} && $self->{user_h}
358 ? @$self{qw(user_w user_h)}
359 : $self->size_request;
360
361 if ($w != $self->{req_w} || $h != $self->{req_h}) {
362 $self->{req_w} = $w;
363 $self->{req_h} = $h;
364
365 $self->{parent}->check_size
366 or $self->size_allocate (
367 (List::Util::max $self->{w}, $w),
368 (List::Util::max $self->{h}, $h),
369 );
370
371 1
372 } else {
373 0
374 }
375} 395}
376 396
377sub update { 397sub update {
378 my ($self) = @_; 398 my ($self) = @_;
379 399
… …
388} 408}
389 409
390sub emit { 410sub emit {
391 my ($self, $signal, @args) = @_; 411 my ($self, $signal, @args) = @_;
392 412
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394 $cb->($self, @args);
395 }
396} 414}
397 415
398sub DESTROY { 416sub DESTROY {
399 my ($self) = @_; 417 my ($self) = @_;
400 418
… …
467sub new { 485sub new {
468 my ($class, %arg) = @_; 486 my ($class, %arg) = @_;
469 487
470 my $children = delete $arg{children} || []; 488 my $children = delete $arg{children} || [];
471 489
472 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 );
473 $self->add ($_) for @$children; 495 $self->add ($_) for @$children;
474 496
475 $self 497 $self
476} 498}
477 499
478sub add { 500sub add {
479 my ($self, $child) = @_; 501 my ($self, @widgets) = @_;
480 502
481 $child->set_parent ($self); 503 $_->set_parent ($self)
504 for @widgets;
482 505
483 use sort 'stable'; 506 use sort 'stable';
484 507
485 $self->{children} = [ 508 $self->{children} = [
486 sort { $a->{z} <=> $b->{z} } 509 sort { $a->{z} <=> $b->{z} }
487 @{$self->{children}}, $child 510 @{$self->{children}}, @widgets
488 ]; 511 ];
489 512
490 $child->check_size; 513 $self->check_size;
514 $self->update;
515}
516
517sub children {
518 @{ $_[0]{children} }
491} 519}
492 520
493sub remove { 521sub remove {
494 my ($self, $child) = @_; 522 my ($self, $child) = @_;
495 523
496 delete $child->{parent}; 524 delete $child->{parent};
525 $child->hide;
497 526
498 $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 }
499 543
500 $self->check_size; 544 $self->check_size;
501 $self->update; 545 $self->update;
502} 546}
503 547
… …
581} 625}
582 626
583sub update { 627sub update {
584 my ($self) = @_; 628 my ($self) = @_;
585 629
586 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
587 $self->render_chld;
588 $self->SUPER::update; 631 $self->SUPER::update;
589}
590
591sub render_chld {
592 my ($self) = @_;
593
594 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595 glClearColor 0, 0, 0, 1;
596 glClear GL_COLOR_BUFFER_BIT;
597 $self->child->draw;
598 };
599} 632}
600 633
601sub size_allocate { 634sub size_allocate {
602 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
603 636
604 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
605 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
606 $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 };
607} 661}
608 662
609sub _draw { 663sub _draw {
610 my ($self) = @_; 664 my ($self) = @_;
611 665
… …
613 667
614 my $tex = $self->{texture} 668 my $tex = $self->{texture}
615 or return; 669 or return;
616 670
617 glEnable GL_BLEND; 671 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
620 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;
621 676
622 $tex->draw_quad (0, 0, $w, $h); 677 $tex->draw_quad (0, 0, $w, $h);
623 678
624 glDisable GL_BLEND; 679 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
… …
629 684
630package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
631 686
632our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
633 688
634sub new { die }
635
636sub size_request { 689sub size_request {
637 my ($self) = @_; 690 my ($self) = @_;
638 691
639 @$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)};
640 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
641 694
642 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
643} 696}
644 697
645sub _draw { 698sub size_allocate {
646 my ($self) = @_; 699 my ($self, $w, $h) = @_;
647 700
648 $self->{children}[1]->draw; 701 $self->update;
649} 702}
650 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
651 783
652############################################################################# 784#############################################################################
653 785
654package CFClient::UI::Frame; 786package CFClient::UI::Frame;
655 787
… …
710 my $class = shift; 842 my $class = shift;
711 843
712 # TODO: user_x, user_y, overwrite moveto? 844 # TODO: user_x, user_y, overwrite moveto?
713 845
714 my $self = $class->SUPER::new ( 846 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 847 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 848 border_bg => [1, 1, 1, 1],
717 border => 0.8, 849 border => 0.6,
718 can_events => 1, 850 can_events => 1,
719 @_ 851 @_
720 ); 852 );
721 853
722 $self->{title} &&= new CFClient::UI::Label 854 $self->{title} &&= new CFClient::UI::Label
723 align => 0, 855 align => 0,
724 valign => 1, 856 valign => 1,
725 text => $self->{title}, 857 text => $self->{title},
726 fontsize => 1; 858 fontsize => $self->{border};
727 859
728 $self 860 $self
729} 861}
730 862
731sub border { 863sub border {
… …
756} 888}
757 889
758sub button_down { 890sub button_down {
759 my ($self, $ev, $x, $y) = @_; 891 my ($self, $ev, $x, $y) = @_;
760 892
893 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 894 my $border = $self->border;
762 895
763 if ($x < $self->{w} && $x >= $self->{w} - $border 896 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 897 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 898
899 if ($lr & $td) {
900 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 901 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 902 my ($bw, $bh) = ($self->{w}, $self->{h});
768 903
904 my $mx = $x < $border;
905 my $my = $y < $border;
906
769 $self->{motion} = sub { 907 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 908 my ($ev, $x, $y) = @_;
771 909
772 ($x, $y) = ($ev->{x}, $ev->{y}); 910 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy;
773 912
774 $self->{user_w} = $bw + $x - $ox; 913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
776 $self->check_size; 916 $self->check_size;
777 }; 917 };
778 918
779 } elsif ($x >= 0 && $x < $self->{w} 919 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 920 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 921 my ($bx, $by) = ($self->{x}, $self->{y});
784 922
785 $self->{motion} = sub { 923 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
… …
822 $tex[1]->draw_quad (0, 0, $w, $border); 960 $tex[1]->draw_quad (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
826 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827 my $bg = $tex[0]; 966 my $bg = $tex[0];
828 967
829 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
831 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
832 971
833 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
834 973
835 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
839 978
840 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
842 982
843 $self->{title}->draw if $self->{title}; 983 $self->{title}->draw if $self->{title};
984
844 $self->child->draw; 985 $self->child->draw;
845} 986}
846 987
847############################################################################# 988#############################################################################
848 989
… …
870 $self->{children}[$y][$x] = $child; 1011 $self->{children}[$y][$x] = $child;
871 1012
872 $child->check_size; 1013 $child->check_size;
873} 1014}
874 1015
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
875# 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?
876sub clear { 1021sub clear {
877 my ($self) = @_; 1022 my ($self) = @_;
878 1023
1024 my @children = $self->children;
879 delete $self->{children}; 1025 delete $self->{children};
1026
1027 for (@children) {
1028 delete $_->{parent};
1029 $_->hide;
1030 }
1031
880 $self->update; 1032 $self->update;
881} 1033}
882 1034
883sub get_wh { 1035sub get_wh {
884 my ($self) = @_; 1036 my ($self) = @_;
… …
1061} 1213}
1062 1214
1063sub size_allocate { 1215sub size_allocate {
1064 my ($self, $w, $h) = @_; 1216 my ($self, $w, $h) = @_;
1065 1217
1218 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1219
1066 my $children = $self->{children}; 1220 my $children = $self->{children};
1067 1221
1068 my @h = map $_->{req_h}, @$children; 1222 my @h = map $_->{req_h}, @$children;
1069 1223
1070 my $req_h = List::Util::sum @h; 1224 my $req_h = List::Util::sum @h;
… …
1107 1261
1108sub new { 1262sub new {
1109 my ($class, %arg) = @_; 1263 my ($class, %arg) = @_;
1110 1264
1111 my $self = $class->SUPER::new ( 1265 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1266 fg => [1, 1, 1],
1113 #font => default_font 1267 #font => default_font
1114 fontsize => 1, 1268 fontsize => 1,
1115 text => "", 1269 text => "",
1116 align => -1, 1270 align => -1,
1117 valign => -1, 1271 valign => -1,
1118 padding => 2, 1272 padding => 2,
1119 layout => new CFClient::Layout, 1273 layout => new CFClient::Layout,
1120 can_events => 0, 1274 can_events => 0,
1121 %arg 1275 %arg
1122 ); 1276 );
1123 1277
1124 if (exists $self->{template}) { 1278 if (exists $self->{template}) {
… …
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1285 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1132 1286
1133 $self 1287 $self
1134} 1288}
1135 1289
1136sub escape_text { 1290sub escape {
1137 local $_ = $_[1]; 1291 local $_ = $_[1];
1138 1292
1139 s/&/&amp;/g; 1293 s/&/&amp;/g;
1140 s/>/&gt;/g; 1294 s/>/&gt;/g;
1141 s/</&lt;/g; 1295 s/</&lt;/g;
1142 1296
1143 $_[1] 1297 $_[1]
1144} 1298}
1145 1299
1300sub update {
1301 my ($self) = @_;
1302
1303 delete $self->{texture};
1304 $self->SUPER::update;
1305}
1306
1146sub set_text { 1307sub set_text {
1147 my ($self, $text) = @_; 1308 my ($self, $text) = @_;
1148 1309
1310 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text";
1312
1149 $self->{layout}->set_text ($text); 1313 $self->{layout}->set_text ($text);
1150 1314
1151 delete $self->{texture}; 1315 $self->update;
1152 $self->check_size; 1316 $self->check_size;
1153 $self->update;
1154} 1317}
1155 1318
1156sub set_markup { 1319sub set_markup {
1157 my ($self, $markup) = @_; 1320 my ($self, $markup) = @_;
1158 1321
1322 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup";
1324
1159 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1160 1326
1161 delete $self->{texture}; 1327 $self->update;
1162 $self->check_size; 1328 $self->check_size;
1163 $self->update;
1164} 1329}
1165 1330
1166sub size_request { 1331sub size_request {
1167 my ($self) = @_; 1332 my ($self) = @_;
1168 1333
… …
1197sub set_fontsize { 1362sub set_fontsize {
1198 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1199 1364
1200 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1201 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1202 $self->check_size; 1369 $self->check_size;
1203 $self->update;
1204} 1370}
1205 1371
1206sub _draw { 1372sub _draw {
1207 my ($self) = @_; 1373 my ($self) = @_;
1208 1374
… …
1248 1414
1249sub new { 1415sub new {
1250 my $class = shift; 1416 my $class = shift;
1251 1417
1252 $class->SUPER::new ( 1418 $class->SUPER::new (
1253 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1420 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1421 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1422 active_fg => [0, 0, 0],
1257 can_hover => 1, 1423 can_hover => 1,
1258 can_focus => 1, 1424 can_focus => 1,
1259 valign => 0, 1425 valign => 0,
1260 can_events => 1, 1426 can_events => 1,
1261 @_ 1427 @_
1262 ) 1428 )
1263} 1429}
1264 1430
… …
1418 my ($self, $ev) = @_; 1584 my ($self, $ev) = @_;
1419 1585
1420 my $sym = $ev->{sym}; 1586 my $sym = $ev->{sym};
1421 1587
1422 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} = '';
1423 $self->emit (activate => $self->get_text); 1593 $self->emit (activate => $txt);
1424 $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 }
1425 1617
1426 } else { 1618 } else {
1427 $self->SUPER::key_down ($ev); 1619 $self->SUPER::key_down ($ev);
1428 } 1620 }
1429 1621
… …
1443 1635
1444sub new { 1636sub new {
1445 my $class = shift; 1637 my $class = shift;
1446 1638
1447 $class->SUPER::new ( 1639 $class->SUPER::new (
1448 padding => 4, 1640 padding => 4,
1449 fg => [1, 1, 1], 1641 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1642 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1643 active_fg => [0, 0, 1],
1452 can_hover => 1, 1644 can_hover => 1,
1453 align => 0, 1645 align => 0,
1454 valign => 0, 1646 valign => 0,
1455 can_events => 1, 1647 can_events => 1,
1456 @_ 1648 @_
1457 ) 1649 )
1458} 1650}
1459 1651
… …
1666} 1858}
1667 1859
1668sub set_max { 1860sub set_max {
1669 my ($self, $max) = @_; 1861 my ($self, $max) = @_;
1670 1862
1863 return if $self->{max_val} == $max;
1864
1671 $self->{max_val} = $max; 1865 $self->{max_val} = $max;
1866 $self->update;
1672} 1867}
1673 1868
1674sub set_value { 1869sub set_value {
1675 my ($self, $val, $max) = @_; 1870 my ($self, $val, $max) = @_;
1676 1871
1677 $self->set_max ($max) 1872 $self->set_max ($max)
1678 if defined $max; 1873 if defined $max;
1679 1874
1680 $max = $self->{max_val}; 1875 return if $self->{val} == $val;
1876
1681 $self->{val} = $val; 1877 $self->{val} = $val;
1682
1683 $self->update; 1878 $self->update;
1684} 1879}
1685 1880
1686sub _draw { 1881sub _draw {
1687 my ($self) = @_; 1882 my ($self) = @_;
… …
1750 1945
1751sub new { 1946sub new {
1752 my ($class, %arg) = @_; 1947 my ($class, %arg) = @_;
1753 1948
1754 my $self = $class->SUPER::new ( 1949 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1950 tooltip => $arg{type},
1951 can_hover => 1,
1756 can_events => 1, 1952 can_events => 1,
1757 can_hover => 1,
1758 %arg, 1953 %arg,
1759 ); 1954 );
1760 1955
1761 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1956 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1762 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1957 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1770 1965
1771 $self->{value}->set_fontsize ($fsize); 1966 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 1967 $self->{max} ->set_fontsize ($fsize);
1773} 1968}
1774 1969
1970sub set_max {
1971 my ($self, $max) = @_;
1972
1973 $self->{gauge}->set_max ($max);
1974 $self->{max}->set_text ($max);
1975}
1976
1775sub set_value { 1977sub set_value {
1776 my ($self, $val, $max) = @_; 1978 my ($self, $val, $max) = @_;
1777 1979
1778 $self->set_max ($max) 1980 $self->set_max ($max)
1779 if defined $max; 1981 if defined $max;
1780 1982
1781 $self->{gauge}->set_value ($val, $max); 1983 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 1984 $self->{value}->set_text ($val);
1783}
1784
1785sub set_max {
1786 my ($self, $max) = @_;
1787
1788 $self->{gauge}->set_max ($max);
1789 $self->{max}->set_text ($max);
1790} 1985}
1791 1986
1792############################################################################# 1987#############################################################################
1793 1988
1794package CFClient::UI::Slider; 1989package CFClient::UI::Slider;
… …
1813 # TODO: calculations are off 2008 # TODO: calculations are off
1814 my $self = $class->SUPER::new ( 2009 my $self = $class->SUPER::new (
1815 fg => [1, 1, 1], 2010 fg => [1, 1, 1],
1816 active_fg => [0, 0, 0], 2011 active_fg => [0, 0, 0],
1817 range => [0, 0, 100, 10], 2012 range => [0, 0, 100, 10],
1818 req_w => 20, 2013 req_w => $::WIDTH / 80,
1819 req_h => 20, 2014 req_h => $::WIDTH / 80,
1820 vertical => 0, 2015 vertical => 0,
1821 can_hover => 1, 2016 can_hover => 1,
1822 inner_pad => 5, 2017 inner_pad => 5,
1823 @_ 2018 @_
1824 ); 2019 );
… …
1934 2129
1935sub new { 2130sub new {
1936 my $class = shift; 2131 my $class = shift;
1937 2132
1938 my $self = $class->SUPER::new ( 2133 my $self = $class->SUPER::new (
1939 fontsize => 1, 2134 fontsize => 1,
2135 can_events => 0,
1940 #font => default_font 2136 #font => default_font
1941 @_, 2137 @_,
1942 2138
1943 layout => (new CFClient::Layout), 2139 layout => (new CFClient::Layout),
1944 par => [], 2140 par => [],
1945 height => 0, 2141 height => 0,
1946 children => [ 2142 children => [
1947 (new CFClient::UI::Empty expand => 1), 2143 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2144 (new CFClient::UI::Slider vertical => 1),
1949 ], 2145 ],
1950 ); 2146 );
1951 2147
1952 $self->{children}[1]->connect (changed => sub { 2148 $self->{children}[1]->connect (changed => sub { $self->update });
1953 $self->update;
1954 });
1955 2149
1956 $self 2150 $self
1957} 2151}
1958 2152
1959sub set_fontsize { 2153sub set_fontsize {
… …
1967 my ($self, $text) = @_; 2161 my ($self, $text) = @_;
1968 2162
1969 my $layout = $self->{layout}; 2163 my $layout = $self->{layout};
1970 2164
1971 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1972 $layout->set_width ($self->{w}); 2166 $layout->set_width ($self->{children}[0]{w});
1973 $layout->set_text ($text); 2167 $layout->set_text ($text);
1974 2168
1975 ($layout->size)[1] 2169 ($layout->size)[1]
1976} 2170}
1977 2171
… …
2030 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2224 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2031 2225
2032 delete $self->{texture}; 2226 delete $self->{texture};
2033 } 2227 }
2034 2228
2035 $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 {
2036 glClearColor 0, 0, 0, 1; 2230 glClearColor 0, 0, 0, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2231 glClear GL_COLOR_BUFFER_BIT;
2038 2232
2039 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2041 glEnable GL_TEXTURE_2D; 2235 glEnable GL_TEXTURE_2D;
… …
2073} 2267}
2074 2268
2075sub _draw { 2269sub _draw {
2076 my ($self) = @_; 2270 my ($self) = @_;
2077 2271
2078 if ($self->{texture}) { 2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2079 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2080 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;
2081 $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});
2082 glDisable GL_TEXTURE_2D; 2278 glDisable GL_TEXTURE_2D;
2083 } 2279 glDisable GL_BLEND;
2084 2280
2085 $self->{children}[1]->draw; 2281 $self->{children}[1]->draw;
2086 2282
2087} 2283}
2088 2284
… …
2136 2332
2137sub new { 2333sub new {
2138 my $class = shift; 2334 my $class = shift;
2139 2335
2140 my $self = $class->SUPER::new ( 2336 my $self = $class->SUPER::new (
2141 state => 0, 2337 state => 0,
2142 connect_activate => \&toggle_flopper, 2338 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2339 @_
2145 ); 2340 );
2146 2341
2147 if ($self->{state}) { 2342 if ($self->{state}) {
2148 $self->{state} = 0; 2343 $self->{state} = 0;
… …
2183 @_, 2378 @_,
2184 can_events => 0, 2379 can_events => 0,
2185 ) 2380 )
2186} 2381}
2187 2382
2188sub set_text { 2383sub set_markup {
2189 my ($self, $text) = @_; 2384 my ($self, $text) = @_;
2190 2385
2191 $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];
2192 $self->{label}->set_text ($text); 2387 $self->{label}->set_markup ($text);
2193 $self->add ($self->{label}); 2388 $self->add ($self->{label});
2194} 2389}
2195 2390
2196sub size_request { 2391sub size_request {
2197 my ($self) = @_; 2392 my ($self) = @_;
… …
2199 $self->child->set_max_size ($::WIDTH * 0.3); 2394 $self->child->set_max_size ($::WIDTH * 0.3);
2200 2395
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2397
2203 ($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);
2204} 2405}
2205 2406
2206sub _draw { 2407sub _draw {
2207 my ($self) = @_; 2408 my ($self) = @_;
2208 2409
… …
2233 $self->SUPER::_draw; 2434 $self->SUPER::_draw;
2234} 2435}
2235 2436
2236############################################################################# 2437#############################################################################
2237 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
2238package CFClient::UI::Root; 2660package CFClient::UI::Root;
2239 2661
2240our @ISA = CFClient::UI::Container::; 2662our @ISA = CFClient::UI::Container::;
2241 2663
2242use CFClient::OpenGL; 2664use CFClient::OpenGL;
2243 2665
2244sub check_size { 2666sub new {
2245 my ($self) = @_; 2667 my $class = shift;
2246 2668
2247 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2669 $class->SUPER::new (
2248} 2670 @_,
2249 2671 )
2250sub size_request {
2251 ($::WIDTH, $::HEIGHT)
2252} 2672}
2253 2673
2254sub configure { 2674sub configure {
2255 my ($self, $x, $y, $w, $h) = @_; 2675 my ($self, $x, $y, $w, $h) = @_;
2256 2676
2257 $self->SUPER::configure ($x, $y, $w, $h); 2677 $self->{w} = $w;
2678 $self->{h} = $h;
2679}
2258 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
2259 for my $child (@{$self->{children}}) { 2713 for my $child ($self->children) {
2260 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)};
2261 2715
2262 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2716 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2263 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2264 $child->configure ($X, $Y, $W,$H); 2718 $child->configure ($X, $Y, $W, $H);
2265 } 2719 }
2266}
2267 2720
2268sub _topleft { 2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723}
2724
2725sub coord2local {
2269 my ($self, $x, $y) = @_; 2726 my ($self, $x, $y) = @_;
2270 2727
2271 ($x, $y) 2728 ($x, $y)
2272} 2729}
2273 2730
2731sub coord2global {
2732 my ($self, $x, $y) = @_;
2733
2734 ($x, $y)
2735}
2736
2274sub update { 2737sub update {
2275 my ($self) = @_; 2738 my ($self) = @_;
2276 2739
2277 $self->check_size; 2740 $self->check_size;
2278 ::refresh (); 2741 $::WANT_REFRESH++;
2279} 2742}
2280 2743
2281sub add { 2744sub add {
2282 my ($self, $child) = @_; 2745 my ($self, $child) = @_;
2283 2746
2284 # integerize window positions 2747 # integerise window positions
2285 $child->{x} = int $child->{x}; 2748 $child->{x} = int $child->{x};
2286 $child->{y} = int $child->{y}; 2749 $child->{y} = int $child->{y};
2287 2750
2288 $self->SUPER::add ($child); 2751 $self->SUPER::add ($child);
2289} 2752}
… …
2292 my ($self, $id, $cb) = @_; 2755 my ($self, $id, $cb) = @_;
2293 2756
2294 $self->{refresh_hook}{$id} = $cb; 2757 $self->{refresh_hook}{$id} = $cb;
2295} 2758}
2296 2759
2297sub draw { 2760sub draw {
2298 my ($self) = @_; 2761 my ($self) = @_;
2299 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
2300 while (my $rcb = delete $self->{refresh_hook}) { 2807 while ($self->{refresh_hook}) {
2301 $_->() for values %$rcb; 2808 $_->()
2809 for values %{delete $self->{refresh_hook}};
2302 } 2810 }
2303 2811
2304 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2812 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2305 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2306 glClear GL_COLOR_BUFFER_BIT; 2814 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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