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.433 by root, Wed Aug 22 21:27:13 2007 UTC vs.
Revision 1.452 by root, Wed Dec 26 20:09:38 2007 UTC

… …
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use CFPlus;
10use CFPlus::Pod; 9use CFPlus::Pod;
11use CFPlus::Texture; 10use CFPlus::Texture;
12 11
… …
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
… …
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
… …
142 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 140 $grab->update if $grab;
144 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
145 142
146 check_hover $widget; 143 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
148 } 145 }
149} 146}
150 147
151sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
152 my ($ev) = @_; 149 my ($ev) = @_;
… …
273 $self->emit ("destroy"); 270 $self->emit ("destroy");
274 %$self = (); 271 %$self = ();
275} 272}
276 273
277sub TO_JSON { 274sub TO_JSON {
278 { __w_ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
279} 276}
280 277
281sub show { 278sub show {
282 my ($self) = @_; 279 my ($self) = @_;
283 280
… …
312 delete $self->{root}; 309 delete $self->{root};
313 310
314 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
316 313
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $CFPlus::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
319 316
320 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
322} 319}
… …
341sub hide { 338sub hide {
342 my ($self) = @_; 339 my ($self) = @_;
343 340
344 $self->set_invisible; 341 $self->set_invisible;
345 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 346 $parent->remove ($self);
347 if $self->{parent}; 347 }
348} 348}
349 349
350sub move_abs { 350sub move_abs {
351 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
352 352
… …
362 362
363 $self->{force_w} = $w; 363 $self->{force_w} = $w;
364 $self->{force_h} = $h; 364 $self->{force_h} = $h;
365 365
366 $self->realloc; 366 $self->realloc;
367}
368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 return $self->{parent}->get_max_wh
374 if $self->{parent};
375
376 ($::WIDTH, $::HEIGHT)
367} 377}
368 378
369sub size_request { 379sub size_request {
370 require Carp; 380 require Carp;
371 Carp::confess "size_request is abstract"; 381 Carp::confess "size_request is abstract";
… …
433 443
434 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
435 445
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 446 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 447 delete $CFPlus::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 448 $CFPlus::UI::TOOLTIP_WATCHER->invoke;
439 } 449 }
440} 450}
441 451
442# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
443sub coord2local { 453sub coord2local {
444 my ($self, $x, $y) = @_; 454 my ($self, $x, $y) = @_;
445 455
446 Carp::confess unless $self->{parent};#d# 456 return (undef, undef) unless $self->{parent};
447 457
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 458 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 459}
450 460
451# translate local coordinates to global coordinate system 461# translate local coordinates to global coordinate system
452sub coord2global { 462sub coord2global {
453 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
454 464
455 Carp::confess unless $self->{parent};#d# 465 return (undef, undef) unless $self->{parent};
456 466
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 467 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 468}
459 469
460sub invoke_focus_in { 470sub invoke_focus_in {
… …
821 831
822 1 832 1
823} 833}
824 834
825############################################################################# 835#############################################################################
826
827# back-buffered drawing area 836# back-buffered drawing area
828 837
829package CFPlus::UI::Window; 838package CFPlus::UI::Window;
830 839
831our @ISA = CFPlus::UI::Bin::; 840our @ISA = CFPlus::UI::Bin::;
… …
1380 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1389 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1381} 1390}
1382 1391
1383sub border { 1392sub border {
1384 int $_[0]{border} * $::FONTSIZE 1393 int $_[0]{border} * $::FONTSIZE
1394}
1395
1396sub get_max_wh {
1397 my ($self) = @_;
1398
1399 return ($self->{w}, $self->{h})
1400 if $self->{visible} && $self->{w};
1401
1402 $self->SUPER::get_max_wh
1385} 1403}
1386 1404
1387sub size_request { 1405sub size_request {
1388 my ($self) = @_; 1406 my ($self) = @_;
1389 1407
… …
1946 1964
1947sub size_request { 1965sub size_request {
1948 my ($self) = @_; 1966 my ($self) = @_;
1949 1967
1950 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1951 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1952 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1953 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1954 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1955 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1956 1976
1957 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
… …
2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2238 } 2258 }
2239 2259
2240 glColor_premultiply @{$self->{active_fg}}; 2260 glColor_premultiply @{$self->{active_fg}};
2241 glBegin GL_LINES; 2261 glBegin GL_LINES;
2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 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}; 2263 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2244 glEnd; 2264 glEnd;
2245 2265
2246 glLineWidth 3; 2266 glLineWidth 3;
2247 glColor @{$self->{active_outline}}; 2267 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1; 2268 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2249 glLineWidth 1; 2269 glLineWidth 1;
2250 2270
2251 } else { 2271 } else {
2252 glColor @{$self->{outline}}; 2272 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP; 2273 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5; 2274 glVertex .5, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3; 2275 glVertex .5, $self->{h} - 2.5;
2257 glVertex $self->{w} - 1, $self->{h} - 3; 2276 glVertex $self->{w} - .5, $self->{h} - 2.5;
2258 glVertex $self->{w} - 1, $self->{h} * .5; 2277 glVertex $self->{w} - .5, $self->{h} * .5;
2259 glEnd; 2278 glEnd;
2260 } 2279 }
2261} 2280}
2262 2281
2263############################################################################# 2282#############################################################################
… …
2512sub _draw { 2531sub _draw {
2513 my ($self) = @_; 2532 my ($self) = @_;
2514 2533
2515 $self->SUPER::_draw; 2534 $self->SUPER::_draw;
2516 2535
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2536 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2518 2537
2519 my ($w, $h) = @$self{qw(w h)}; 2538 my ($w, $h) = @$self{qw(w h)};
2520 2539
2521 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2540 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2522 2541
… …
2841 2860
2842 glEnable GL_BLEND; 2861 glEnable GL_BLEND;
2843 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2844 2863
2845 if ($self->{value} >= 0) { 2864 if ($self->{value} >= 0) {
2846 my $s = 3 + ($self->{w} - 6) * $self->{value}; 2865 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2847 2866
2848 glColor_premultiply @{$self->{bar}}; 2867 glColor_premultiply @{$self->{bar}};
2849 glRect 2, 2, $s, $self->{h} - 2; 2868 glRect 2, 2, $s, $self->{h} - 2;
2850 glColor_premultiply @{$self->{bg}}; 2869 glColor_premultiply @{$self->{bg}};
2851 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2; 2870 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2852 } 2871 }
2853 2872
2854 glColor_premultiply @{$self->{outline}}; 2873 glColor_premultiply @{$self->{outline}};
2855 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2; 2874 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2856 2875
2857 glDisable GL_BLEND; 2876 glDisable GL_BLEND;
2858 2877
2859 { 2878 {
2860 local $self->{bg}; # do not draw background 2879 local $self->{bg}; # do not draw background
… …
2870 2889
2871sub new { 2890sub new {
2872 my ($class, %arg) = @_; 2891 my ($class, %arg) = @_;
2873 2892
2874 my $self = $class->SUPER::new ( 2893 my $self = $class->SUPER::new (
2894 tooltip => sub {
2895 my ($self) = @_;
2896
2897 sprintf "level %d\n%s points\n%s next level\n%s to go",
2898 $self->{lvl},
2899 ::formsep ($self->{exp}),
2900 ::formsep ($self->{nxt}),
2901 ::formsep ($self->{nxt} - $self->{exp}),
2902 },
2875 %arg 2903 %arg
2876 ); 2904 );
2877 2905
2878 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) } 2906 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2879 if $::CONN; 2907 if $::CONN;
… …
2890 $self->SUPER::DESTROY; 2918 $self->SUPER::DESTROY;
2891} 2919}
2892 2920
2893sub set_value { 2921sub set_value {
2894 my ($self, $lvl, $exp) = @_; 2922 my ($self, $lvl, $exp) = @_;
2923
2924 $self->{lvl} = $lvl;
2925 $self->{exp} = $exp;
2895 2926
2896 my $v = -1; 2927 my $v = -1;
2897 2928
2898 if ($::CONN && (my $table = $::CONN->{exp_table})) { 2929 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2899 my $l0 = $table->[$lvl - 1]; 2930 my $l0 = $table->[$lvl - 1];
2900 my $l1 = $table->[$lvl]; 2931 my $l1 = $table->[$lvl];
2932
2933 $self->{nxt} = $l1;
2901 2934
2902 $v = ($exp - $l0) / ($l1 - $l0); 2935 $v = ($exp - $l0) / ($l1 - $l0);
2903 } 2936 }
2904 2937
2905 $self->SUPER::set_value ($v); 2938 $self->SUPER::set_value ($v);
… …
3543} 3576}
3544 3577
3545sub set_tooltip_from { 3578sub set_tooltip_from {
3546 my ($self, $widget) = @_; 3579 my ($self, $widget) = @_;
3547 3580
3548 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3549 if $widget->{tooltip} =~ /^#(.*)$/;
3550
3551 my $tooltip = $widget->{tooltip}; 3581 my $tip = $widget->{tooltip};
3582 $tip = $tip->($widget) if "CODE" eq ref $tip;
3583
3584 $tip = CFPlus::Pod::section_label tooltip => $1
3585 if $tip =~ /^#(.*)$/;
3552 3586
3553 if ($ENV{CFPLUS_DEBUG} & 2) { 3587 if ($ENV{CFPLUS_DEBUG} & 2) {
3554 $tooltip .= "\n\n" . (ref $widget) . "\n" 3588 $tip .= "\n\n" . (ref $widget) . "\n"
3555 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3589 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3556 . "req $widget->{req_w} $widget->{req_h}\n" 3590 . "req $widget->{req_w} $widget->{req_h}\n"
3557 . "visible $widget->{visible}"; 3591 . "visible $widget->{visible}";
3558 } 3592 }
3559 3593
3560 $tooltip =~ s/^\n+//; 3594 $tip =~ s/^\n+//;
3561 $tooltip =~ s/\n+$//; 3595 $tip =~ s/\n+$//;
3562 3596
3563 $self->add (new CFPlus::UI::Label 3597 $self->add (new CFPlus::UI::Label
3564 markup => $tooltip, 3598 markup => $tip,
3565 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3566 fontsize => 0.8, 3600 fontsize => 0.8,
3567 style => 1, # FLAG_INVERSE 3601 style => 1, # FLAG_INVERSE
3568 ellipsise => 0, 3602 ellipsise => 0,
3569 font => ($widget->{tooltip_font} || $::FONT_PROP), 3603 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3607} 3641}
3608 3642
3609sub _draw { 3643sub _draw {
3610 my ($self) = @_; 3644 my ($self) = @_;
3611 3645
3612 glTranslate 0.375, 0.375;
3613
3614 my ($w, $h) = @$self{qw(w h)}; 3646 my ($w, $h) = @$self{qw(w h)};
3615 3647
3616 glColor 1, 0.8, 0.4; 3648 glColor 1, 0.8, 0.4;
3617 glRect 0, 0, $w, $h; 3649 glRect 0, 0, $w, $h;
3618 3650
3619 glColor 0, 0, 0; 3651 glColor 0, 0, 0;
3620 glRect_lineloop 0, 0, $w, $h; 3652 glRect_lineloop .5, .5, $w + .5, $h + .5;
3621 3653
3622 glTranslate 2 - 0.375, 2 - 0.375; 3654 glTranslate 2, 2;
3623 3655
3624 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
3625} 3657}
3626 3658
3627############################################################################# 3659#############################################################################
… …
3644 ); 3676 );
3645 3677
3646 if ($self->{anim} && $self->{animspeed}) { 3678 if ($self->{anim} && $self->{animspeed}) {
3647 CFPlus::weaken (my $widget = $self); 3679 CFPlus::weaken (my $widget = $self);
3648 3680
3649 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3681 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3650 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3682 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3651 $self->{timer} = Event->timer (
3652 parked => 1,
3653 cb => sub {
3654 return unless $::CONN; 3683 return unless $::CONN;
3655 3684
3656 my $w = $widget 3685 my $w = $widget
3657 or return; 3686 or return;
3658 3687
3659 ++$w->{frame}; 3688 ++$w->{frame};
3660 $w->update_face; 3689 $w->update_face;
3661 3690
3662 # somehow, $widget can go away 3691 # somehow, $widget can go away
3663 $w->update; 3692 $w->update;
3664 $w->update_timer; 3693 $w->update_timer;
3665 },
3666 ); 3694 };
3667 3695
3668 $self->update_face; 3696 $self->update_face;
3669 $self->update_timer; 3697 $self->update_timer;
3670 } 3698 }
3671 3699
… …
3676 my ($self) = @_; 3704 my ($self) = @_;
3677 3705
3678 return unless $self->{timer}; 3706 return unless $self->{timer};
3679 3707
3680 if ($self->{visible}) { 3708 if ($self->{visible}) {
3681 $self->{timer}->at (
3682 $self->{anim_start}
3683 + $self->{animspeed}
3684 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3685 );
3686 $self->{timer}->start; 3709 $self->{timer}->start;
3687 } else { 3710 } else {
3688 $self->{timer}->stop; 3711 $self->{timer}->stop;
3689 } 3712 }
3690} 3713}
… …
3954 my $class = shift; 3977 my $class = shift;
3955 3978
3956 my $self = $class->SUPER::new ( 3979 my $self = $class->SUPER::new (
3957 buttonbar => (new CFPlus::UI::Buttonbar), 3980 buttonbar => (new CFPlus::UI::Buttonbar),
3958 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3981 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3959 active_outline => [1, 1, 0], 3982 active_outline => [.7, .7, 0.2],
3960 # filter => # will be put between multiplexer and $self 3983 # filter => # will be put between multiplexer and $self
3961 @_, 3984 @_,
3962 ); 3985 );
3963 3986
3964 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3987 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
4045 4068
4046 $self->SUPER::_draw (); 4069 $self->SUPER::_draw ();
4047 4070
4048 if (my $cur = $self->{multiplexer}{current}) { 4071 if (my $cur = $self->{multiplexer}{current}) {
4049 if ($cur = $cur->{c_tab_}) { 4072 if ($cur = $cur->{c_tab_}) {
4050 glTranslate $cur->{x}, $cur->{y}; 4073 glTranslate $self->{buttonbar}{x} + $cur->{x},
4074 $self->{buttonbar}{y} + $cur->{y};
4051 glLineWidth 3; 4075 glLineWidth 3;
4076 #glEnable GL_BLEND;
4077 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4052 glColor @{$self->{active_outline}}; 4078 glColor @{$self->{active_outline}};
4053 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2; 4079 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4054 glLineWidth 1; 4080 glLineWidth 1;
4081 #glDisable GL_BLEND;
4055 } 4082 }
4056 } 4083 }
4057} 4084}
4058 4085
4059############################################################################# 4086#############################################################################
… …
4093} 4120}
4094 4121
4095sub _set_value { 4122sub _set_value {
4096 my ($self, $value) = @_; 4123 my ($self, $value) = @_;
4097 4124
4098 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4125 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4126 $item ||= $self->{options}[0]
4099 or return; 4127 or return;
4100 4128
4101 $self->{value} = $item->[0]; 4129 $self->{value} = $item->[0];
4102 $self->set_markup ("$item->[1] ⇓"); 4130 $self->set_markup ("$item->[1] ⇓");
4103 $self->set_tooltip ($item->[2]); 4131# $self->set_tooltip ($item->[2]);
4104} 4132}
4105 4133
4106sub set_value { 4134sub set_value {
4107 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
4108 4136
4109 return unless $self->{value} ne $value; 4137 return unless $self->{value} ne $value;
4110 4138
4111 $self->_set_value ($value); 4139 $self->_set_value ($value);
4112 $self->emit (changed => $value); 4140 $self->emit (changed => $value);
4141}
4142
4143sub set_options {
4144 my ($self, $options) = @_;
4145
4146 $self->{options} = $options;
4147 $self->_set_value ($self->{value});
4113} 4148}
4114 4149
4115############################################################################# 4150#############################################################################
4116 4151
4117package CFPlus::UI::Statusbox; 4152package CFPlus::UI::Statusbox;
… …
4126 @_, 4161 @_,
4127 ); 4162 );
4128 4163
4129 CFPlus::weaken (my $this = $self); 4164 CFPlus::weaken (my $this = $self);
4130 4165
4131 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4166 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4132 4167
4133 $self 4168 $self
4134} 4169}
4135 4170
4136sub reorder { 4171sub reorder {
… …
4144 4179
4145 while (my ($k, $v) = each %{ $self->{item} }) { 4180 while (my ($k, $v) = each %{ $self->{item} }) {
4146 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4181 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4147 } 4182 }
4148 4183
4184 $self->{timer}->set (1, 1);
4185
4149 my @widgets; 4186 my @widgets;
4150 4187
4151 my @items = sort { 4188 my @items = sort {
4152 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
4153 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
4154 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
4155
4156 $self->{timer}->interval (1);
4157 4192
4158 my $count = 10 + 1; 4193 my $count = 10 + 1;
4159 for my $item (@items) { 4194 for my $item (@items) {
4160 last unless --$count; 4195 last unless --$count;
4161 4196
… …
4185 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4186 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4187 $label->update; 4222 $label->update;
4188 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
4189 if $diff < 1; 4224 if $diff < 1;
4190 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
4191 } else { 4226 } else {
4192 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
4193 } 4228 }
4194 4229
4195 push @widgets, $label; 4230 push @widgets, $label;
… …
4331} 4366}
4332 4367
4333sub update { 4368sub update {
4334 my ($self) = @_; 4369 my ($self) = @_;
4335 4370
4336 $::WANT_REFRESH->start; 4371 $::WANT_REFRESH = 1;
4337} 4372}
4338 4373
4339sub add { 4374sub add {
4340 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
4341 4376

Diff Legend

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