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.413 by root, Mon Jul 23 15:30:45 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
… …
956 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
957 $self->update; 957 $self->update;
958 } 958 }
959} 959}
960 960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
977}
978
961# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
962sub coord2local { 980sub coord2local {
963 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
964 982
965 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 983 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1009 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1010 1028
1011 my $self; 1029 my $self;
1012 1030
1013 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1014 col => 0, 1032 c_col => 0,
1015 row => 1, 1033 c_row => 1,
1016 vertical => 0, 1034 vertical => 0,
1017 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1018 on_changed => sub { 1036 on_changed => sub {
1019 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1020 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1021 }, 1039 },
1022 ; 1040 ;
1023 1041
1024 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1025 col => 1, 1043 c_col => 1,
1026 row => 0, 1044 c_row => 0,
1027 vertical => 1, 1045 vertical => 1,
1028 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1029 on_changed => sub { 1047 on_changed => sub {
1030 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1031 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1042 row_expand => [1, 0], 1060 row_expand => [1, 0],
1043 %arg, 1061 %arg,
1044 ); 1062 );
1045 1063
1046 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1047 col => 0, 1065 c_col => 0,
1048 row => 0, 1066 c_row => 0,
1049 expand => 1, 1067 expand => 1,
1050 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1051 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1052 on_changed => sub { 1070 on_changed => sub {
1053 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1074sub add { 1092sub add {
1075 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1076 1094
1077 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1078} 1096}
1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1079 1101
1080sub update_slider { 1102sub update_slider {
1081 my ($self) = @_; 1103 my ($self) = @_;
1082 1104
1083 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
… …
1576 1598
1577sub add { 1599sub add {
1578 my ($self, @widgets) = @_; 1600 my ($self, @widgets) = @_;
1579 1601
1580 for my $child (@widgets) { 1602 for my $child (@widgets) {
1581 $child->{rowspan} ||= 1; 1603 $child->{c_rowspan} ||= 1;
1582 $child->{colspan} ||= 1; 1604 $child->{c_colspan} ||= 1;
1583 } 1605 }
1584 1606
1585 $self->SUPER::add (@widgets); 1607 $self->SUPER::add (@widgets);
1586} 1608}
1587 1609
… …
1591 my @widgets; 1613 my @widgets;
1592 1614
1593 while (@_) { 1615 while (@_) {
1594 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1595 1617
1596 $child->{row} = $row; 1618 $child->{c_row} = $row;
1597 $child->{col} = $col; 1619 $child->{c_col} = $col;
1598 1620
1599 push @widgets, $child; 1621 push @widgets, $child;
1600 } 1622 }
1601 1623
1602 $self->add (@widgets); 1624 $self->add (@widgets);
… …
1608 my (@w, @h); 1630 my (@w, @h);
1609 1631
1610 my @children = $self->children; 1632 my @children = $self->children;
1611 1633
1612 # first pass, columns 1634 # first pass, columns
1613 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1614 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1615 1637
1616 my $sw = sum @w[$c .. $c + $cs - 1]; 1638 my $sw = sum @w[$c .. $c + $cs - 1];
1617 1639
1618 if ($w > $sw) { 1640 if ($w > $sw) {
1619 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1620 } 1642 }
1621 } 1643 }
1622 1644
1623 # second pass, rows 1645 # second pass, rows
1624 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1625 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1626 1648
1627 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1628 1650
1629 if ($h > $sh) { 1651 if ($h > $sh) {
1630 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1672 1694
1673 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1674 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1675 1697
1676 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1677 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)};
1678 1700
1679 $widget->configure ( 1701 $widget->configure (
1680 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1681 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1682 ); 1704 );
… …
1901 1923
1902 delete $self->{ox}; 1924 delete $self->{ox};
1903 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1904} 1926}
1905 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1906sub set_text { 1934sub set_text {
1907 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1908 1936
1909 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1910 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2052 my $class = shift; 2080 my $class = shift;
2053 2081
2054 $class->SUPER::new ( 2082 $class->SUPER::new (
2055 fg => [1, 1, 1], 2083 fg => [1, 1, 1],
2056 bg => [0, 0, 0, 0.2], 2084 bg => [0, 0, 0, 0.2],
2085 outline => [0.6, 0.3, 0.1],
2057 active_bg => [1, 1, 1, 0.5], 2086 active_bg => [0, 0, 1, .2],
2058 active_fg => [0, 0, 0], 2087 active_fg => [1, 1, 1],
2088 active_outline => [1, 1, 0],
2059 can_hover => 1, 2089 can_hover => 1,
2060 can_focus => 1, 2090 can_focus => 1,
2061 valign => 0, 2091 valign => 0,
2062 can_events => 1, 2092 can_events => 1,
2063 ellipsise => 0, 2093 ellipsise => 0,
… …
2220 2250
2221 unless (exists $self->{cur_h}) { 2251 unless (exists $self->{cur_h}) {
2222 my $text = substr $self->{text}, 0, $self->{cursor}; 2252 my $text = substr $self->{text}, 0, $self->{cursor};
2223 utf8::encode $text; 2253 utf8::encode $text;
2224 2254
2225 @$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);
2226 } 2256 }
2227 2257
2258 glColor_premultiply @{$self->{active_fg}};
2228 glBegin GL_LINES; 2259 glBegin GL_LINES;
2229 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};
2230 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;
2231 glEnd; 2282 glEnd;
2232 } 2283 }
2233} 2284}
2234 2285
2235############################################################################# 2286#############################################################################
… …
2322 1 2373 1
2323} 2374}
2324 2375
2325############################################################################# 2376#############################################################################
2326 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
2327package CFPlus::UI::Button; 2427package CFPlus::UI::Button;
2328 2428
2329our @ISA = CFPlus::UI::Label::; 2429our @ISA = CFPlus::UI::Label::;
2330 2430
2331use CFPlus::OpenGL; 2431use CFPlus::OpenGL;
… …
2465sub new { 2565sub new {
2466 my $class = shift; 2566 my $class = shift;
2467 2567
2468 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2469 can_events => 0, 2569 can_events => 0,
2570 scale => 1,
2470 @_, 2571 @_,
2471 ); 2572 );
2472 2573
2473 $self->{path} || $self->{tex} 2574 $self->{path} || $self->{tex}
2474 or Carp::croak "'path' or 'tex' attributes required"; 2575 or Carp::croak "'path' or 'tex' attributes required";
… …
2499} 2600}
2500 2601
2501sub size_request { 2602sub size_request {
2502 my ($self) = @_; 2603 my ($self) = @_;
2503 2604
2504 ($self->{tex}{w}, $self->{tex}{h}) 2605 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2505} 2606}
2506 2607
2507sub _draw { 2608sub _draw {
2508 my ($self) = @_; 2609 my ($self) = @_;
2509 2610
… …
2519 } 2620 }
2520 2621
2521 glEnable GL_TEXTURE_2D; 2622 glEnable GL_TEXTURE_2D;
2522 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2523 2624
2524 $tex->draw_quad (0, 0, $w, $h); 2625 $tex->draw_quad_alpha (0, 0, $w, $h);
2525 2626
2526 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2527} 2628}
2528 2629
2529############################################################################# 2630#############################################################################
… …
3403 glTranslate 0.375, 0.375; 3504 glTranslate 0.375, 0.375;
3404 3505
3405 my ($w, $h) = @$self{qw(w h)}; 3506 my ($w, $h) = @$self{qw(w h)};
3406 3507
3407 glColor 1, 0.8, 0.4; 3508 glColor 1, 0.8, 0.4;
3408 glBegin GL_QUADS; 3509 glRect 0, 0, $w, $h;
3409 glVertex 0 , 0;
3410 glVertex 0 , $h;
3411 glVertex $w, $h;
3412 glVertex $w, 0;
3413 glEnd;
3414 3510
3415 glColor 0, 0, 0; 3511 glColor 0, 0, 0;
3416 glBegin GL_LINE_LOOP; 3512 glBegin GL_LINE_LOOP;
3417 glVertex 0 , 0; 3513 glVertex 0 , 0;
3418 glVertex 0 , $h; 3514 glVertex 0 , $h;
… …
3600 children => [ 3696 children => [
3601 (new CFPlus::UI::Label markup => $left, expand => 1), 3697 (new CFPlus::UI::Label markup => $left, expand => 1),
3602 (new CFPlus::UI::Label markup => $right, align => +1), 3698 (new CFPlus::UI::Label markup => $right, align => +1),
3603 ], 3699 ],
3604 ; 3700 ;
3605 3701
3606 } else { 3702 } else {
3607 $widget = new CFPlus::UI::Label 3703 $widget = new CFPlus::UI::Label
3608 can_hover => 1, 3704 can_hover => 1,
3609 can_events => 1, 3705 can_events => 1,
3610 markup => $widget, 3706 markup => $widget,
… …
3746 buttonbar => (new CFPlus::UI::Buttonbar), 3842 buttonbar => (new CFPlus::UI::Buttonbar),
3747 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3843 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3748 # filter => # will be put between multiplexer and $self 3844 # filter => # will be put between multiplexer and $self
3749 @_, 3845 @_,
3750 ); 3846 );
3751 3847
3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3848 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3849 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3754 3850
3755 { 3851 {
3756 Scalar::Util::weaken (my $wself = $self); 3852 Scalar::Util::weaken (my $wself = $self);
… …
3797 3893
3798sub remove { 3894sub remove {
3799 my ($self, @widgets) = @_; 3895 my ($self, @widgets) = @_;
3800 3896
3801 $self->{multiplexer}->remove (@widgets) 3897 $self->{multiplexer}->remove (@widgets)
3898}
3899
3900sub pages {
3901 my ($self) = @_;
3902 $self->{multiplexer}->children
3802} 3903}
3803 3904
3804sub add_tab { 3905sub add_tab {
3805 my ($self, $title, $widget, $tooltip) = @_; 3906 my ($self, $title, $widget, $tooltip) = @_;
3806 3907

Diff Legend

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