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.462 by root, Thu Mar 20 22:28:33 2008 UTC vs.
Revision 1.475 by root, Sun Jan 11 22:15:23 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
… …
1256 fontsize => ($arg{border} || 0.8) * 0.75; 1261 fontsize => ($arg{border} || 0.8) * 0.75;
1257 } 1262 }
1258 1263
1259 my $self = $class->SUPER::new ( 1264 my $self = $class->SUPER::new (
1260 # label => "", 1265 # label => "",
1261 fg => [0.6, 0.3, 0.1], 1266 fg => undef,
1262 border => 0.8, 1267 border => 0.8,
1263 style => 'single', 1268 style => 'single',
1264 %arg, 1269 %arg,
1265 ); 1270 );
1266 1271
… …
1319 my $border = $self->border; 1324 my $border = $self->border;
1320 my ($w, $h) = ($self->{w}, $self->{h}); 1325 my ($w, $h) = ($self->{w}, $self->{h});
1321 1326
1322 $child->draw; 1327 $child->draw;
1323 1328
1324 glColor @{$self->{fg}}; 1329 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1325 glBegin GL_LINE_STRIP; 1330 glBegin GL_LINE_STRIP;
1326 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1331 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1327 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1332 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1333 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; 1334 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1344our @ISA = DC::UI::Bin::; 1349our @ISA = DC::UI::Bin::;
1345 1350
1346use DC::OpenGL; 1351use DC::OpenGL;
1347 1352
1348my $bg = 1353my $bg =
1349 new_from_file DC::Texture DC::find_rcfile "d1_bg.png", 1354 new_from_resource DC::Texture "d1_bg.png",
1350 mipmap => 1, wrap => 1; 1355 mipmap => 1, wrap => 1;
1351 1356
1352my @border = 1357my @border =
1353 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 1358 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); 1359 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1355 1360
1356my @icon = 1361my @icon =
1357 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 1362 map { new_from_resource DC::Texture $_, mipmap => 1 }
1358 qw(x1_move.png x1_resize.png); 1363 qw(x1_move.png x1_resize.png);
1359 1364
1360sub new { 1365sub new {
1361 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1362 1367
1363 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1], 1369 bg => [1, 1, 1, 1],
1365 border_bg => [1, 1, 1, 1], 1370 border_bg => [1, 1, 1, 1],
1366 border => 0.6, 1371 border => 0.8,
1367 can_events => 1, 1372 can_events => 1,
1368 min_w => 64, 1373 min_w => 64,
1369 min_h => 32, 1374 min_h => 32,
1370 %arg, 1375 %arg,
1371 ); 1376 );
… …
1540 glEnable GL_TEXTURE_2D; 1545 glEnable GL_TEXTURE_2D;
1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1546 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1542 1547
1543 my $border = $self->border; 1548 my $border = $self->border;
1544 1549
1550 if ($border) {
1545 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1549 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1550 1556
1551 # move 1557 # move
1552 my $w2 = ($w - $border) * .5; 1558 my $w2 = ($w - $border) * .5;
1553 my $h2 = ($h - $border) * .5; 1559 my $h2 = ($h - $border) * .5;
1554 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1557 1563
1558 # resize 1564 # resize
1559 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1561 unless $self->{has_close_button}; 1567 unless $self->{has_close_button};
1562 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1570 }
1564 1571
1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1572 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1566 glColor @{ $self->{bg} }; 1573 glColor @{ $self->{bg} };
1567 1574
1568 # TODO: repeat texture not scale 1575 # TODO: repeat texture not scale
… …
2090 my $class = shift; 2097 my $class = shift;
2091 2098
2092 $class->SUPER::new ( 2099 $class->SUPER::new (
2093 fg => [1, 1, 1], 2100 fg => [1, 1, 1],
2094 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1], 2102 outline => undef,
2096 active_bg => [0, 0, 1, .2], 2103 active_bg => [0, 0, 1, .2],
2097 active_fg => [1, 1, 1], 2104 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0], 2105 active_outline => [1, 1, 0],
2099 can_hover => 1, 2106 can_hover => 1,
2100 can_focus => 1, 2107 can_focus => 1,
… …
2158 2165
2159 my $text = $self->get_text; 2166 my $text = $self->get_text;
2160 2167
2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2168 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2162 2169
2163 if ($uni == 8) { 2170 if ($sym == DC::SDLK_BACKSPACE) {
2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2171 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2165 } elsif ($uni == 127) { 2172 } elsif ($sym == DC::SDLK_DELETE) {
2166 substr $text, $self->{cursor}, 1, ""; 2173 substr $text, $self->{cursor}, 1, "";
2167 } elsif ($sym == DC::SDLK_LEFT) { 2174 } elsif ($sym == DC::SDLK_LEFT) {
2168 --$self->{cursor} if $self->{cursor}; 2175 --$self->{cursor} if $self->{cursor};
2169 } elsif ($sym == DC::SDLK_RIGHT) { 2176 } elsif ($sym == DC::SDLK_RIGHT) {
2170 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2177 ++$self->{cursor} if $self->{cursor} < length $self->{text};
… …
2273 glColor @{$self->{active_outline}}; 2280 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; 2281 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1; 2282 glLineWidth 1;
2276 2283
2277 } else { 2284 } else {
2278 glColor @{$self->{outline}}; 2285 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2279 glBegin GL_LINE_STRIP; 2286 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5; 2287 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5; 2288 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5; 2289 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5; 2290 glVertex $self->{w} - .5, $self->{h} * .5;
… …
2405our @ISA = DC::UI::Bin::; 2412our @ISA = DC::UI::Bin::;
2406 2413
2407use DC::OpenGL; 2414use DC::OpenGL;
2408 2415
2409my @tex = 2416my @tex =
2410 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2417 map { new_from_resource DC::Texture $_, mipmap => 1 }
2411 qw(b1_button_inactive.png b1_button_active.png); 2418 qw(b1_button_inactive.png b1_button_active.png);
2412 2419
2413sub new { 2420sub new {
2414 my $class = shift; 2421 my $class = shift;
2415 2422
… …
2454our @ISA = DC::UI::Label::; 2461our @ISA = DC::UI::Label::;
2455 2462
2456use DC::OpenGL; 2463use DC::OpenGL;
2457 2464
2458my @tex = 2465my @tex =
2459 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2466 map { new_from_resource DC::Texture $_, mipmap => 1 }
2460 qw(b1_button_inactive.png b1_button_active.png); 2467 qw(b1_button_inactive.png b1_button_active.png);
2461 2468
2462sub new { 2469sub new {
2463 my $class = shift; 2470 my $class = shift;
2464 2471
… …
2507package DC::UI::CheckBox; 2514package DC::UI::CheckBox;
2508 2515
2509our @ISA = DC::UI::DrawBG::; 2516our @ISA = DC::UI::DrawBG::;
2510 2517
2511my @tex = 2518my @tex =
2512 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2519 map { new_from_resource DC::Texture $_, mipmap => 1 }
2513 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2520 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2514 2521
2515use DC::OpenGL; 2522use DC::OpenGL;
2516 2523
2517sub new { 2524sub new {
2518 my $class = shift; 2525 my $class = shift;
2519 2526
2520 $class->SUPER::new ( 2527 $class->SUPER::new (
2528 fontsize => 1,
2521 padding_x => 2, 2529 padding_x => 2,
2522 padding_y => 2, 2530 padding_y => 2,
2523 fg => [1, 1, 1], 2531 fg => [1, 1, 1],
2524 active_fg => [1, 1, 0], 2532 active_fg => [1, 1, 0],
2525 bg => [0, 0, 0, 0.2], 2533 bg => [0, 0, 0, 0.2],
… …
2531} 2539}
2532 2540
2533sub size_request { 2541sub size_request {
2534 my ($self) = @_; 2542 my ($self) = @_;
2535 2543
2536 (6) x 2 2544 ($self->{fontsize} * $::FONTSIZE) x 2
2537} 2545}
2538 2546
2539sub toggle { 2547sub toggle {
2540 my ($self) = @_; 2548 my ($self) = @_;
2541 2549
… …
2598 2606
2599 $self->{path} || $self->{tex} 2607 $self->{path} || $self->{tex}
2600 or Carp::croak "'path' or 'tex' attributes required"; 2608 or Carp::croak "'path' or 'tex' attributes required";
2601 2609
2602 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2610 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2603 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1; 2611 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2604 2612
2605 DC::weaken $texture_cache{$self->{path}}; 2613 DC::weaken $texture_cache{$self->{path}};
2606 2614
2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2615 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2608 2616
… …
2704 2712
2705use DC::OpenGL; 2713use DC::OpenGL;
2706 2714
2707my %tex = ( 2715my %tex = (
2708 food => [ 2716 food => [
2709 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2718 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2711 ], 2719 ],
2712 grace => [ 2720 grace => [
2713 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2721 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/ 2722 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2715 ], 2723 ],
2716 hp => [ 2724 hp => [
2717 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2725 map { new_from_resource DC::Texture $_, mipmap => 1 }
2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2726 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2719 ], 2727 ],
2720 mana => [ 2728 mana => [
2721 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } 2729 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/ 2730 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2723 ], 2731 ],
2724); 2732);
2725 2733
2726# eg. VGauge->new (gauge => 'food'), default gauge: food 2734# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2839 2847
2840sub new { 2848sub new {
2841 my ($class, %arg) = @_; 2849 my ($class, %arg) = @_;
2842 2850
2843 my $self = $class->SUPER::new ( 2851 my $self = $class->SUPER::new (
2852 padding_x => 2,
2853 padding_y => 2,
2844 fg => [1, 1, 1], 2854 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2], 2855 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8], 2856 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0], 2857 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9, 2858 fontsize => 0.9,
… …
2888 my ($self) = @_; 2898 my ($self) = @_;
2889 2899
2890 glEnable GL_BLEND; 2900 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2901 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892 2902
2903 my $px = $self->{padding_x};
2904 my $py = $self->{padding_y};
2905
2893 if ($self->{value} >= 0) { 2906 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value}; 2907 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2895 2908
2896 glColor_premultiply @{$self->{bar}}; 2909 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2; 2910 glRect $px, $py, $s, $self->{h} - $py;
2898 glColor_premultiply @{$self->{bg}}; 2911 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2; 2912 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2900 } 2913 }
2901 2914
2902 glColor_premultiply @{$self->{outline}}; 2915 glColor_premultiply @{$self->{outline}};
2916
2917 $px -= .5;
2918 $py -= .5;
2919
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; 2920 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2904 2921
2905 glDisable GL_BLEND; 2922 glDisable GL_BLEND;
2906 2923
2907 { 2924 {
2908 local $self->{bg}; # do not draw background 2925 local $self->{bg}; # do not draw background
… …
2917our @ISA = DC::UI::Progress::; 2934our @ISA = DC::UI::Progress::;
2918 2935
2919sub new { 2936sub new {
2920 my ($class, %arg) = @_; 2937 my ($class, %arg) = @_;
2921 2938
2939 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2940
2922 my $self = $class->SUPER::new ( 2941 my $self = $class->SUPER::new (
2942 %arg,
2923 tooltip => sub { 2943 tooltip => sub {
2924 my ($self) = @_; 2944 my ($self) = @_;
2925 2945
2926 sprintf "level %d\n%s points\n%s next level\n%s to go", 2946 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2947 $tt,
2927 $self->{lvl}, 2948 $self->{lvl},
2928 ::formsep ($self->{exp}), 2949 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}), 2950 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}), 2951 ::formsep ($self->{nxt} - $self->{exp}),
2952 $self->_percent * 100,
2931 }, 2953 },
2932 %arg
2933 ); 2954 );
2934 2955
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) } 2956 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN; 2957 if $::CONN;
2937 2958
… …
2945 if $::CONN; 2966 if $::CONN;
2946 2967
2947 $self->SUPER::DESTROY; 2968 $self->SUPER::DESTROY;
2948} 2969}
2949 2970
2971sub _percent {
2972 my ($self) = @_;
2973
2974 my $table = $::CONN && $::CONN->{exp_table}
2975 or return -1;
2976
2977 my $l0 = $table->[$self->{lvl} - 1];
2978 my $l1 = $table->[$self->{lvl}];
2979
2980 $self->{nxt} = $l1;
2981
2982 ($self->{exp} - $l0) / ($l1 - $l0)
2983}
2984
2950sub set_value { 2985sub set_value {
2951 my ($self, $lvl, $exp) = @_; 2986 my ($self, $lvl, $exp) = @_;
2952 2987
2953 $self->{lvl} = $lvl; 2988 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp; 2989 $self->{exp} = $exp;
2955 2990
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); 2991 $self->SUPER::set_value ($self->_percent);
2968} 2992}
2969 2993
2970############################################################################# 2994#############################################################################
2971 2995
2972package DC::UI::Gauge; 2996package DC::UI::Gauge;
… …
3023use DC::OpenGL; 3047use DC::OpenGL;
3024 3048
3025our @ISA = DC::UI::DrawBG::; 3049our @ISA = DC::UI::DrawBG::;
3026 3050
3027my @tex = 3051my @tex =
3028 map { new_from_file DC::Texture DC::find_rcfile $_ } 3052 map { new_from_resource DC::Texture $_ }
3029 qw(s1_slider.png s1_slider_bg.png); 3053 qw(s1_slider.png s1_slider_bg.png);
3030 3054
3031sub new { 3055sub new {
3032 my $class = shift; 3056 my $class = shift;
3033 3057
… …
3070sub set_value { 3094sub set_value {
3071 my ($self, $value) = @_; 3095 my ($self, $value) = @_;
3072 3096
3073 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3097 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
3074 3098
3075 $hi = $lo + 1 if $hi <= $lo; 3099 $hi = $lo if $hi < $lo;
3076 3100
3077 $page = $hi - $lo if $page > $hi - $lo; 3101 $value = $hi - $page if $value > $hi - $page;
3078
3079 $value = $lo if $value < $lo; 3102 $value = $lo if $value < $lo;
3080 $value = $hi - $page if $value > $hi - $page;
3081 3103
3082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3104 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
3083 if $unit; 3105 if $unit;
3084 3106
3085 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3107 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
3149 my ($self) = @_; 3171 my ($self) = @_;
3150 3172
3151 unless ($self->{knob_w}) { 3173 unless ($self->{knob_w}) {
3152 $self->set_value ($self->{range}[0]); 3174 $self->set_value ($self->{range}[0]);
3153 3175
3154 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3176 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
3155 my $range = ($hi - $page - $lo) || 1e-100; 3177 my $range = ($hi - $page - $lo) || 1e-10;
3156 3178
3157 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3179 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
3158 3180
3159 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3181 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
3160 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3182 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
3161 3183
3162 $value = ($value - $lo) / $range; 3184 $value = ($value - $lo) / $range;
… …
3622 3644
3623 $tip =~ s/^\n+//; 3645 $tip =~ s/^\n+//;
3624 $tip =~ s/\n+$//; 3646 $tip =~ s/\n+$//;
3625 3647
3626 $self->add (new DC::UI::Label 3648 $self->add (new DC::UI::Label
3649 fg => $DC::THEME{tooltip_fg},
3627 markup => $tip, 3650 markup => $tip,
3628 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3651 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3629 align => 0, 3652 align => 0,
3630 fontsize => 0.8, 3653 fontsize => 0.8,
3631 style => 1, # FLAG_INVERSE 3654 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3632 ellipsise => 0, 3655 ellipsise => 0,
3633 font => ($widget->{tooltip_font} || $::FONT_PROP), 3656 font => ($widget->{tooltip_font} || $::FONT_PROP),
3634 ); 3657 );
3635} 3658}
3636 3659
… …
3673sub _draw { 3696sub _draw {
3674 my ($self) = @_; 3697 my ($self) = @_;
3675 3698
3676 my ($w, $h) = @$self{qw(w h)}; 3699 my ($w, $h) = @$self{qw(w h)};
3677 3700
3678 glColor 1, 0.8, 0.4; 3701 glColor @{ $DC::THEME{tooltip_bg} };
3679 glRect 0, 0, $w, $h; 3702 glRect 0, 0, $w, $h;
3680 3703
3681 glColor 0, 0, 0; 3704 glColor @{ $DC::THEME{tooltip_border} };
3682 glRect_lineloop .5, .5, $w + .5, $h + .5; 3705 glRect_lineloop .5, .5, $w + .5, $h + .5;
3683 3706
3684 glTranslate 2, 2; 3707 glTranslate 2, 2;
3685 3708
3686 $self->SUPER::_draw; 3709 $self->SUPER::_draw;
… …
3858 $widget = new DC::UI::HBox 3881 $widget = new DC::UI::HBox
3859 can_hover => 1, 3882 can_hover => 1,
3860 can_events => 1, 3883 can_events => 1,
3861 tooltip => $tooltip, 3884 tooltip => $tooltip,
3862 children => [ 3885 children => [
3863 (new DC::UI::Label markup => $left, expand => 1), 3886 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3864 (new DC::UI::Label markup => $right, align => 1), 3887 (new DC::UI::Label markup => $right, align => 1),
3865 ], 3888 ],
3866 ; 3889 ;
3867 3890
3868 } else { 3891 } else {
… …
3892 # maybe save $GRAB? must be careful about events... 3915 # maybe save $GRAB? must be careful about events...
3893 $GRAB = $self; 3916 $GRAB = $self;
3894 $self->{button} = $ev->{button}; 3917 $self->{button} = $ev->{button};
3895 3918
3896 $self->show; 3919 $self->show;
3897 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3920
3921 my $x = $ev->{x};
3922 my $y = $ev->{y};
3923
3924 $self->{root}->on_post_alloc ($self => sub {
3925 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3926 });
3927
3928 1 # so it can be used inside event handlers
3898} 3929}
3899 3930
3900sub invoke_mouse_motion { 3931sub invoke_mouse_motion {
3901 my ($self, $ev, $x, $y) = @_; 3932 my ($self, $ev, $x, $y) = @_;
3902 3933
… …
3934 3965
3935 my $self = $class->SUPER::new ( 3966 my $self = $class->SUPER::new (
3936 @_, 3967 @_,
3937 ); 3968 );
3938 3969
3939 $self->{current} = $self->{children}[0] 3970 $self->set_current_page (0);
3940 if @{ $self->{children} };
3941 3971
3942 $self 3972 $self
3943} 3973}
3944 3974
3945sub add { 3975sub add {
3946 my ($self, @widgets) = @_; 3976 my ($self, @widgets) = @_;
3947 3977
3948 $self->SUPER::add (@widgets); 3978 $self->SUPER::add (@widgets);
3949 3979
3950 $self->{current} = $self->{children}[0] 3980 $self->set_current_page (0)
3951 if @{ $self->{children} }; 3981 if @widgets == @{ $self->{children} };
3952} 3982}
3953 3983
3954sub get_current_page { 3984sub get_current_page {
3955 my ($self) = @_; 3985 my ($self) = @_;
3956 3986
… …
3962 3992
3963 my $widget = ref $page_or_widget 3993 my $widget = ref $page_or_widget
3964 ? $page_or_widget 3994 ? $page_or_widget
3965 : $self->{children}[$page_or_widget]; 3995 : $self->{children}[$page_or_widget];
3966 3996
3997 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3998
3967 $self->{current} = $widget; 3999 if (($self->{current} = $widget)) {
4000 $self->{current}->set_visible if $self->{current} && $self->{visible};
3968 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4001 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3969 4002
3970 $self->emit (page_changed => $self->{current}); 4003 $self->emit (page_changed => $self->{current});
4004 }
3971 4005
3972 $self->realloc; 4006 $self->realloc;
3973} 4007}
3974 4008
3975sub visible_children { 4009sub visible_children {
3976 $_[0]{current} 4010 $_[0]{current} || ()
3977} 4011}
3978 4012
3979sub size_request { 4013sub size_request {
3980 my ($self) = @_; 4014 my ($self) = @_;
3981 4015
4016 $self->{current}
3982 $self->{current}->size_request 4017 ? $self->{current}->size_request
4018 : (0, 0)
3983} 4019}
3984 4020
3985sub invoke_size_allocate { 4021sub invoke_size_allocate {
3986 my ($self, $w, $h) = @_; 4022 my ($self, $w, $h) = @_;
3987 4023
3988 $self->{current}->configure (0, 0, $w, $h); 4024 $self->{current}->configure (0, 0, $w, $h)
4025 if $self->{current};
3989 4026
3990 1 4027 1
3991} 4028}
3992 4029
3993sub _draw { 4030sub _draw {
3994 my ($self) = @_; 4031 my ($self) = @_;
3995 4032
3996 $self->{current}->draw; 4033 $self->{current}->draw
4034 if $self->{current};
3997} 4035}
3998 4036
3999############################################################################# 4037#############################################################################
4000 4038
4001package DC::UI::Notebook; 4039package DC::UI::Notebook;
… …
4211 $self 4249 $self
4212} 4250}
4213 4251
4214sub reorder { 4252sub reorder {
4215 my ($self) = @_; 4253 my ($self) = @_;
4216 my $NOW = Time::HiRes::time; 4254 my $NOW = EV::time;
4217 4255
4218 # freeze display when hovering over any label 4256 # freeze display when hovering over any label
4219 return if $DC::UI::TOOLTIP->{owner} 4257 return if $DC::UI::TOOLTIP->{owner}
4220 && grep $DC::UI::TOOLTIP->{owner} == $_->{label}, 4258 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4221 values %{ $self->{item} }; 4259 values %{ $self->{item} };
… …
4271 $label->{fg}[3] = $item->{fg}[3] || 1; 4309 $label->{fg}[3] = $item->{fg}[3] || 1;
4272 } 4310 }
4273 4311
4274 push @widgets, $label; 4312 push @widgets, $label;
4275 } 4313 }
4314
4315 my $hash = join ",", @widgets;
4316 return if $hash eq $self->{last_widget_hash};
4317 $self->{last_widget_hash} = $hash;
4276 4318
4277 $self->clear; 4319 $self->clear;
4278 $self->SUPER::add (reverse @widgets); 4320 $self->SUPER::add (reverse @widgets);
4279} 4321}
4280 4322
… …
4585 4627
4586$ROOT = new DC::UI::Root; 4628$ROOT = new DC::UI::Root;
4587$TOOLTIP = new DC::UI::Tooltip z => 900; 4629$TOOLTIP = new DC::UI::Tooltip z => 900;
4588 4630
45891 46311
4590

Diff Legend

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