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.465 by root, Thu Aug 28 00:53:53 2008 UTC vs.
Revision 1.477 by root, Sun Jan 11 23:50:27 2009 UTC

… …
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7
8use Guard ();
7 9
8use DC; 10use DC;
9use DC::Pod; 11use DC::Pod;
10use DC::Texture; 12use DC::Texture;
11 13
… …
189# call when resolution changes etc. 191# call when resolution changes etc.
190sub rescale_widgets { 192sub rescale_widgets {
191 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
192 194
193 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
194 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
195 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
196 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
197 199
198 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
286sub set_visible { 288sub set_visible {
287 my ($self) = @_; 289 my ($self) = @_;
288 290
289 return if $self->{visible}; 291 return if $self->{visible};
290 292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
295
291 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
292 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
293 298
294 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
295 300
296 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
297 302
298 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
299} 304}
300 305
301sub set_invisible { 306sub set_invisible {
302 my ($self) = @_; 307 my ($self) = @_;
303 308
… …
527sub connect { 532sub connect {
528 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
529 534
530 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
531 536
532 defined wantarray and DC::guard { 537 defined wantarray and Guard::guard {
533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
534 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
535 } 540 }
536} 541}
537 542
… …
649 $class->SUPER::new ( 654 $class->SUPER::new (
650 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
651 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
652 @_ 657 @_
653 ) 658 )
659}
660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
654} 666}
655 667
656sub _draw { 668sub _draw {
657 my ($self) = @_; 669 my ($self) = @_;
658 670
… …
1256 fontsize => ($arg{border} || 0.8) * 0.75; 1268 fontsize => ($arg{border} || 0.8) * 0.75;
1257 } 1269 }
1258 1270
1259 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
1260 # label => "", 1272 # label => "",
1261 fg => [0.6, 0.3, 0.1], 1273 fg => undef,
1262 border => 0.8, 1274 border => 0.8,
1263 style => 'single', 1275 style => 'single',
1264 %arg, 1276 %arg,
1265 ); 1277 );
1266 1278
… …
1319 my $border = $self->border; 1331 my $border = $self->border;
1320 my ($w, $h) = ($self->{w}, $self->{h}); 1332 my ($w, $h) = ($self->{w}, $self->{h});
1321 1333
1322 $child->draw; 1334 $child->draw;
1323 1335
1324 glColor @{$self->{fg}}; 1336 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1325 glBegin GL_LINE_STRIP; 1337 glBegin GL_LINE_STRIP;
1326 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1338 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1327 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1339 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1329 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1344our @ISA = DC::UI::Bin::; 1356our @ISA = DC::UI::Bin::;
1345 1357
1346use DC::OpenGL; 1358use DC::OpenGL;
1347 1359
1348my $bg = 1360my $bg =
1349 new_from_file DC::Texture DC::find_rcfile "d1_bg.png", 1361 new_from_resource DC::Texture "d1_bg.png",
1350 mipmap => 1, wrap => 1; 1362 mipmap => 1, wrap => 1;
1351 1363
1352my @border = 1364my @border =
1353 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 1365 map { new_from_resource DC::Texture $_, mipmap => 1 }
1354 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1366 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1355 1367
1356my @icon = 1368my @icon =
1357 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 1369 map { new_from_resource DC::Texture $_, mipmap => 1 }
1358 qw(x1_move.png x1_resize.png); 1370 qw(x1_move.png x1_resize.png);
1359 1371
1360sub new { 1372sub new {
1361 my ($class, %arg) = @_; 1373 my ($class, %arg) = @_;
1362 1374
1363 my $self = $class->SUPER::new ( 1375 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1], 1376 bg => [1, 1, 1, 1],
1365 border_bg => [1, 1, 1, 1], 1377 border_bg => [1, 1, 1, 1],
1366 border => 0.6, 1378 border => 0.8,
1367 can_events => 1, 1379 can_events => 1,
1368 min_w => 64, 1380 min_w => 64,
1369 min_h => 32, 1381 min_h => 32,
1370 %arg, 1382 %arg,
1371 ); 1383 );
… …
1540 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1542 1554
1543 my $border = $self->border; 1555 my $border = $self->border;
1544 1556
1557 if ($border) {
1545 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1549 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1562 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1550 1563
1551 # move 1564 # move
1552 my $w2 = ($w - $border) * .5; 1565 my $w2 = ($w - $border) * .5;
1553 my $h2 = ($h - $border) * .5; 1566 my $h2 = ($h - $border) * .5;
1554 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1567 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1557 1570
1558 # resize 1571 # resize
1559 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1572 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1573 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1561 unless $self->{has_close_button}; 1574 unless $self->{has_close_button};
1562 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1577 }
1564 1578
1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1566 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1567 1581
1568 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
2090 my $class = shift; 2104 my $class = shift;
2091 2105
2092 $class->SUPER::new ( 2106 $class->SUPER::new (
2093 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
2094 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1], 2109 outline => undef,
2096 active_bg => [0, 0, 1, .2], 2110 active_bg => [0, 0, 1, .2],
2097 active_fg => [1, 1, 1], 2111 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0], 2112 active_outline => [1, 1, 0],
2099 can_hover => 1, 2113 can_hover => 1,
2100 can_focus => 1, 2114 can_focus => 1,
… …
2273 glColor @{$self->{active_outline}}; 2287 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; 2288 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1; 2289 glLineWidth 1;
2276 2290
2277 } else { 2291 } else {
2278 glColor @{$self->{outline}}; 2292 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2279 glBegin GL_LINE_STRIP; 2293 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5; 2294 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5; 2295 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5; 2296 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5; 2297 glVertex $self->{w} - .5, $self->{h} * .5;
… …
2405our @ISA = DC::UI::Bin::; 2419our @ISA = DC::UI::Bin::;
2406 2420
2407use DC::OpenGL; 2421use DC::OpenGL;
2408 2422
2409my @tex = 2423my @tex =
2410 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2424 map { new_from_resource DC::Texture $_, mipmap => 1 }
2411 qw(b1_button_inactive.png b1_button_active.png); 2425 qw(b1_button_inactive.png b1_button_active.png);
2412 2426
2413sub new { 2427sub new {
2414 my $class = shift; 2428 my $class = shift;
2415 2429
… …
2454our @ISA = DC::UI::Label::; 2468our @ISA = DC::UI::Label::;
2455 2469
2456use DC::OpenGL; 2470use DC::OpenGL;
2457 2471
2458my @tex = 2472my @tex =
2459 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2460 qw(b1_button_inactive.png b1_button_active.png); 2474 qw(b1_button_inactive.png b1_button_active.png);
2461 2475
2462sub new { 2476sub new {
2463 my $class = shift; 2477 my $class = shift;
2464 2478
… …
2507package DC::UI::CheckBox; 2521package DC::UI::CheckBox;
2508 2522
2509our @ISA = DC::UI::DrawBG::; 2523our @ISA = DC::UI::DrawBG::;
2510 2524
2511my @tex = 2525my @tex =
2512 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2513 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2514 2528
2515use DC::OpenGL; 2529use DC::OpenGL;
2516 2530
2517sub new { 2531sub new {
2518 my $class = shift; 2532 my $class = shift;
2519 2533
2520 $class->SUPER::new ( 2534 $class->SUPER::new (
2535 fontsize => 1,
2521 padding_x => 2, 2536 padding_x => 2,
2522 padding_y => 2, 2537 padding_y => 2,
2523 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2524 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2525 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2531} 2546}
2532 2547
2533sub size_request { 2548sub size_request {
2534 my ($self) = @_; 2549 my ($self) = @_;
2535 2550
2536 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2537} 2552}
2538 2553
2539sub toggle { 2554sub toggle {
2540 my ($self) = @_; 2555 my ($self) = @_;
2541 2556
… …
2598 2613
2599 $self->{path} || $self->{tex} 2614 $self->{path} || $self->{tex}
2600 or Carp::croak "'path' or 'tex' attributes required"; 2615 or Carp::croak "'path' or 'tex' attributes required";
2601 2616
2602 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2603 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2604 2619
2605 DC::weaken $texture_cache{$self->{path}}; 2620 DC::weaken $texture_cache{$self->{path}};
2606 2621
2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2608 2623
… …
2704 2719
2705use DC::OpenGL; 2720use DC::OpenGL;
2706 2721
2707my %tex = ( 2722my %tex = (
2708 food => [ 2723 food => [
2709 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2724 map { new_from_resource DC::Texture $_, mipmap => 1 }
2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2725 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2711 ], 2726 ],
2712 grace => [ 2727 grace => [
2713 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2728 map { new_from_resource DC::Texture $_, mipmap => 1 }
2714 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2729 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2715 ], 2730 ],
2716 hp => [ 2731 hp => [
2717 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2732 map { new_from_resource DC::Texture $_, mipmap => 1 }
2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2733 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2719 ], 2734 ],
2720 mana => [ 2735 mana => [
2721 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2736 map { new_from_resource DC::Texture $_, mipmap => 1 }
2722 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2737 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2723 ], 2738 ],
2724); 2739);
2725 2740
2726# eg. VGauge->new (gauge => 'food'), default gauge: food 2741# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2839 2854
2840sub new { 2855sub new {
2841 my ($class, %arg) = @_; 2856 my ($class, %arg) = @_;
2842 2857
2843 my $self = $class->SUPER::new ( 2858 my $self = $class->SUPER::new (
2859 padding_x => 2,
2860 padding_y => 2,
2844 fg => [1, 1, 1], 2861 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2], 2862 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8], 2863 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0], 2864 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9, 2865 fontsize => 0.9,
… …
2888 my ($self) = @_; 2905 my ($self) = @_;
2889 2906
2890 glEnable GL_BLEND; 2907 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2908 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892 2909
2910 my $px = $self->{padding_x};
2911 my $py = $self->{padding_y};
2912
2893 if ($self->{value} >= 0) { 2913 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value}; 2914 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2895 2915
2896 glColor_premultiply @{$self->{bar}}; 2916 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2; 2917 glRect $px, $py, $s, $self->{h} - $py;
2898 glColor_premultiply @{$self->{bg}}; 2918 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2; 2919 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2900 } 2920 }
2901 2921
2902 glColor_premultiply @{$self->{outline}}; 2922 glColor_premultiply @{$self->{outline}};
2923
2924 $px -= .5;
2925 $py -= .5;
2926
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; 2927 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2904 2928
2905 glDisable GL_BLEND; 2929 glDisable GL_BLEND;
2906 2930
2907 { 2931 {
2908 local $self->{bg}; # do not draw background 2932 local $self->{bg}; # do not draw background
… …
2917our @ISA = DC::UI::Progress::; 2941our @ISA = DC::UI::Progress::;
2918 2942
2919sub new { 2943sub new {
2920 my ($class, %arg) = @_; 2944 my ($class, %arg) = @_;
2921 2945
2946 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2947
2922 my $self = $class->SUPER::new ( 2948 my $self = $class->SUPER::new (
2949 %arg,
2923 tooltip => sub { 2950 tooltip => sub {
2924 my ($self) = @_; 2951 my ($self) = @_;
2925 2952
2926 sprintf "level %d\n%s points\n%s next level\n%s to go", 2953 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2954 $tt,
2927 $self->{lvl}, 2955 $self->{lvl},
2928 ::formsep ($self->{exp}), 2956 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}), 2957 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}), 2958 ::formsep ($self->{nxt} - $self->{exp}),
2959 $self->_percent * 100,
2931 }, 2960 },
2932 %arg
2933 ); 2961 );
2934 2962
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) } 2963 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN; 2964 if $::CONN;
2937 2965
… …
2945 if $::CONN; 2973 if $::CONN;
2946 2974
2947 $self->SUPER::DESTROY; 2975 $self->SUPER::DESTROY;
2948} 2976}
2949 2977
2978sub _percent {
2979 my ($self) = @_;
2980
2981 my $table = $::CONN && $::CONN->{exp_table}
2982 or return -1;
2983
2984 my $l0 = $table->[$self->{lvl} - 1];
2985 my $l1 = $table->[$self->{lvl}];
2986
2987 $self->{nxt} = $l1;
2988
2989 ($self->{exp} - $l0) / ($l1 - $l0)
2990}
2991
2950sub set_value { 2992sub set_value {
2951 my ($self, $lvl, $exp) = @_; 2993 my ($self, $lvl, $exp) = @_;
2952 2994
2953 $self->{lvl} = $lvl; 2995 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp; 2996 $self->{exp} = $exp;
2955 2997
2956 my $v = -1;
2957
2958 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2959 my $l0 = $table->[$lvl - 1];
2960 my $l1 = $table->[$lvl];
2961
2962 $self->{nxt} = $l1;
2963
2964 $v = ($exp - $l0) / ($l1 - $l0);
2965 }
2966
2967 $self->SUPER::set_value ($v); 2998 $self->SUPER::set_value ($self->_percent);
2968} 2999}
2969 3000
2970############################################################################# 3001#############################################################################
2971 3002
2972package DC::UI::Gauge; 3003package DC::UI::Gauge;
… …
3023use DC::OpenGL; 3054use DC::OpenGL;
3024 3055
3025our @ISA = DC::UI::DrawBG::; 3056our @ISA = DC::UI::DrawBG::;
3026 3057
3027my @tex = 3058my @tex =
3028 map { new_from_file DC::Texture DC::find_rcfile $_ } 3059 map { new_from_resource DC::Texture $_ }
3029 qw(s1_slider.png s1_slider_bg.png); 3060 qw(s1_slider.png s1_slider_bg.png);
3030 3061
3031sub new { 3062sub new {
3032 my $class = shift; 3063 my $class = shift;
3033 3064
… …
3620 3651
3621 $tip =~ s/^\n+//; 3652 $tip =~ s/^\n+//;
3622 $tip =~ s/\n+$//; 3653 $tip =~ s/\n+$//;
3623 3654
3624 $self->add (new DC::UI::Label 3655 $self->add (new DC::UI::Label
3656 fg => $DC::THEME{tooltip_fg},
3625 markup => $tip, 3657 markup => $tip,
3626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3658 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3627 align => 0, 3659 align => 0,
3628 fontsize => 0.8, 3660 fontsize => 0.8,
3629 style => 1, # FLAG_INVERSE 3661 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3630 ellipsise => 0, 3662 ellipsise => 0,
3631 font => ($widget->{tooltip_font} || $::FONT_PROP), 3663 font => ($widget->{tooltip_font} || $::FONT_PROP),
3632 ); 3664 );
3633} 3665}
3634 3666
… …
3671sub _draw { 3703sub _draw {
3672 my ($self) = @_; 3704 my ($self) = @_;
3673 3705
3674 my ($w, $h) = @$self{qw(w h)}; 3706 my ($w, $h) = @$self{qw(w h)};
3675 3707
3676 glColor 1, 0.8, 0.4; 3708 glColor @{ $DC::THEME{tooltip_bg} };
3677 glRect 0, 0, $w, $h; 3709 glRect 0, 0, $w, $h;
3678 3710
3679 glColor 0, 0, 0; 3711 glColor @{ $DC::THEME{tooltip_border} };
3680 glRect_lineloop .5, .5, $w + .5, $h + .5; 3712 glRect_lineloop .5, .5, $w + .5, $h + .5;
3681 3713
3682 glTranslate 2, 2; 3714 glTranslate 2, 2;
3683 3715
3684 $self->SUPER::_draw; 3716 $self->SUPER::_draw;
… …
3701 aspect => 1, 3733 aspect => 1,
3702 can_events => 0, 3734 can_events => 0,
3703 @_, 3735 @_,
3704 ); 3736 );
3705 3737
3706 if ($self->{anim} && $self->{animspeed}) {
3707 DC::weaken (my $widget = $self);
3708
3709 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3710 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3711 return unless $::CONN;
3712
3713 my $w = $widget
3714 or return;
3715
3716 ++$w->{frame};
3717 $w->update_face;
3718
3719 # somehow, $widget can go away
3720 $w->update;
3721 $w->update_timer;
3722 };
3723
3724 $self->update_face;
3725 $self->update_timer; 3738 $self->update_anim;
3726 }
3727 3739
3728 $self 3740 $self
3729} 3741}
3730 3742
3731sub update_timer { 3743sub update_timer {
… …
3754 $tex->upload (sub { $self->reconfigure }); 3766 $tex->upload (sub { $self->reconfigure });
3755 } 3767 }
3756 } 3768 }
3757 } 3769 }
3758 } 3770 }
3771 }
3772}
3773
3774sub update_anim {
3775 my ($self) = @_;
3776
3777 if ($self->{anim} && $self->{animspeed}) {
3778 DC::weaken (my $widget = $self);
3779
3780 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3781 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3782 return unless $::CONN;
3783
3784 my $w = $widget
3785 or return;
3786
3787 ++$w->{frame};
3788 $w->update_face;
3789
3790 # somehow, $widget can go away
3791 $w->update;
3792 $w->update_timer;
3793 };
3794
3795 $self->update_face;
3796 $self->update_timer;
3797 } else {
3798 delete $self->{timer};
3759 } 3799 }
3760} 3800}
3761 3801
3762sub size_request { 3802sub size_request {
3763 my ($self) = @_; 3803 my ($self) = @_;
… …
3785 return unless $self->{visible}; 3825 return unless $self->{visible};
3786 3826
3787 $self->SUPER::update; 3827 $self->SUPER::update;
3788} 3828}
3789 3829
3830sub set_face {
3831 my ($self, $face) = @_;
3832
3833 $self->{face} = $face;
3834 $self->reconfigure;
3835}
3836
3837sub set_anim {
3838 my ($self, $anim) = @_;
3839
3840 $self->{anim} = $anim;
3841 $self->update_anim;
3842}
3843
3844sub set_animspeed {
3845 my ($self, $animspeed) = @_;
3846
3847 $self->{animspeed} = $animspeed;
3848 $self->update_anim;
3849}
3850
3790sub invoke_visibility_change { 3851sub invoke_visibility_change {
3791 my ($self) = @_; 3852 my ($self) = @_;
3792 3853
3793 $self->update_timer; 3854 $self->update_timer;
3794 3855
… …
3890 # maybe save $GRAB? must be careful about events... 3951 # maybe save $GRAB? must be careful about events...
3891 $GRAB = $self; 3952 $GRAB = $self;
3892 $self->{button} = $ev->{button}; 3953 $self->{button} = $ev->{button};
3893 3954
3894 $self->show; 3955 $self->show;
3895 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3956
3957 my $x = $ev->{x};
3958 my $y = $ev->{y};
3959
3960 $self->{root}->on_post_alloc ($self => sub {
3961 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3962 });
3963
3964 1 # so it can be used inside event handlers
3896} 3965}
3897 3966
3898sub invoke_mouse_motion { 3967sub invoke_mouse_motion {
3899 my ($self, $ev, $x, $y) = @_; 3968 my ($self, $ev, $x, $y) = @_;
3900 3969
… …
3932 4001
3933 my $self = $class->SUPER::new ( 4002 my $self = $class->SUPER::new (
3934 @_, 4003 @_,
3935 ); 4004 );
3936 4005
3937 $self->{current} = $self->{children}[0] 4006 $self->set_current_page (0);
3938 if @{ $self->{children} };
3939 4007
3940 $self 4008 $self
3941} 4009}
3942 4010
3943sub add { 4011sub add {
3944 my ($self, @widgets) = @_; 4012 my ($self, @widgets) = @_;
3945 4013
3946 $self->SUPER::add (@widgets); 4014 $self->SUPER::add (@widgets);
3947 4015
3948 $self->{current} = $self->{children}[0] 4016 $self->set_current_page (0)
3949 if @{ $self->{children} }; 4017 if @widgets == @{ $self->{children} };
3950} 4018}
3951 4019
3952sub get_current_page { 4020sub get_current_page {
3953 my ($self) = @_; 4021 my ($self) = @_;
3954 4022
… …
3960 4028
3961 my $widget = ref $page_or_widget 4029 my $widget = ref $page_or_widget
3962 ? $page_or_widget 4030 ? $page_or_widget
3963 : $self->{children}[$page_or_widget]; 4031 : $self->{children}[$page_or_widget];
3964 4032
4033 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4034
3965 $self->{current} = $widget; 4035 if (($self->{current} = $widget)) {
4036 $self->{current}->set_visible if $self->{current} && $self->{visible};
3966 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4037 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3967 4038
3968 $self->emit (page_changed => $self->{current}); 4039 $self->emit (page_changed => $self->{current});
4040 }
3969 4041
3970 $self->realloc; 4042 $self->realloc;
3971} 4043}
3972 4044
3973sub visible_children { 4045sub visible_children {
3974 $_[0]{current} 4046 $_[0]{current} || ()
3975} 4047}
3976 4048
3977sub size_request { 4049sub size_request {
3978 my ($self) = @_; 4050 my ($self) = @_;
3979 4051
4052 $self->{current}
3980 $self->{current}->size_request 4053 ? $self->{current}->size_request
4054 : (0, 0)
3981} 4055}
3982 4056
3983sub invoke_size_allocate { 4057sub invoke_size_allocate {
3984 my ($self, $w, $h) = @_; 4058 my ($self, $w, $h) = @_;
3985 4059
3986 $self->{current}->configure (0, 0, $w, $h); 4060 $self->{current}->configure (0, 0, $w, $h)
4061 if $self->{current};
3987 4062
3988 1 4063 1
3989} 4064}
3990 4065
3991sub _draw { 4066sub _draw {
3992 my ($self) = @_; 4067 my ($self) = @_;
3993 4068
3994 $self->{current}->draw; 4069 $self->{current}->draw
4070 if $self->{current};
3995} 4071}
3996 4072
3997############################################################################# 4073#############################################################################
3998 4074
3999package DC::UI::Notebook; 4075package DC::UI::Notebook;
… …
4209 $self 4285 $self
4210} 4286}
4211 4287
4212sub reorder { 4288sub reorder {
4213 my ($self) = @_; 4289 my ($self) = @_;
4214 my $NOW = Time::HiRes::time; 4290 my $NOW = EV::time;
4215 4291
4216 # freeze display when hovering over any label 4292 # freeze display when hovering over any label
4217 return if $DC::UI::TOOLTIP->{owner} 4293 return if $DC::UI::TOOLTIP->{owner}
4218 && grep $DC::UI::TOOLTIP->{owner} == $_->{label}, 4294 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4219 values %{ $self->{item} }; 4295 values %{ $self->{item} };
… …
4269 $label->{fg}[3] = $item->{fg}[3] || 1; 4345 $label->{fg}[3] = $item->{fg}[3] || 1;
4270 } 4346 }
4271 4347
4272 push @widgets, $label; 4348 push @widgets, $label;
4273 } 4349 }
4350
4351 my $hash = join ",", @widgets;
4352 return if $hash eq $self->{last_widget_hash};
4353 $self->{last_widget_hash} = $hash;
4274 4354
4275 $self->clear; 4355 $self->clear;
4276 $self->SUPER::add (reverse @widgets); 4356 $self->SUPER::add (reverse @widgets);
4277} 4357}
4278 4358
… …
4583 4663
4584$ROOT = new DC::UI::Root; 4664$ROOT = new DC::UI::Root;
4585$TOOLTIP = new DC::UI::Tooltip z => 900; 4665$TOOLTIP = new DC::UI::Tooltip z => 900;
4586 4666
45871 46671
4588

Diff Legend

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