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.434 by root, Wed Aug 22 21:32:09 2007 UTC vs.
Revision 1.442 by root, Mon Oct 8 17:01:03 2007 UTC

… …
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 32
33 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
34 34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 36 $TOOLTIP->show;
41 } 37 }
42 38
43 return; 39 return;
… …
273 $self->emit ("destroy"); 269 $self->emit ("destroy");
274 %$self = (); 270 %$self = ();
275} 271}
276 272
277sub TO_JSON { 273sub TO_JSON {
278 { __w_ => $_[0]{s_id} } 274 { "\fw" => $_[0]{s_id} }
279} 275}
280 276
281sub show { 277sub show {
282 my ($self) = @_; 278 my ($self) = @_;
283 279
… …
362 358
363 $self->{force_w} = $w; 359 $self->{force_w} = $w;
364 $self->{force_h} = $h; 360 $self->{force_h} = $h;
365 361
366 $self->realloc; 362 $self->realloc;
363}
364
365# traverse the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return $self->{parent}->get_max_wh
370 if $self->{parent};
371
372 ($::WIDTH, $::HEIGHT)
367} 373}
368 374
369sub size_request { 375sub size_request {
370 require Carp; 376 require Carp;
371 Carp::confess "size_request is abstract"; 377 Carp::confess "size_request is abstract";
… …
821 827
822 1 828 1
823} 829}
824 830
825############################################################################# 831#############################################################################
826
827# back-buffered drawing area 832# back-buffered drawing area
828 833
829package CFPlus::UI::Window; 834package CFPlus::UI::Window;
830 835
831our @ISA = CFPlus::UI::Bin::; 836our @ISA = CFPlus::UI::Bin::;
… …
1380 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1385 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1381} 1386}
1382 1387
1383sub border { 1388sub border {
1384 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1390}
1391
1392sub get_max_wh {
1393 my ($self) = @_;
1394
1395 return ($self->{w}, $self->{h})
1396 if $self->{visible} && $self->{w};
1397
1398 $self->SUPER::get_max_wh
1385} 1399}
1386 1400
1387sub size_request { 1401sub size_request {
1388 my ($self) = @_; 1402 my ($self) = @_;
1389 1403
… …
1946 1960
1947sub size_request { 1961sub size_request {
1948 my ($self) = @_; 1962 my ($self) = @_;
1949 1963
1950 $self->{size_req} ||= do { 1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1951 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1952 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1953 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
1954 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1955 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1956 1972
1957 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
… …
2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 2253 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2238 } 2254 }
2239 2255
2240 glColor_premultiply @{$self->{active_fg}}; 2256 glColor_premultiply @{$self->{active_fg}};
2241 glBegin GL_LINES; 2257 glBegin GL_LINES;
2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2258 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2244 glEnd; 2260 glEnd;
2245 2261
2246 glLineWidth 3; 2262 glLineWidth 3;
2247 glColor @{$self->{active_outline}}; 2263 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1; 2264 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2249 glLineWidth 1; 2265 glLineWidth 1;
2250 2266
2251 } else { 2267 } else {
2252 glColor @{$self->{outline}}; 2268 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP; 2269 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5; 2270 glVertex .5, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3; 2271 glVertex .5, $self->{h} - 2.5;
2257 glVertex $self->{w} - 1, $self->{h} - 3; 2272 glVertex $self->{w} - .5, $self->{h} - 2.5;
2258 glVertex $self->{w} - 1, $self->{h} * .5; 2273 glVertex $self->{w} - .5, $self->{h} * .5;
2259 glEnd; 2274 glEnd;
2260 } 2275 }
2261} 2276}
2262 2277
2263############################################################################# 2278#############################################################################
… …
2512sub _draw { 2527sub _draw {
2513 my ($self) = @_; 2528 my ($self) = @_;
2514 2529
2515 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
2516 2531
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2518 2533
2519 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
2520 2535
2521 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2536 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2522 2537
… …
2841 2856
2842 glEnable GL_BLEND; 2857 glEnable GL_BLEND;
2843 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2858 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2844 2859
2845 if ($self->{value} >= 0) { 2860 if ($self->{value} >= 0) {
2846 my $s = 3 + ($self->{w} - 6) * $self->{value}; 2861 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2847 2862
2848 glColor_premultiply @{$self->{bar}}; 2863 glColor_premultiply @{$self->{bar}};
2849 glRect 2, 2, $s, $self->{h} - 2; 2864 glRect 2, 2, $s, $self->{h} - 2;
2850 glColor_premultiply @{$self->{bg}}; 2865 glColor_premultiply @{$self->{bg}};
2851 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2; 2866 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2852 } 2867 }
2853 2868
2854 glColor_premultiply @{$self->{outline}}; 2869 glColor_premultiply @{$self->{outline}};
2855 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2; 2870 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2856 2871
2857 glDisable GL_BLEND; 2872 glDisable GL_BLEND;
2858 2873
2859 { 2874 {
2860 local $self->{bg}; # do not draw background 2875 local $self->{bg}; # do not draw background
… …
2873 2888
2874 my $self = $class->SUPER::new ( 2889 my $self = $class->SUPER::new (
2875 tooltip => sub { 2890 tooltip => sub {
2876 my ($self) = @_; 2891 my ($self) = @_;
2877 2892
2878 sprintf "%s points experience (level %d).\n%s points to next level %s.", 2893 sprintf "level %d\n%s points\n%s next level\n%s to go",
2879 ::formsep $self->{exp},
2880 $self->{lvl}, 2894 $self->{lvl},
2895 ::formsep ($self->{exp}),
2881 ::formsep $self->{nxt} 2896 ::formsep ($self->{nxt}),
2897 ::formsep ($self->{nxt} - $self->{exp}),
2882 }, 2898 },
2883 %arg 2899 %arg
2884 ); 2900 );
2885 2901
2886 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) } 2902 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
… …
2899} 2915}
2900 2916
2901sub set_value { 2917sub set_value {
2902 my ($self, $lvl, $exp) = @_; 2918 my ($self, $lvl, $exp) = @_;
2903 2919
2904 $self->{lvl} = $exp; 2920 $self->{lvl} = $lvl;
2905 $self->{exp} = $exp; 2921 $self->{exp} = $exp;
2906 2922
2907 my $v = -1; 2923 my $v = -1;
2908 2924
2909 if ($::CONN && (my $table = $::CONN->{exp_table})) { 2925 if ($::CONN && (my $table = $::CONN->{exp_table})) {
… …
3556} 3572}
3557 3573
3558sub set_tooltip_from { 3574sub set_tooltip_from {
3559 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
3560 3576
3561 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3562 if $widget->{tooltip} =~ /^#(.*)$/;
3563
3564 my $tooltip = $widget->{tooltip}; 3577 my $tip = $widget->{tooltip};
3578 $tip = $tip->($widget) if "CODE" eq ref $tip;
3579
3580 $tip = CFPlus::Pod::section_label tooltip => $1
3581 if $tip =~ /^#(.*)$/;
3565 3582
3566 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
3567 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
3568 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3569 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
3570 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
3571 } 3588 }
3572 3589
3573 $tooltip =~ s/^\n+//; 3590 $tip =~ s/^\n+//;
3574 $tooltip =~ s/\n+$//; 3591 $tip =~ s/\n+$//;
3575 3592
3576 $self->add (new CFPlus::UI::Label 3593 $self->add (new CFPlus::UI::Label
3577 markup => $tooltip, 3594 markup => $tip,
3578 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3579 fontsize => 0.8, 3596 fontsize => 0.8,
3580 style => 1, # FLAG_INVERSE 3597 style => 1, # FLAG_INVERSE
3581 ellipsise => 0, 3598 ellipsise => 0,
3582 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3620} 3637}
3621 3638
3622sub _draw { 3639sub _draw {
3623 my ($self) = @_; 3640 my ($self) = @_;
3624 3641
3625 glTranslate 0.375, 0.375;
3626
3627 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
3628 3643
3629 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
3630 glRect 0, 0, $w, $h; 3645 glRect 0, 0, $w, $h;
3631 3646
3632 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
3633 glRect_lineloop 0, 0, $w, $h; 3648 glRect_lineloop .5, .5, $w + .5, $h + .5;
3634 3649
3635 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
3636 3651
3637 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
3638} 3653}
3639 3654
3640############################################################################# 3655#############################################################################
… …
3967 my $class = shift; 3982 my $class = shift;
3968 3983
3969 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3970 buttonbar => (new CFPlus::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3971 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3972 active_outline => [1, 1, 0], 3987 active_outline => [.7, .7, 0.2],
3973 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3974 @_, 3989 @_,
3975 ); 3990 );
3976 3991
3977 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
4058 4073
4059 $self->SUPER::_draw (); 4074 $self->SUPER::_draw ();
4060 4075
4061 if (my $cur = $self->{multiplexer}{current}) { 4076 if (my $cur = $self->{multiplexer}{current}) {
4062 if ($cur = $cur->{c_tab_}) { 4077 if ($cur = $cur->{c_tab_}) {
4063 glTranslate $cur->{x}, $cur->{y}; 4078 glTranslate $self->{buttonbar}{x} + $cur->{x},
4079 $self->{buttonbar}{y} + $cur->{y};
4064 glLineWidth 3; 4080 glLineWidth 3;
4081 #glEnable GL_BLEND;
4082 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4065 glColor @{$self->{active_outline}}; 4083 glColor @{$self->{active_outline}};
4066 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2; 4084 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4067 glLineWidth 1; 4085 glLineWidth 1;
4086 #glDisable GL_BLEND;
4068 } 4087 }
4069 } 4088 }
4070} 4089}
4071 4090
4072############################################################################# 4091#############################################################################
… …
4106} 4125}
4107 4126
4108sub _set_value { 4127sub _set_value {
4109 my ($self, $value) = @_; 4128 my ($self, $value) = @_;
4110 4129
4111 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4130 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4131 $item ||= $self->{options}[0]
4112 or return; 4132 or return;
4113 4133
4114 $self->{value} = $item->[0]; 4134 $self->{value} = $item->[0];
4115 $self->set_markup ("$item->[1] ⇓"); 4135 $self->set_markup ("$item->[1] ⇓");
4116 $self->set_tooltip ($item->[2]); 4136# $self->set_tooltip ($item->[2]);
4117} 4137}
4118 4138
4119sub set_value { 4139sub set_value {
4120 my ($self, $value) = @_; 4140 my ($self, $value) = @_;
4121 4141
4122 return unless $self->{value} ne $value; 4142 return unless $self->{value} ne $value;
4123 4143
4124 $self->_set_value ($value); 4144 $self->_set_value ($value);
4125 $self->emit (changed => $value); 4145 $self->emit (changed => $value);
4146}
4147
4148sub set_options {
4149 my ($self, $options) = @_;
4150
4151 $self->{options} = $options;
4152 $self->_set_value ($self->{value});
4126} 4153}
4127 4154
4128############################################################################# 4155#############################################################################
4129 4156
4130package CFPlus::UI::Statusbox; 4157package CFPlus::UI::Statusbox;

Diff Legend

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