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.414 by root, Mon Jul 23 17:54:14 2007 UTC vs.
Revision 1.422 by root, Thu Aug 2 14:35:21 2007 UTC

… …
273 $self->emit ("destroy"); 273 $self->emit ("destroy");
274 %$self = (); 274 %$self = ();
275} 275}
276 276
277sub TO_JSON { 277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 278 { __w_ => $_[0]{s_id} }
279} 279}
280 280
281sub show { 281sub show {
282 my ($self) = @_; 282 my ($self) = @_;
283 283
… …
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 );
… …
1923 1923
1924 delete $self->{ox}; 1924 delete $self->{ox};
1925 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1926} 1926}
1927 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1928sub set_text { 1934sub set_text {
1929 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1930 1936
1931 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1932 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2074 my $class = shift; 2080 my $class = shift;
2075 2081
2076 $class->SUPER::new ( 2082 $class->SUPER::new (
2077 fg => [1, 1, 1], 2083 fg => [1, 1, 1],
2078 bg => [0, 0, 0, 0.2], 2084 bg => [0, 0, 0, 0.2],
2085 outline => [0.6, 0.3, 0.1],
2079 active_bg => [1, 1, 1, 0.5], 2086 active_bg => [0, 0, 1, .2],
2080 active_fg => [0, 0, 0], 2087 active_fg => [1, 1, 1],
2088 active_outline => [1, 1, 0],
2081 can_hover => 1, 2089 can_hover => 1,
2082 can_focus => 1, 2090 can_focus => 1,
2083 valign => 0, 2091 valign => 0,
2084 can_events => 1, 2092 can_events => 1,
2085 ellipsise => 0, 2093 ellipsise => 0,
… …
2242 2250
2243 unless (exists $self->{cur_h}) { 2251 unless (exists $self->{cur_h}) {
2244 my $text = substr $self->{text}, 0, $self->{cursor}; 2252 my $text = substr $self->{text}, 0, $self->{cursor};
2245 utf8::encode $text; 2253 utf8::encode $text;
2246 2254
2247 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2255 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2248 } 2256 }
2249 2257
2258 glColor_premultiply @{$self->{active_fg}};
2250 glBegin GL_LINES; 2259 glBegin GL_LINES;
2251 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2252 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2262 glEnd;
2263
2264 glLineWidth 3;
2265 glColor @{$self->{active_outline}};
2266 glBegin GL_LINE_LOOP;
2267 glVertex 0, 0;
2268 glVertex $self->{w} - 1, 0;
2269 glVertex $self->{w} - 1, $self->{h} - 1;
2270 glVertex 0, $self->{h} - 1;
2271 glEnd;
2272 glLineWidth 1;
2273
2274 } else {
2275 glColor @{$self->{outline}};
2276 glTranslate .375, .375;
2277 glBegin GL_LINE_STRIP;
2278 glVertex 0, $self->{h} * .5;
2279 glVertex 0, $self->{h} - 3;
2280 glVertex $self->{w} - 1, $self->{h} - 3;
2281 glVertex $self->{w} - 1, $self->{h} * .5;
2253 glEnd; 2282 glEnd;
2254 } 2283 }
2255} 2284}
2256 2285
2257############################################################################# 2286#############################################################################
… …
2344 1 2373 1
2345} 2374}
2346 2375
2347############################################################################# 2376#############################################################################
2348 2377
2378package CFPlus::UI::ButtonBin;
2379
2380our @ISA = CFPlus::UI::Bin::;
2381
2382use CFPlus::OpenGL;
2383
2384my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_inactive.png b1_button_active.png);
2387
2388sub new {
2389 my $class = shift;
2390
2391 $class->SUPER::new (
2392 can_hover => 1,
2393 align => 0,
2394 valign => 0,
2395 can_events => 1,
2396 @_
2397 )
2398}
2399
2400sub invoke_button_up {
2401 my ($self, $ev, $x, $y) = @_;
2402
2403 $self->emit ("activate")
2404 if $x >= 0 && $x < $self->{w}
2405 && $y >= 0 && $y < $self->{h};
2406
2407 1
2408}
2409
2410sub _draw {
2411 my ($self) = @_;
2412
2413 glEnable GL_TEXTURE_2D;
2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2415 glColor 0, 0, 0, 1;
2416
2417 my $tex = $tex[$GRAB == $self];
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419
2420 glDisable GL_TEXTURE_2D;
2421
2422 $self->SUPER::_draw;
2423}
2424
2425#############################################################################
2426
2349package CFPlus::UI::Button; 2427package CFPlus::UI::Button;
2350 2428
2351our @ISA = CFPlus::UI::Label::; 2429our @ISA = CFPlus::UI::Label::;
2352 2430
2353use CFPlus::OpenGL; 2431use CFPlus::OpenGL;
… …
2487sub new { 2565sub new {
2488 my $class = shift; 2566 my $class = shift;
2489 2567
2490 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2491 can_events => 0, 2569 can_events => 0,
2570 scale => 1,
2492 @_, 2571 @_,
2493 ); 2572 );
2494 2573
2495 $self->{path} || $self->{tex} 2574 $self->{path} || $self->{tex}
2496 or Carp::croak "'path' or 'tex' attributes required"; 2575 or Carp::croak "'path' or 'tex' attributes required";
… …
2521} 2600}
2522 2601
2523sub size_request { 2602sub size_request {
2524 my ($self) = @_; 2603 my ($self) = @_;
2525 2604
2526 ($self->{tex}{w}, $self->{tex}{h}) 2605 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2527} 2606}
2528 2607
2529sub _draw { 2608sub _draw {
2530 my ($self) = @_; 2609 my ($self) = @_;
2531 2610
… …
2541 } 2620 }
2542 2621
2543 glEnable GL_TEXTURE_2D; 2622 glEnable GL_TEXTURE_2D;
2544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2545 2624
2546 $tex->draw_quad (0, 0, $w, $h); 2625 $tex->draw_quad_alpha (0, 0, $w, $h);
2547 2626
2548 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2549} 2628}
2550 2629
2551############################################################################# 2630#############################################################################
… …
3425 glTranslate 0.375, 0.375; 3504 glTranslate 0.375, 0.375;
3426 3505
3427 my ($w, $h) = @$self{qw(w h)}; 3506 my ($w, $h) = @$self{qw(w h)};
3428 3507
3429 glColor 1, 0.8, 0.4; 3508 glColor 1, 0.8, 0.4;
3430 glBegin GL_QUADS; 3509 glRect 0, 0, $w, $h;
3431 glVertex 0 , 0;
3432 glVertex 0 , $h;
3433 glVertex $w, $h;
3434 glVertex $w, 0;
3435 glEnd;
3436 3510
3437 glColor 0, 0, 0; 3511 glColor 0, 0, 0;
3438 glBegin GL_LINE_LOOP; 3512 glBegin GL_LINE_LOOP;
3439 glVertex 0 , 0; 3513 glVertex 0 , 0;
3440 glVertex 0 , $h; 3514 glVertex 0 , $h;
… …
3622 children => [ 3696 children => [
3623 (new CFPlus::UI::Label markup => $left, expand => 1), 3697 (new CFPlus::UI::Label markup => $left, expand => 1),
3624 (new CFPlus::UI::Label markup => $right, align => +1), 3698 (new CFPlus::UI::Label markup => $right, align => +1),
3625 ], 3699 ],
3626 ; 3700 ;
3627 3701
3628 } else { 3702 } else {
3629 $widget = new CFPlus::UI::Label 3703 $widget = new CFPlus::UI::Label
3630 can_hover => 1, 3704 can_hover => 1,
3631 can_events => 1, 3705 can_events => 1,
3632 markup => $widget, 3706 markup => $widget,
… …
3768 buttonbar => (new CFPlus::UI::Buttonbar), 3842 buttonbar => (new CFPlus::UI::Buttonbar),
3769 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3843 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3770 # filter => # will be put between multiplexer and $self 3844 # filter => # will be put between multiplexer and $self
3771 @_, 3845 @_,
3772 ); 3846 );
3773 3847
3774 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3848 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3775 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3849 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3776 3850
3777 { 3851 {
3778 Scalar::Util::weaken (my $wself = $self); 3852 Scalar::Util::weaken (my $wself = $self);
… …
3819 3893
3820sub remove { 3894sub remove {
3821 my ($self, @widgets) = @_; 3895 my ($self, @widgets) = @_;
3822 3896
3823 $self->{multiplexer}->remove (@widgets) 3897 $self->{multiplexer}->remove (@widgets)
3898}
3899
3900sub pages {
3901 my ($self) = @_;
3902 $self->{multiplexer}->children
3824} 3903}
3825 3904
3826sub add_tab { 3905sub add_tab {
3827 my ($self, $title, $widget, $tooltip) = @_; 3906 my ($self, $title, $widget, $tooltip) = @_;
3828 3907

Diff Legend

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