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.417 by root, Tue Jul 24 18:24:04 2007 UTC vs.
Revision 1.421 by root, Wed Aug 1 14:27:21 2007 UTC

… …
1027 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1028 1028
1029 my $self; 1029 my $self;
1030 1030
1031 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 col => 0, 1032 c_col => 0,
1033 row => 1, 1033 c_row => 1,
1034 vertical => 0, 1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub { 1036 on_changed => sub {
1037 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 }, 1039 },
1040 ; 1040 ;
1041 1041
1042 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1043 col => 1, 1043 c_col => 1,
1044 row => 0, 1044 c_row => 0,
1045 vertical => 1, 1045 vertical => 1,
1046 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1047 on_changed => sub { 1047 on_changed => sub {
1048 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1060 row_expand => [1, 0], 1060 row_expand => [1, 0],
1061 %arg, 1061 %arg,
1062 ); 1062 );
1063 1063
1064 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0, 1065 c_col => 0,
1066 row => 0, 1066 c_row => 0,
1067 expand => 1, 1067 expand => 1,
1068 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub { 1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1598 1598
1599sub add { 1599sub add {
1600 my ($self, @widgets) = @_; 1600 my ($self, @widgets) = @_;
1601 1601
1602 for my $child (@widgets) { 1602 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1; 1603 $child->{c_rowspan} ||= 1;
1604 $child->{colspan} ||= 1; 1604 $child->{c_colspan} ||= 1;
1605 } 1605 }
1606 1606
1607 $self->SUPER::add (@widgets); 1607 $self->SUPER::add (@widgets);
1608} 1608}
1609 1609
… …
1613 my @widgets; 1613 my @widgets;
1614 1614
1615 while (@_) { 1615 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1617 1617
1618 $child->{row} = $row; 1618 $child->{c_row} = $row;
1619 $child->{col} = $col; 1619 $child->{c_col} = $col;
1620 1620
1621 push @widgets, $child; 1621 push @widgets, $child;
1622 } 1622 }
1623 1623
1624 $self->add (@widgets); 1624 $self->add (@widgets);
… …
1630 my (@w, @h); 1630 my (@w, @h);
1631 1631
1632 my @children = $self->children; 1632 my @children = $self->children;
1633 1633
1634 # first pass, columns 1634 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637 1637
1638 my $sw = sum @w[$c .. $c + $cs - 1]; 1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639 1639
1640 if ($w > $sw) { 1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1642 }
1643 } 1643 }
1644 1644
1645 # second pass, rows 1645 # second pass, rows
1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1648 1648
1649 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1650 1650
1651 if ($h > $sh) { 1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1694 1694
1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1697 1697
1698 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1700 1700
1701 $widget->configure ( 1701 $widget->configure (
1702 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1704 ); 1704 );
… …
2074 my $class = shift; 2074 my $class = shift;
2075 2075
2076 $class->SUPER::new ( 2076 $class->SUPER::new (
2077 fg => [1, 1, 1], 2077 fg => [1, 1, 1],
2078 bg => [0, 0, 0, 0.2], 2078 bg => [0, 0, 0, 0.2],
2079 outline => [0.6, 0.3, 0.1],
2079 active_bg => [0, 0, 1, .2], 2080 active_bg => [0, 0, 1, .2],
2080 active_fg => [1, 1, 1], 2081 active_fg => [1, 1, 1],
2081 active_outline => [1, 1, 0], 2082 active_outline => [1, 1, 0],
2082 can_hover => 1, 2083 can_hover => 1,
2083 can_focus => 1, 2084 can_focus => 1,
… …
2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2255 glEnd; 2256 glEnd;
2256 2257
2257 glLineWidth 3; 2258 glLineWidth 3;
2258 glColor @{$self->{active_outline}}; 2259 glColor @{$self->{active_outline}};
2259 glTranslate -.375, -.375;
2260 glBegin GL_LINE_LOOP; 2260 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0; 2261 glVertex 0, 0;
2262 glVertex $self->{w}, 0; 2262 glVertex $self->{w} - 1, 0;
2263 glVertex $self->{w}, $self->{h}; 2263 glVertex $self->{w} - 1, $self->{h} - 1;
2264 glVertex 0, $self->{h}; 2264 glVertex 0, $self->{h} - 1;
2265 glEnd; 2265 glEnd;
2266 glLineWidth 1; 2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glTranslate .375, .375;
2271 glBegin GL_LINE_STRIP;
2272 glVertex 0, $self->{h} * .5;
2273 glVertex 0, $self->{h} - 3;
2274 glVertex $self->{w} - 1, $self->{h} - 3;
2275 glVertex $self->{w} - 1, $self->{h} * .5;
2276 glEnd;
2267 } 2277 }
2268} 2278}
2269 2279
2270############################################################################# 2280#############################################################################
2271 2281
… …
2357 1 2367 1
2358} 2368}
2359 2369
2360############################################################################# 2370#############################################################################
2361 2371
2372package CFPlus::UI::ButtonBin;
2373
2374our @ISA = CFPlus::UI::Bin::;
2375
2376use CFPlus::OpenGL;
2377
2378my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2380 qw(b1_button_inactive.png b1_button_active.png);
2381
2382sub new {
2383 my $class = shift;
2384
2385 $class->SUPER::new (
2386 can_hover => 1,
2387 align => 0,
2388 valign => 0,
2389 can_events => 1,
2390 @_
2391 )
2392}
2393
2394sub invoke_button_up {
2395 my ($self, $ev, $x, $y) = @_;
2396
2397 $self->emit ("activate")
2398 if $x >= 0 && $x < $self->{w}
2399 && $y >= 0 && $y < $self->{h};
2400
2401 1
2402}
2403
2404sub _draw {
2405 my ($self) = @_;
2406
2407 glEnable GL_TEXTURE_2D;
2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2409 glColor 0, 0, 0, 1;
2410
2411 my $tex = $tex[$GRAB == $self];
2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2413
2414 glDisable GL_TEXTURE_2D;
2415
2416 $self->SUPER::_draw;
2417}
2418
2419#############################################################################
2420
2362package CFPlus::UI::Button; 2421package CFPlus::UI::Button;
2363 2422
2364our @ISA = CFPlus::UI::Label::; 2423our @ISA = CFPlus::UI::Label::;
2365 2424
2366use CFPlus::OpenGL; 2425use CFPlus::OpenGL;
… …
2500sub new { 2559sub new {
2501 my $class = shift; 2560 my $class = shift;
2502 2561
2503 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2504 can_events => 0, 2563 can_events => 0,
2564 scale => 1,
2505 @_, 2565 @_,
2506 ); 2566 );
2507 2567
2508 $self->{path} || $self->{tex} 2568 $self->{path} || $self->{tex}
2509 or Carp::croak "'path' or 'tex' attributes required"; 2569 or Carp::croak "'path' or 'tex' attributes required";
… …
2534} 2594}
2535 2595
2536sub size_request { 2596sub size_request {
2537 my ($self) = @_; 2597 my ($self) = @_;
2538 2598
2539 ($self->{tex}{w}, $self->{tex}{h}) 2599 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2540} 2600}
2541 2601
2542sub _draw { 2602sub _draw {
2543 my ($self) = @_; 2603 my ($self) = @_;
2544 2604
… …
2554 } 2614 }
2555 2615
2556 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2557 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2558 2618
2559 $tex->draw_quad (0, 0, $w, $h); 2619 $tex->draw_quad_alpha (0, 0, $w, $h);
2560 2620
2561 glDisable GL_TEXTURE_2D; 2621 glDisable GL_TEXTURE_2D;
2562} 2622}
2563 2623
2564############################################################################# 2624#############################################################################
… …
3438 glTranslate 0.375, 0.375; 3498 glTranslate 0.375, 0.375;
3439 3499
3440 my ($w, $h) = @$self{qw(w h)}; 3500 my ($w, $h) = @$self{qw(w h)};
3441 3501
3442 glColor 1, 0.8, 0.4; 3502 glColor 1, 0.8, 0.4;
3443 glBegin GL_QUADS; 3503 glRect 0, 0, $w, $h;
3444 glVertex 0 , 0;
3445 glVertex 0 , $h;
3446 glVertex $w, $h;
3447 glVertex $w, 0;
3448 glEnd;
3449 3504
3450 glColor 0, 0, 0; 3505 glColor 0, 0, 0;
3451 glBegin GL_LINE_LOOP; 3506 glBegin GL_LINE_LOOP;
3452 glVertex 0 , 0; 3507 glVertex 0 , 0;
3453 glVertex 0 , $h; 3508 glVertex 0 , $h;
… …
3635 children => [ 3690 children => [
3636 (new CFPlus::UI::Label markup => $left, expand => 1), 3691 (new CFPlus::UI::Label markup => $left, expand => 1),
3637 (new CFPlus::UI::Label markup => $right, align => +1), 3692 (new CFPlus::UI::Label markup => $right, align => +1),
3638 ], 3693 ],
3639 ; 3694 ;
3640 3695
3641 } else { 3696 } else {
3642 $widget = new CFPlus::UI::Label 3697 $widget = new CFPlus::UI::Label
3643 can_hover => 1, 3698 can_hover => 1,
3644 can_events => 1, 3699 can_events => 1,
3645 markup => $widget, 3700 markup => $widget,

Diff Legend

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