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.181 by root, Sat Apr 29 16:17:09 2006 UTC

… …
788 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
789 789
790 my $self = $class->SUPER::new ( 790 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
793 border => 0.8, 793 border => 0.6,
794 can_events => 1, 794 can_events => 1,
795 @_ 795 @_
796 ); 796 );
797 797
798 $self->{title} &&= new CFClient::UI::Label 798 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 799 align => 0,
800 valign => 1, 800 valign => 1,
801 text => $self->{title}, 801 text => $self->{title},
802 fontsize => 1; 802 fontsize => $self->{border};
803 803
804 $self 804 $self
805} 805}
806 806
807sub border { 807sub border {
… …
832} 832}
833 833
834sub button_down { 834sub button_down {
835 my ($self, $ev, $x, $y) = @_; 835 my ($self, $ev, $x, $y) = @_;
836 836
837 my ($w, $h) = @$self{qw(w h)};
837 my $border = $self->border; 838 my $border = $self->border;
838 839
839 if ($x < $self->{w} && $x >= $self->{w} - $border 840 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
840 && $y < $self->{h} && $y >= $self->{h} - $border) { 841 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
841 842
843 if ($lr & $td) {
844 my ($wx, $wy) = ($self->{x}, $self->{y});
842 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 845 my ($ox, $oy) = ($ev->{x}, $ev->{y});
843 my ($bw, $bh) = ($self->{w}, $self->{h}); 846 my ($bw, $bh) = ($self->{w}, $self->{h});
844 847
848 my $mx = $x < $border;
849 my $my = $y < $border;
850
845 $self->{motion} = sub { 851 $self->{motion} = sub {
846 my ($ev, $x, $y) = @_; 852 my ($ev, $x, $y) = @_;
847 853
848 ($x, $y) = ($ev->{x}, $ev->{y}); 854 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy;
849 856
850 $self->{user_w} = $bw + $x - $ox; 857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
851 $self->{user_h} = $bh + $y - $oy; 858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
852 $self->check_size; 860 $self->check_size;
853 }; 861 };
854 862
855 } elsif ($x >= 0 && $x < $self->{w} 863 } elsif ($lr ^ $td) {
856 && $y >= 0 && $y < $border) {
857
858 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
859 my ($bx, $by) = ($self->{x}, $self->{y}); 865 my ($bx, $by) = ($self->{x}, $self->{y});
860 866
861 $self->{motion} = sub { 867 $self->{motion} = sub {
862 my ($ev, $x, $y) = @_; 868 my ($ev, $x, $y) = @_;
… …
898 $tex[1]->draw_quad (0, 0, $w, $border); 904 $tex[1]->draw_quad (0, 0, $w, $border);
899 $tex[3]->draw_quad (0, $border, $border, $ch); 905 $tex[3]->draw_quad (0, $border, $border, $ch);
900 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
901 $tex[4]->draw_quad (0, $h - $border, $w, $border); 907 $tex[4]->draw_quad (0, $h - $border, $w, $border);
902 908
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
903 my $bg = $tex[0]; 910 my $bg = $tex[0];
904 911
905 # TODO: repeat texture not scale 912 # TODO: repeat texture not scale
906 my $rep_x = $cw / $bg->{w}; 913 my $rep_x = $cw / $bg->{w};
907 my $rep_y = $ch / $bg->{h}; 914 my $rep_y = $ch / $bg->{h};
908 915
909 glColor @{ $self->{bg} }; 916 glColor @{ $self->{bg} };
910 917
911 $bg->{s} = $rep_x; 918 $bg->{s} = $rep_x;
912 $bg->{t} = $rep_y; 919 $bg->{t} = $rep_y;
913 $bg->{wrap_mode} = 1; 920 $bg->{wrap_mode} = 1;
914 $bg->draw_quad ($border, $border, $cw, $ch); 921 $bg->draw_quad ($border, $border, $cw, $ch);
915 922
916 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
917 glDisable GL_BLEND; 924 glDisable GL_BLEND;
925 }
918 926
919 $self->{title}->draw if $self->{title}; 927 $self->{title}->draw if $self->{title};
928
920 $self->child->draw; 929 $self->child->draw;
921} 930}
922 931
923############################################################################# 932#############################################################################
924 933
… …
2083 (new CFClient::UI::Empty expand => 1), 2092 (new CFClient::UI::Empty expand => 1),
2084 (new CFClient::UI::Slider vertical => 1), 2093 (new CFClient::UI::Slider vertical => 1),
2085 ], 2094 ],
2086 ); 2095 );
2087 2096
2088 $self->{children}[1]->connect (changed => sub { 2097 $self->{children}[1]->connect (changed => sub { $self->update });
2089 $self->update;
2090 });
2091 2098
2092 $self 2099 $self
2093} 2100}
2094 2101
2095sub set_fontsize { 2102sub set_fontsize {
… …
2103 my ($self, $text) = @_; 2110 my ($self, $text) = @_;
2104 2111
2105 my $layout = $self->{layout}; 2112 my $layout = $self->{layout};
2106 2113
2107 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2108 $layout->set_width ($self->{w}); 2115 $layout->set_width ($self->{children}[0]{w});
2109 $layout->set_text ($text); 2116 $layout->set_text ($text);
2110 2117
2111 ($layout->size)[1] 2118 ($layout->size)[1]
2112} 2119}
2113 2120
… …
2166 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2167 2174
2168 delete $self->{texture}; 2175 delete $self->{texture};
2169 } 2176 }
2170 2177
2171 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2172 glClearColor 0, 0, 0, 0; 2179 glClearColor 0, 0, 0, 0;
2173 glClear GL_COLOR_BUFFER_BIT; 2180 glClear GL_COLOR_BUFFER_BIT;
2174 2181
2175 glEnable GL_BLEND; 2182 glEnable GL_BLEND;
2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
2209} 2216}
2210 2217
2211sub _draw { 2218sub _draw {
2212 my ($self) = @_; 2219 my ($self) = @_;
2213 2220
2214 if ($self->{texture}) {
2215 glEnable GL_BLEND; 2221 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glEnable GL_TEXTURE_2D; 2223 glEnable GL_TEXTURE_2D;
2218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2219 glColor 1, 1, 1, 1; 2225 glColor 1, 1, 1, 1;
2220 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2221 glDisable GL_TEXTURE_2D; 2227 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND; 2228 glDisable GL_BLEND;
2223 }
2224 2229
2225 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2226 2231
2227} 2232}
2228 2233
… …
2397 2402
2398sub size_request { 2403sub size_request {
2399 (32, 8) 2404 (32, 8)
2400} 2405}
2401 2406
2402sub draw { 2407sub _draw {
2403 my ($self) = @_; 2408 my ($self) = @_;
2404 2409
2405 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2406 2411
2412 # TODO animation
2407 if ($tex) { 2413 if ($tex) {
2408 glEnable GL_BLEND; 2414 glEnable GL_BLEND;
2409 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2410 glEnable GL_TEXTURE_2D; 2416 glEnable GL_TEXTURE_2D;
2411 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2416 } 2422 }
2417} 2423}
2418 2424
2419############################################################################# 2425#############################################################################
2420 2426
2427package CFClient::UI::Menu;
2428
2429our @ISA = CFClient::UI::FancyFrame::;
2430
2431use CFClient::OpenGL;
2432
2433sub new {
2434 my $class = shift;
2435
2436 my $self = $class->SUPER::new (
2437 items => [],
2438 z => 100,
2439 @_,
2440 );
2441
2442 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2443
2444 for my $item (@{ $self->{items} }) {
2445 my ($widget, $cb) = @$item;
2446
2447 # handle various types of items, only text for now
2448 if (!ref $widget) {
2449 $widget = new CFClient::UI::Label
2450 can_hover => 1,
2451 can_events => 1,
2452 text => $widget;
2453 }
2454
2455 $self->{item}{$widget} = $item;
2456
2457 $self->{vbox}->add ($widget);
2458 }
2459
2460 $self
2461}
2462
2463# popup given the event (must be a mouse button down event currently)
2464sub popup {
2465 my ($self, $ev) = @_;
2466
2467 $self->emit ("popdown");
2468
2469 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self;
2471 $self->{button} = $ev->{button};
2472
2473 $self->show;
2474 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2475}
2476
2477sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # TODO: should use vbox->fdind_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER};
2483}
2484
2485sub button_up {
2486 my ($self, $ev, $x, $y) = @_;
2487
2488 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB;
2490 $self->hide;
2491
2492 $self->emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover};
2494 }
2495}
2496
2497#############################################################################
2498
2421package CFClient::UI::Root; 2499package CFClient::UI::Root;
2422 2500
2423our @ISA = CFClient::UI::Container::; 2501our @ISA = CFClient::UI::Container::;
2424 2502
2425use CFClient::OpenGL; 2503use CFClient::OpenGL;
… …
2497 $self->_draw; 2575 $self->_draw;
2498} 2576}
2499 2577
2500############################################################################# 2578#############################################################################
2501 2579
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2606
2607 $self->{real_items} = \@items;
2608
2609 for my $item (@items) {
2610 my $desc = $item->{nrof} < 2
2611 ? $item->{name}
2612 : "$item->{nrof} $item->{name_pl}";
2613
2614 $self->add (my $hb = new CFClient::UI::HBox);
2615
2616 $hb->add (my $f = new CFClient::UI::Face
2617 can_events => 0,
2618 face => $item->{face},
2619 anim => $item->{anim},
2620 animspeed => $item->{animspeed},
2621 expand => 1,
2622 );
2623 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2624 }
2625
2626 $self->{max_pos} = (scalar @items) - 1;
2627
2628 my $range = $self->{range};
2629 my $page = $self->{h} / 32; # what information source to use for face size?
2630 # it should be configurable I guess...
2631 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2632 $range->update;
2633}
2634
2635sub size_request {
2636 my ($self) = @_;
2637 (100, 200)
2638}
2639
2640sub set_range {
2641 my ($self, $range) = @_;
2642
2643 $self->{range} = $range;
2644 $range->connect (changed => sub { $self->update });
2645
2646 my $page = $self->{h} / 32; # waht information souce to use for face size?
2647 # it should be configurable i guess...
2648
2649 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2650 $range->update;
2651
2652 $self->update;
2653}
2654
2655sub _draw {
2656 my ($self) = @_;
2657
2658 my ($w, $h) = ($self->{w}, $self->{h});
2659
2660 $self->{pos} = int $self->{range}{range}[0];
2661
2662 my $y = 0;
2663 my $cnt = 0;
2664 my $hrem = $self->{h}; # horiz. remaining space
2665
2666 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2667 my $chld = $self->{children}->[$i];
2668
2669 if ($hrem >= $chld->{h}) {
2670 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2671
2672 $chld->draw;
2673
2674 $hrem -= $chld->{h};
2675 $y += $chld->{h};
2676 } else {
2677 last
2678 }
2679 }
2680}
2681
2682
2683#############################################################################
2684
2502package CFClient::UI; 2685package CFClient::UI;
2503 2686
2504$ROOT = new CFClient::UI::Root; 2687$ROOT = new CFClient::UI::Root;
2505$TOOLTIP = new CFClient::UI::Tooltip; 2688$TOOLTIP = new CFClient::UI::Tooltip;
2506 2689

Diff Legend

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