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.275 by root, Sat Jun 3 22:50:48 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

… …
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388
389 $self->realloc;
388} 390}
389 391
390sub set_tooltip { 392sub set_tooltip {
391 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
392 394
… …
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 552
551 glPushMatrix; 553 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 555
556 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 558 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 560 glBegin GL_QUADS;
563 glVertex $x , $y; 561 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
567 glEnd; 565 glEnd;
568 glDisable GL_BLEND; 566 glDisable GL_BLEND;
569 } 567 }
570 568
571 if ($ENV{CFPLUS_DEBUG} & 1) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 570 glPushMatrix;
573 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 574 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
580 glEnd; 578 glEnd;
581 glPopMatrix; 579 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
584} 585}
585 586
586sub _draw { 587sub _draw {
587 my ($self) = @_; 588 my ($self) = @_;
588 589
… …
626 627
627 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
629 630
630 glEnable GL_BLEND; 631 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 633 glColor_premultiply @$color;
633 634
634 glBegin GL_QUADS; 635 glBegin GL_QUADS;
635 glVertex 0 , 0; 636 glVertex 0 , 0;
636 glVertex 0 , $h; 637 glVertex 0 , $h;
637 glVertex $w, $h; 638 glVertex $w, $h;
… …
856 my $tex = $self->{texture} 857 my $tex = $self->{texture}
857 or return; 858 or return;
858 859
859 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
862 863
863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864 865
865 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
866} 867}
… …
1035 1036
1036 if ($self->{bg}) { 1037 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
1038 1039
1039 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
1042 1043
1043 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1044 glVertex 0 , 0; 1045 glVertex 0 , 0;
1045 glVertex 0 , $h; 1046 glVertex 0 , $h;
1046 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1160 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1161 1162
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1167 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1168 };
1168 1169
1169 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1175 1176
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1178
1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1182 };
1180 } else { 1183 } else {
1181 return 0; 1184 return 0;
1182 } 1185 }
1183 1186
… …
1634 }; 1637 };
1635 1638
1636 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1638 1641
1642 glColor_premultiply @{$self->{fg}}
1639 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1640 glColor @{$self->{fg}}; 1644
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 }
1645 1646
1646 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1647} 1648}
1648 1649
1649############################################################################# 1650#############################################################################
… …
1676 1677
1677 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1678 1679
1679 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1680 1681
1681 delete $self->{texture};
1682
1683 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 1683 $self->{text} = $text;
1685 1684
1686 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1688 1687
1689 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1690} 1690}
1691 1691
1692sub set_text { 1692sub set_text {
1693 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1694 1694
… …
1783 my ($self) = @_; 1783 my ($self) = @_;
1784 1784
1785 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1786 1786
1787 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1788 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1789 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1790 } else { 1790 } else {
1791 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1792 } 1792 }
1793 1793
1794 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1795 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1796 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1797 glVertex 0 , 0; 1797 glVertex 0 , 0;
1798 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1799 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1800 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1910} 1910}
1911 1911
1912sub _draw { 1912sub _draw {
1913 my ($self) = @_; 1913 my ($self) = @_;
1914 1914
1915 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1916
1917 if ($GRAB == $self) {
1918 $self->{fg} = $self->{active_fg};
1919 }
1920 1916
1921 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1923 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1924 1920
… …
2149 2145
2150 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2151 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2152 2148
2153 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2154 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2155 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157 2154
2158 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2159 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2571 2568
2572 delete $self->{texture}; 2569 delete $self->{texture};
2573 } 2570 }
2574 2571
2575 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2576 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2577 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2578 2575
2579 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2580 2577
2581 my $y0 = $top; 2578 my $y0 = $top;
… …
2616sub _draw { 2613sub _draw {
2617 my ($self) = @_; 2614 my ($self) = @_;
2618 2615
2619 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2621 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2622 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2623 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2624 2621
2625 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2626 2623
2627} 2624}
… …
2854 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2855 2852
2856 if ($tex) { 2853 if ($tex) {
2857 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2859 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2860 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2861 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2862 } 2859 }
2863} 2860}
2864 2861
… …
3072our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::VBox::;
3073 3070
3074sub new { 3071sub new {
3075 my $class = shift; 3072 my $class = shift;
3076 3073
3077 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3078 fontsize => 0.8, 3075 fontsize => 0.8,
3079 @_, 3076 @_,
3080 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
3081} 3087}
3082 3088
3083sub reorder { 3089sub reorder {
3084 my ($self) = @_; 3090 my ($self) = @_;
3085 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
3086 3092
3087 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
3088 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3089 } 3095 }
3090 3096
… …
3092 3098
3093 my @items = sort { 3099 my @items = sort {
3094 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
3095 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
3096 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
3097 3105
3098 my $count = 10 + 1; 3106 my $count = 10 + 1;
3099 for my $item (@items) { 3107 for my $item (@items) {
3100 last unless --$count; 3108 last unless --$count;
3101 3109
… …
3116 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
3117 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
3118 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
3119 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
3120 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
3121 can_events => 1, 3130 can_events => 1,
3122 can_hover => 1 3131 can_hover => 1
3123 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
3124 } 3143 }
3125 3144
3126 $self->clear; 3145 $self->clear;
3127 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
3128} 3147}
… …
3133 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
3134 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
3135 3154
3136 return unless $text; 3155 return unless $text;
3137 3156
3138 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3139 3158
3140 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3141 3160
3142 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
3143 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
3173 3192
3174 $self->reorder; 3193 $self->reorder;
3175 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
3176} 3195}
3177 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
3178############################################################################# 3205#############################################################################
3179 3206
3180package CFClient::UI::Inventory; 3207package CFClient::UI::Inventory;
3181 3208
3182our @ISA = CFClient::UI::ScrolledWindow::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
… …
3474 3501
3475package CFClient::UI::Root; 3502package CFClient::UI::Root;
3476 3503
3477our @ISA = CFClient::UI::Container::; 3504our @ISA = CFClient::UI::Container::;
3478 3505
3506use List::Util qw(min max);
3507
3479use CFClient::OpenGL; 3508use CFClient::OpenGL;
3480 3509
3481sub new { 3510sub new {
3482 my $class = shift; 3511 my $class = shift;
3483 3512
… …
3617 3646
3618 delete $queue{$widget+0}; 3647 delete $queue{$widget+0};
3619 3648
3620 my ($w, $h) = $widget->size_request; 3649 my ($w, $h) = $widget->size_request;
3621 3650
3622 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3623 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3624 3656
3625 $w = $widget->{force_w} if exists $widget->{force_w}; 3657 $w = $widget->{force_w} if exists $widget->{force_w};
3626 $h = $widget->{force_h} if exists $widget->{force_h}; 3658 $h = $widget->{force_h} if exists $widget->{force_h};
3627 3659
3628 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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