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.175 by root, Tue Apr 25 11:48:31 2006 UTC vs.
Revision 1.184 by root, Wed May 3 19:56:05 2006 UTC

… …
237 $self->{w} = $w; 237 $self->{w} = $w;
238 $self->{h} = $h; 238 $self->{h} = $h;
239 239
240 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
241 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
242 } 243 }
243} 244}
244 245
245sub size_allocate { 246sub size_allocate {
246 # nothing to be done 247 # nothing to be done
247} 248}
248 249
249sub children { 250sub children {
250} 251}
251 252
252# call when resoltuion changes etc. 253# call when resolution changes etc.
253sub reconfigure { 254sub reconfigure {
254 my ($self) = @_; 255 my ($self) = @_;
255 256
256 $_->reconfigure 257 $_->reconfigure
257 for $self->children; 258 for $self->children;
… …
539 sort { $a->{z} <=> $b->{z} } 540 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 541 @{$self->{children}}, $child
541 ]; 542 ];
542 543
543 $child->check_size; 544 $child->check_size;
545 $self->update;
544} 546}
545 547
546sub children { 548sub children {
547 @{ $_[0]{children} } 549 @{ $_[0]{children} }
548} 550}
… …
567 569
568 for (@$children) { 570 for (@$children) {
569 delete $_->{parent}; 571 delete $_->{parent};
570 $_->hide; 572 $_->hide;
571 } 573 }
574
575 $self->check_size;
576 $self->update;
572} 577}
573 578
574sub find_widget { 579sub find_widget {
575 my ($self, $x, $y) = @_; 580 my ($self, $x, $y) = @_;
576 581
… …
662 667
663 $self->SUPER::size_allocate ($w, $h); 668 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 669 $self->update;
665} 670}
666 671
672sub _render {
673 $_[0]{children}[0]->draw;
674}
675
667sub render_child { 676sub render_child {
668 my ($self) = @_; 677 my ($self) = @_;
669 678
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 680 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 681 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 682
683 $self->_render;
674# glColorMask 1, 1, 1, 0; 684# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND; 685# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0; 687# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 688# glCopyPixels 0, 0, $self->{w}, $self->{h};
… …
705 715
706package CFClient::UI::ViewPort; 716package CFClient::UI::ViewPort;
707 717
708our @ISA = CFClient::UI::Window::; 718our @ISA = CFClient::UI::Window::;
709 719
710sub new { die }
711
712sub size_request { 720sub size_request {
713 my ($self) = @_; 721 my ($self) = @_;
714 722
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 725
718 @$self{qw(child_w child_h)} 726 @$self{qw(child_w child_h)}
719} 727}
720 728
721sub _draw { 729sub size_allocate {
722 my ($self) = @_; 730 my ($self, $w, $h) = @_;
723 731
724 $self->{children}[1]->draw; 732 $self->update;
725} 733}
726 734
735sub set_offset {
736 my ($self, $x, $y) = @_;
737
738 $self->{view_x} = int $x;
739 $self->{view_y} = int $y;
740
741 $self->update;
742}
743
744# hmm, this does not work for topleft of $self... but we should not aks for that
745sub _topleft {
746 my ($self, $x, $y) = @_;
747
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
749}
750
751sub find_widget {
752 my ($self, $x, $y) = @_;
753
754 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
755 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
756 ) {
757 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
758 } else {
759 $self->CFClient::UI::Base::find_widget ($x, $y)
760 }
761}
762
763sub _render {
764 my ($self) = @_;
765
766 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
767
768 $self->SUPER::_render;
769}
770
771#############################################################################
772
773package CFClient::UI::ScrolledWindow;
774
775our @ISA = CFClient::UI::HBox::;
776
777sub new {
778 my $class = shift;
779
780 my $self;
781
782 my $slider = new CFClient::UI::Slider
783 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
787 },
788 ;
789
790 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort),
792 slider => $slider,
793 @_,
794 );
795
796 $self->{vp}->add ($self->{scrolled});
797 $self->add ($self->{vp});
798 $self->add ($self->{slider});
799
800 $self
801}
802
803#TODO# update range on size_allocate depeneing on child
804# update viewport offset on scroll
727 805
728############################################################################# 806#############################################################################
729 807
730package CFClient::UI::Frame; 808package CFClient::UI::Frame;
731 809
… …
788 # TODO: user_x, user_y, overwrite moveto? 866 # TODO: user_x, user_y, overwrite moveto?
789 867
790 my $self = $class->SUPER::new ( 868 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 869 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 870 border_bg => [1, 1, 1, 1],
793 border => 0.8, 871 border => 0.6,
794 can_events => 1, 872 can_events => 1,
795 @_ 873 @_
796 ); 874 );
797 875
798 $self->{title} &&= new CFClient::UI::Label 876 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 877 align => 0,
800 valign => 1, 878 valign => 1,
801 text => $self->{title}, 879 text => $self->{title},
802 fontsize => 1; 880 fontsize => $self->{border};
803 881
804 $self 882 $self
805} 883}
806 884
807sub border { 885sub border {
… …
832} 910}
833 911
834sub button_down { 912sub button_down {
835 my ($self, $ev, $x, $y) = @_; 913 my ($self, $ev, $x, $y) = @_;
836 914
915 my ($w, $h) = @$self{qw(w h)};
837 my $border = $self->border; 916 my $border = $self->border;
838 917
839 if ($x < $self->{w} && $x >= $self->{w} - $border 918 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
840 && $y < $self->{h} && $y >= $self->{h} - $border) { 919 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
841 920
921 if ($lr & $td) {
922 my ($wx, $wy) = ($self->{x}, $self->{y});
842 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
843 my ($bw, $bh) = ($self->{w}, $self->{h}); 924 my ($bw, $bh) = ($self->{w}, $self->{h});
844 925
926 my $mx = $x < $border;
927 my $my = $y < $border;
928
845 $self->{motion} = sub { 929 $self->{motion} = sub {
846 my ($ev, $x, $y) = @_; 930 my ($ev, $x, $y) = @_;
847 931
848 ($x, $y) = ($ev->{x}, $ev->{y}); 932 my $dx = $ev->{x} - $ox;
933 my $dy = $ev->{y} - $oy;
849 934
850 $self->{user_w} = $bw + $x - $ox; 935 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
851 $self->{user_h} = $bh + $y - $oy; 936 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
937 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
852 $self->check_size; 938 $self->check_size;
853 }; 939 };
854 940
855 } elsif ($x >= 0 && $x < $self->{w} 941 } elsif ($lr ^ $td) {
856 && $y >= 0 && $y < $border) {
857
858 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 942 my ($ox, $oy) = ($ev->{x}, $ev->{y});
859 my ($bx, $by) = ($self->{x}, $self->{y}); 943 my ($bx, $by) = ($self->{x}, $self->{y});
860 944
861 $self->{motion} = sub { 945 $self->{motion} = sub {
862 my ($ev, $x, $y) = @_; 946 my ($ev, $x, $y) = @_;
… …
898 $tex[1]->draw_quad (0, 0, $w, $border); 982 $tex[1]->draw_quad (0, 0, $w, $border);
899 $tex[3]->draw_quad (0, $border, $border, $ch); 983 $tex[3]->draw_quad (0, $border, $border, $ch);
900 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
901 $tex[4]->draw_quad (0, $h - $border, $w, $border); 985 $tex[4]->draw_quad (0, $h - $border, $w, $border);
902 986
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
903 my $bg = $tex[0]; 988 my $bg = $tex[0];
904 989
905 # TODO: repeat texture not scale 990 # TODO: repeat texture not scale
906 my $rep_x = $cw / $bg->{w}; 991 my $rep_x = $cw / $bg->{w};
907 my $rep_y = $ch / $bg->{h}; 992 my $rep_y = $ch / $bg->{h};
908 993
909 glColor @{ $self->{bg} }; 994 glColor @{ $self->{bg} };
910 995
911 $bg->{s} = $rep_x; 996 $bg->{s} = $rep_x;
912 $bg->{t} = $rep_y; 997 $bg->{t} = $rep_y;
913 $bg->{wrap_mode} = 1; 998 $bg->{wrap_mode} = 1;
914 $bg->draw_quad ($border, $border, $cw, $ch); 999 $bg->draw_quad ($border, $border, $cw, $ch);
915 1000
916 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
917 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
1003 }
918 1004
919 $self->{title}->draw if $self->{title}; 1005 $self->{title}->draw if $self->{title};
1006
920 $self->child->draw; 1007 $self->child->draw;
921} 1008}
922 1009
923############################################################################# 1010#############################################################################
924 1011
… …
1948 # TODO: calculations are off 2035 # TODO: calculations are off
1949 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1950 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1951 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1952 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1953 req_w => 20, 2040 req_w => $::WIDTH / 80,
1954 req_h => 20, 2041 req_h => $::WIDTH / 80,
1955 vertical => 0, 2042 vertical => 0,
1956 can_hover => 1, 2043 can_hover => 1,
1957 inner_pad => 5, 2044 inner_pad => 5,
1958 @_ 2045 @_
1959 ); 2046 );
… …
2083 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
2084 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
2085 ], 2172 ],
2086 ); 2173 );
2087 2174
2088 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
2089 $self->update;
2090 });
2091 2176
2092 $self 2177 $self
2093} 2178}
2094 2179
2095sub set_fontsize { 2180sub set_fontsize {
… …
2103 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
2104 2189
2105 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
2106 2191
2107 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2108 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
2109 $layout->set_text ($text); 2194 $layout->set_text ($text);
2110 2195
2111 ($layout->size)[1] 2196 ($layout->size)[1]
2112} 2197}
2113 2198
… …
2166 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2167 2252
2168 delete $self->{texture}; 2253 delete $self->{texture};
2169 } 2254 }
2170 2255
2171 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2172 glClearColor 0, 0, 0, 0; 2257 glClearColor 0, 0, 0, 0;
2173 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
2174 2259
2175 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
2209} 2294}
2210 2295
2211sub _draw { 2296sub _draw {
2212 my ($self) = @_; 2297 my ($self) = @_;
2213 2298
2214 if ($self->{texture}) {
2215 glEnable GL_BLEND; 2299 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
2218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2219 glColor 1, 1, 1, 1; 2303 glColor 1, 1, 1, 1;
2220 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2221 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND; 2306 glDisable GL_BLEND;
2223 }
2224 2307
2225 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
2226 2309
2227} 2310}
2228 2311
… …
2397 2480
2398sub size_request { 2481sub size_request {
2399 (32, 8) 2482 (32, 8)
2400} 2483}
2401 2484
2402sub draw { 2485sub _draw {
2403 my ($self) = @_; 2486 my ($self) = @_;
2404 2487
2405 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2488 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2406 2489
2490 # TODO animation
2407 if ($tex) { 2491 if ($tex) {
2408 glEnable GL_BLEND; 2492 glEnable GL_BLEND;
2409 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2410 glEnable GL_TEXTURE_2D; 2494 glEnable GL_TEXTURE_2D;
2411 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2416 } 2500 }
2417} 2501}
2418 2502
2419############################################################################# 2503#############################################################################
2420 2504
2505package CFClient::UI::Menu;
2506
2507our @ISA = CFClient::UI::FancyFrame::;
2508
2509use CFClient::OpenGL;
2510
2511sub new {
2512 my $class = shift;
2513
2514 my $self = $class->SUPER::new (
2515 items => [],
2516 z => 100,
2517 @_,
2518 );
2519
2520 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2521
2522 for my $item (@{ $self->{items} }) {
2523 my ($widget, $cb) = @$item;
2524
2525 # handle various types of items, only text for now
2526 if (!ref $widget) {
2527 $widget = new CFClient::UI::Label
2528 can_hover => 1,
2529 can_events => 1,
2530 text => $widget;
2531 }
2532
2533 $self->{item}{$widget} = $item;
2534
2535 $self->{vbox}->add ($widget);
2536 }
2537
2538 $self
2539}
2540
2541# popup given the event (must be a mouse button down event currently)
2542sub popup {
2543 my ($self, $ev) = @_;
2544
2545 $self->emit ("popdown");
2546
2547 # maybe save $GRAB? must be careful about events...
2548 $GRAB = $self;
2549 $self->{button} = $ev->{button};
2550
2551 $self->show;
2552 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2553}
2554
2555sub mouse_motion {
2556 my ($self, $ev, $x, $y) = @_;
2557
2558 # TODO: should use vbox->find_widget or so
2559 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2560 $self->{hover} = $self->{item}{$HOVER};
2561}
2562
2563sub button_up {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 if ($ev->{button} == $self->{button}) {
2567 undef $GRAB;
2568 $self->hide;
2569
2570 $self->emit ("popdown");
2571 $self->{hover}[1]->() if $self->{hover};
2572 }
2573}
2574
2575#############################################################################
2576
2421package CFClient::UI::Root; 2577package CFClient::UI::Root;
2422 2578
2423our @ISA = CFClient::UI::Container::; 2579our @ISA = CFClient::UI::Container::;
2424 2580
2425use CFClient::OpenGL; 2581use CFClient::OpenGL;
… …
2497 $self->_draw; 2653 $self->_draw;
2498} 2654}
2499 2655
2500############################################################################# 2656#############################################################################
2501 2657
2658package CFClient::UI::InventoryItem;
2659
2660our @ISA = CFClient::UI::HBox::;
2661
2662sub new {
2663 my $class = shift;
2664
2665 my %args = @_;
2666
2667 my $item = $args{item};
2668
2669 my $desc = $item->{nrof} < 2
2670 ? $item->{name}
2671 : "$item->{nrof} $item->{name_pl}";
2672
2673
2674 my $self = $class->SUPER::new (
2675 can_hover => 1,
2676 can_events => 1,
2677 tooltip => (CFClient::UI::Label->escape ($desc)
2678 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2679 connect_button_down => sub {
2680 my ($self, $ev, $x, $y) = @_;
2681
2682 # todo: maybe put examine on 1? but should just be a tooltip :(
2683 if ($ev->{button} == 1) {
2684 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2685 } elsif ($ev->{button} == 2) {
2686 $::CONN->send ("apply $item->{tag}");
2687 } elsif ($ev->{button} == 3) {
2688 CFClient::UI::Menu->new (
2689 items => [
2690 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2691 [
2692 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2693 sub { $::CONN->send ("lock $item->{tag}") },
2694 ],
2695 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2696 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2697 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2698 ],
2699 )->popup ($ev);
2700 }
2701
2702 1
2703 },
2704 %args
2705 );
2706 $self->add(new CFClient::UI::Face
2707 can_events => 0,
2708 face => $item->{face},
2709 anim => $item->{anim},
2710 animspeed => $item->{animspeed});
2711 $self->add(new CFClient::UI::Label
2712 can_events => 0,
2713 text => $desc);
2714
2715 $self
2716}
2717
2718#############################################################################
2719
2720package CFClient::UI::Inventory;
2721
2722our @ISA = CFClient::UI::ScrolledWindow::;
2723
2724sub new {
2725 my $class = shift;
2726
2727 my $self = $class->SUPER::new (
2728 scrolled => (new CFClient::UI::VBox),
2729 @_,
2730 );
2731
2732 $self
2733}
2734
2735sub set_items {
2736 my ($self, $items) = @_;
2737
2738 $self->{scrolled}->clear;
2739 return unless $items;
2740
2741 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2742
2743 $self->{real_items} = \@items;
2744
2745 for my $item (@items) {
2746 my $desc = $item->{nrof} < 2
2747 ? $item->{name}
2748 : "$item->{nrof} $item->{name_pl}";
2749
2750 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760
2761#############################################################################
2762
2502package CFClient::UI; 2763package CFClient::UI;
2503 2764
2504$ROOT = new CFClient::UI::Root; 2765$ROOT = new CFClient::UI::Root;
2505$TOOLTIP = new CFClient::UI::Tooltip; 2766$TOOLTIP = new CFClient::UI::Tooltip;
2506 2767

Diff Legend

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