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.182 by root, Sun Apr 30 11:17:08 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
744sub _render {
745 my ($self) = @_;
746
747 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748
749 $self->SUPER::_render;
750}
751
752#############################################################################
753
754package CFClient::UI::ScrolledWindow;
755
756our @ISA = CFClient::UI::HBox::;
757
758sub new {
759 my $class = shift;
760
761 my $self;
762
763 my $slider = new CFClient::UI::Slider
764 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
768 },
769 ;
770
771 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort),
773 slider => $slider,
774 @_,
775 );
776
777 $self->{vp}->add ($self->{scrolled});
778 $self->add ($self->{vp});
779 $self->add ($self->{slider});
780
781 $self
782}
783
784#TODO# update range on size_allocate depeneing on child
785# update viewport offset on scroll
727 786
728############################################################################# 787#############################################################################
729 788
730package CFClient::UI::Frame; 789package CFClient::UI::Frame;
731 790
… …
788 # TODO: user_x, user_y, overwrite moveto? 847 # TODO: user_x, user_y, overwrite moveto?
789 848
790 my $self = $class->SUPER::new ( 849 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 850 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 851 border_bg => [1, 1, 1, 1],
793 border => 0.8, 852 border => 0.6,
794 can_events => 1, 853 can_events => 1,
795 @_ 854 @_
796 ); 855 );
797 856
798 $self->{title} &&= new CFClient::UI::Label 857 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 858 align => 0,
800 valign => 1, 859 valign => 1,
801 text => $self->{title}, 860 text => $self->{title},
802 fontsize => 1; 861 fontsize => $self->{border};
803 862
804 $self 863 $self
805} 864}
806 865
807sub border { 866sub border {
… …
832} 891}
833 892
834sub button_down { 893sub button_down {
835 my ($self, $ev, $x, $y) = @_; 894 my ($self, $ev, $x, $y) = @_;
836 895
896 my ($w, $h) = @$self{qw(w h)};
837 my $border = $self->border; 897 my $border = $self->border;
838 898
839 if ($x < $self->{w} && $x >= $self->{w} - $border 899 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
840 && $y < $self->{h} && $y >= $self->{h} - $border) { 900 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
841 901
902 if ($lr & $td) {
903 my ($wx, $wy) = ($self->{x}, $self->{y});
842 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 904 my ($ox, $oy) = ($ev->{x}, $ev->{y});
843 my ($bw, $bh) = ($self->{w}, $self->{h}); 905 my ($bw, $bh) = ($self->{w}, $self->{h});
844 906
907 my $mx = $x < $border;
908 my $my = $y < $border;
909
845 $self->{motion} = sub { 910 $self->{motion} = sub {
846 my ($ev, $x, $y) = @_; 911 my ($ev, $x, $y) = @_;
847 912
848 ($x, $y) = ($ev->{x}, $ev->{y}); 913 my $dx = $ev->{x} - $ox;
914 my $dy = $ev->{y} - $oy;
849 915
850 $self->{user_w} = $bw + $x - $ox; 916 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
851 $self->{user_h} = $bh + $y - $oy; 917 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
918 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
852 $self->check_size; 919 $self->check_size;
853 }; 920 };
854 921
855 } elsif ($x >= 0 && $x < $self->{w} 922 } elsif ($lr ^ $td) {
856 && $y >= 0 && $y < $border) {
857
858 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
859 my ($bx, $by) = ($self->{x}, $self->{y}); 924 my ($bx, $by) = ($self->{x}, $self->{y});
860 925
861 $self->{motion} = sub { 926 $self->{motion} = sub {
862 my ($ev, $x, $y) = @_; 927 my ($ev, $x, $y) = @_;
… …
898 $tex[1]->draw_quad (0, 0, $w, $border); 963 $tex[1]->draw_quad (0, 0, $w, $border);
899 $tex[3]->draw_quad (0, $border, $border, $ch); 964 $tex[3]->draw_quad (0, $border, $border, $ch);
900 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
901 $tex[4]->draw_quad (0, $h - $border, $w, $border); 966 $tex[4]->draw_quad (0, $h - $border, $w, $border);
902 967
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
903 my $bg = $tex[0]; 969 my $bg = $tex[0];
904 970
905 # TODO: repeat texture not scale 971 # TODO: repeat texture not scale
906 my $rep_x = $cw / $bg->{w}; 972 my $rep_x = $cw / $bg->{w};
907 my $rep_y = $ch / $bg->{h}; 973 my $rep_y = $ch / $bg->{h};
908 974
909 glColor @{ $self->{bg} }; 975 glColor @{ $self->{bg} };
910 976
911 $bg->{s} = $rep_x; 977 $bg->{s} = $rep_x;
912 $bg->{t} = $rep_y; 978 $bg->{t} = $rep_y;
913 $bg->{wrap_mode} = 1; 979 $bg->{wrap_mode} = 1;
914 $bg->draw_quad ($border, $border, $cw, $ch); 980 $bg->draw_quad ($border, $border, $cw, $ch);
915 981
916 glDisable GL_TEXTURE_2D; 982 glDisable GL_TEXTURE_2D;
917 glDisable GL_BLEND; 983 glDisable GL_BLEND;
984 }
918 985
919 $self->{title}->draw if $self->{title}; 986 $self->{title}->draw if $self->{title};
987
920 $self->child->draw; 988 $self->child->draw;
921} 989}
922 990
923############################################################################# 991#############################################################################
924 992
… …
1948 # TODO: calculations are off 2016 # TODO: calculations are off
1949 my $self = $class->SUPER::new ( 2017 my $self = $class->SUPER::new (
1950 fg => [1, 1, 1], 2018 fg => [1, 1, 1],
1951 active_fg => [0, 0, 0], 2019 active_fg => [0, 0, 0],
1952 range => [0, 0, 100, 10], 2020 range => [0, 0, 100, 10],
1953 req_w => 20, 2021 req_w => $::WIDTH / 80,
1954 req_h => 20, 2022 req_h => $::WIDTH / 80,
1955 vertical => 0, 2023 vertical => 0,
1956 can_hover => 1, 2024 can_hover => 1,
1957 inner_pad => 5, 2025 inner_pad => 5,
1958 @_ 2026 @_
1959 ); 2027 );
… …
2083 (new CFClient::UI::Empty expand => 1), 2151 (new CFClient::UI::Empty expand => 1),
2084 (new CFClient::UI::Slider vertical => 1), 2152 (new CFClient::UI::Slider vertical => 1),
2085 ], 2153 ],
2086 ); 2154 );
2087 2155
2088 $self->{children}[1]->connect (changed => sub { 2156 $self->{children}[1]->connect (changed => sub { $self->update });
2089 $self->update;
2090 });
2091 2157
2092 $self 2158 $self
2093} 2159}
2094 2160
2095sub set_fontsize { 2161sub set_fontsize {
… …
2103 my ($self, $text) = @_; 2169 my ($self, $text) = @_;
2104 2170
2105 my $layout = $self->{layout}; 2171 my $layout = $self->{layout};
2106 2172
2107 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2108 $layout->set_width ($self->{w}); 2174 $layout->set_width ($self->{children}[0]{w});
2109 $layout->set_text ($text); 2175 $layout->set_text ($text);
2110 2176
2111 ($layout->size)[1] 2177 ($layout->size)[1]
2112} 2178}
2113 2179
… …
2166 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2167 2233
2168 delete $self->{texture}; 2234 delete $self->{texture};
2169 } 2235 }
2170 2236
2171 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2172 glClearColor 0, 0, 0, 0; 2238 glClearColor 0, 0, 0, 0;
2173 glClear GL_COLOR_BUFFER_BIT; 2239 glClear GL_COLOR_BUFFER_BIT;
2174 2240
2175 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
2209} 2275}
2210 2276
2211sub _draw { 2277sub _draw {
2212 my ($self) = @_; 2278 my ($self) = @_;
2213 2279
2214 if ($self->{texture}) {
2215 glEnable GL_BLEND; 2280 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glEnable GL_TEXTURE_2D; 2282 glEnable GL_TEXTURE_2D;
2218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2219 glColor 1, 1, 1, 1; 2284 glColor 1, 1, 1, 1;
2220 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2221 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND; 2287 glDisable GL_BLEND;
2223 }
2224 2288
2225 $self->{children}[1]->draw; 2289 $self->{children}[1]->draw;
2226 2290
2227} 2291}
2228 2292
… …
2397 2461
2398sub size_request { 2462sub size_request {
2399 (32, 8) 2463 (32, 8)
2400} 2464}
2401 2465
2402sub draw { 2466sub _draw {
2403 my ($self) = @_; 2467 my ($self) = @_;
2404 2468
2405 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2406 2470
2471 # TODO animation
2407 if ($tex) { 2472 if ($tex) {
2408 glEnable GL_BLEND; 2473 glEnable GL_BLEND;
2409 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2410 glEnable GL_TEXTURE_2D; 2475 glEnable GL_TEXTURE_2D;
2411 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2416 } 2481 }
2417} 2482}
2418 2483
2419############################################################################# 2484#############################################################################
2420 2485
2486package CFClient::UI::Menu;
2487
2488our @ISA = CFClient::UI::FancyFrame::;
2489
2490use CFClient::OpenGL;
2491
2492sub new {
2493 my $class = shift;
2494
2495 my $self = $class->SUPER::new (
2496 items => [],
2497 z => 100,
2498 @_,
2499 );
2500
2501 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2502
2503 for my $item (@{ $self->{items} }) {
2504 my ($widget, $cb) = @$item;
2505
2506 # handle various types of items, only text for now
2507 if (!ref $widget) {
2508 $widget = new CFClient::UI::Label
2509 can_hover => 1,
2510 can_events => 1,
2511 text => $widget;
2512 }
2513
2514 $self->{item}{$widget} = $item;
2515
2516 $self->{vbox}->add ($widget);
2517 }
2518
2519 $self
2520}
2521
2522# popup given the event (must be a mouse button down event currently)
2523sub popup {
2524 my ($self, $ev) = @_;
2525
2526 $self->emit ("popdown");
2527
2528 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self;
2530 $self->{button} = $ev->{button};
2531
2532 $self->show;
2533 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2534}
2535
2536sub mouse_motion {
2537 my ($self, $ev, $x, $y) = @_;
2538
2539 # TODO: should use vbox->find_widget or so
2540 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2541 $self->{hover} = $self->{item}{$HOVER};
2542}
2543
2544sub button_up {
2545 my ($self, $ev, $x, $y) = @_;
2546
2547 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB;
2549 $self->hide;
2550
2551 $self->emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover};
2553 }
2554}
2555
2556#############################################################################
2557
2421package CFClient::UI::Root; 2558package CFClient::UI::Root;
2422 2559
2423our @ISA = CFClient::UI::Container::; 2560our @ISA = CFClient::UI::Container::;
2424 2561
2425use CFClient::OpenGL; 2562use CFClient::OpenGL;
… …
2497 $self->_draw; 2634 $self->_draw;
2498} 2635}
2499 2636
2500############################################################################# 2637#############################################################################
2501 2638
2639package CFClient::UI::Inventory;
2640
2641our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my $self = $class->SUPER::new (
2647 scrolled => (new CFClient::UI::VBox),
2648 @_,
2649 );
2650
2651 $self
2652}
2653
2654sub set_items {
2655 my ($self, $items) = @_;
2656
2657 $self->{scrolled}->clear;
2658 return unless $items;
2659
2660 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662 $self->{real_items} = \@items;
2663
2664 for my $item (@items) {
2665 my $desc = $item->{nrof} < 2
2666 ? $item->{name}
2667 : "$item->{nrof} $item->{name_pl}";
2668
2669 my $hb = new CFClient::UI::HBox;
2670
2671 $hb->add (my $f = new CFClient::UI::Face
2672 can_events => 0,
2673 face => $item->{face},
2674 anim => $item->{anim},
2675 animspeed => $item->{animspeed},
2676 expand => 1,
2677 );
2678 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679 $self->{scrolled}->add ($hb);
2680 }
2681
2682# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683}
2684
2685sub size_request {
2686 my ($self) = @_;
2687 (100, 200)
2688}
2689
2690#############################################################################
2691
2502package CFClient::UI; 2692package CFClient::UI;
2503 2693
2504$ROOT = new CFClient::UI::Root; 2694$ROOT = new CFClient::UI::Root;
2505$TOOLTIP = new CFClient::UI::Tooltip; 2695$TOOLTIP = new CFClient::UI::Tooltip;
2506 2696

Diff Legend

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