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.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.301 by elmex, Mon Jun 12 12:28:06 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
277 delete $self->{visible}; 278 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->focus_out;
286 287
287 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
314} 315}
315 316
316sub move_abs { 317sub move_abs {
317 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
318 319
319 $self->{x} = List::Util::max 0, int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
322 323
323 $self->update; 324 $self->update;
324} 325}
325 326
… …
381} 382}
382 383
383sub set_max_size { 384sub set_max_size {
384 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
385 386
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
388} 391}
389 392
390sub set_tooltip { 393sub set_tooltip {
391 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
392 395
… …
397 400
398 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
399 402
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 406 }
404} 407}
405 408
406# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
407sub coord2local { 410sub coord2local {
… …
1536 1539
1537 delete $self->{texture}; 1540 delete $self->{texture};
1538 $self->SUPER::update; 1541 $self->SUPER::update;
1539} 1542}
1540 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1541sub set_text { 1551sub set_text {
1542 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1543 1553
1544 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1546 1556
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1549 1559
1560 delete $self->{size_req};
1550 $self->realloc; 1561 $self->realloc;
1551 $self->update; 1562 $self->update;
1552} 1563}
1553 1564
1554sub set_markup { 1565sub set_markup {
… …
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 1572
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1564 1575
1576 delete $self->{size_req};
1565 $self->realloc; 1577 $self->realloc;
1566 $self->update; 1578 $self->update;
1567} 1579}
1568 1580
1569sub size_request { 1581sub size_request {
1570 my ($self) = @_; 1582 my ($self) = @_;
1571 1583
1584 $self->{size_req} ||= do {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1590
1578 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1579 1592
1580 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1596
1584 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1585 1598
1586 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1588 } 1604 };
1589 1605
1590 ($w, $h) 1606 @{ $self->{size_req} }
1591} 1607}
1592 1608
1593sub size_allocate { 1609sub size_allocate {
1594 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1595 1611
… …
1604 1620
1605 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1606 delete $self->{texture}; 1622 delete $self->{texture};
1607 1623
1608 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1609} 1633}
1610 1634
1611sub _draw { 1635sub _draw {
1612 my ($self) = @_; 1636 my ($self) = @_;
1613 1637
… …
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1635 }; 1659 };
1636 1660
1637 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1665
1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1668 glColor @{$self->{fg}};
1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1670 } else {
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1639
1640 glColor_premultiply @{$self->{fg}}
1641 if $tex->{format} == GL_ALPHA;
1642
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1673 }
1644 1674
1645 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1646} 1676}
1647 1677
1648############################################################################# 1678#############################################################################
… …
1664 can_hover => 1, 1694 can_hover => 1,
1665 can_focus => 1, 1695 can_focus => 1,
1666 valign => 0, 1696 valign => 0,
1667 can_events => 1, 1697 can_events => 1,
1668 #text => ... 1698 #text => ...
1699 #hidden => "*",
1669 @_ 1700 @_
1670 ) 1701 )
1671} 1702}
1672 1703
1673sub _set_text { 1704sub _set_text {
… …
1680 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 1712 $self->{text} = $text;
1682 1713
1683 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1685 1717
1686 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1687 $self->update; 1721 $self->update;
1688} 1722}
1689 1723
1690sub set_text { 1724sub set_text {
1691 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1692 1726
1693 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1728 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1729}
1698 1730
1699sub get_text { 1731sub get_text {
1700 $_[0]{text} 1732 $_[0]{text}
1701} 1733}
… …
2275sub set_range { 2307sub set_range {
2276 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2277 2309
2278 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2279 2311
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2282} 2316}
2283 2317
2284sub set_value { 2318sub set_value {
2285 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2286 2320
… …
2433sub set_range { shift->{slider}->set_range (@_) } 2467sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) } 2468sub set_value { shift->{slider}->set_value (@_) }
2435 2469
2436############################################################################# 2470#############################################################################
2437 2471
2438package CFClient::UI::TextView; 2472package CFClient::UI::TextScroller;
2439 2473
2440our @ISA = CFClient::UI::HBox::; 2474our @ISA = CFClient::UI::HBox::;
2441 2475
2442use CFClient::OpenGL; 2476use CFClient::OpenGL;
2443 2477
… …
2445 my $class = shift; 2479 my $class = shift;
2446 2480
2447 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2448 fontsize => 1, 2482 fontsize => 1,
2449 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2450 #font => default_font 2485 #font => default_font
2451 @_, 2486 @_,
2452 2487
2453 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2454 par => [], 2489 par => [],
… …
2477 $self->SUPER::size_allocate ($w, $h); 2512 $self->SUPER::size_allocate ($w, $h);
2478 2513
2479 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2482 2518
2483 $self->reflow; 2519 $self->reflow;
2484} 2520}
2485 2521
2486sub text_size { 2522sub text_size {
… …
2488 2524
2489 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2490 2526
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2494 2531
2495 $layout->size 2532 $layout->size
2496} 2533}
2497 2534
… …
2536 2573
2537 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2538 2575
2539 delete $self->{texture}; 2576 delete $self->{texture};
2540 2577
2541 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543 2580
2544 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2545 my $height = 0; 2582 my $height = 0;
2546 2583
… …
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550 2587
2551 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2553 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2554 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2557 $_->[1] = $h; 2595 $_->[1] = $h;
2558 } 2596 }
… …
2561 } 2599 }
2562 2600
2563 $self->{height} = $height; 2601 $self->{height} = $height;
2564 2602
2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2566 2604
2567 delete $self->{texture}; 2605 delete $self->{texture};
2568 } 2606 }
2569 2607
2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2571 glClearColor 0, 0, 0, 0; 2609 glClearColor 0, 0, 0, 0;
… …
2590 my $h = $par->[1]; 2628 my $h = $par->[1];
2591 2629
2592 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2593 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2594 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2595 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2596 2635
2597 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2598 2637
2599 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2713 $tooltip .= "\n\n" . (ref $widget) . "\n" 2752 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n" 2754 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}"; 2755 . "visible $widget->{visible}";
2717 } 2756 }
2757
2758 $tooltip =~ s/^\n+//;
2759 $tooltip =~ s/\n+$//;
2718 2760
2719 $self->add (new CFClient::UI::Label 2761 $self->add (new CFClient::UI::Label
2720 markup => $tooltip, 2762 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2763 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8, 2764 fontsize => 0.8,
… …
2750 or return; 2792 or return;
2751 2793
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2794 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753 2795
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2796 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH; 2797 if $x + $self->{w} > $self->{root}{w};
2756 2798
2757 $self->move_abs ($x, $y); 2799 $self->move_abs ($x, $y);
2758 }); 2800 });
2759} 2801}
2760 2802
… …
2892 ); 2934 );
2893 2935
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2936 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2895 2937
2896 for my $item (@{ $self->{items} }) { 2938 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item; 2939 my ($widget, $cb, $tooltip) = @$item;
2898 2940
2899 # handle various types of items, only text for now 2941 # handle various types of items, only text for now
2900 if (!ref $widget) { 2942 if (!ref $widget) {
2901 $widget = new CFClient::UI::Label 2943 $widget = new CFClient::UI::Label
2902 can_hover => 1, 2944 can_hover => 1,
2903 can_events => 1, 2945 can_events => 1,
2904 text => $widget; 2946 markup => $widget,
2947 tooltip => $tooltip
2905 } 2948 }
2906 2949
2907 $self->{item}{$widget} = $item; 2950 $self->{item}{$widget} = $item;
2908 2951
2909 $self->{vbox}->add ($widget); 2952 $self->{vbox}->add ($widget);
… …
3060 $self->_emit (page_changed => $self->{multiplexer}{current}); 3103 $self->_emit (page_changed => $self->{multiplexer}{current});
3061} 3104}
3062 3105
3063############################################################################# 3106#############################################################################
3064 3107
3065package CFClient::UI::Statusbox; 3108package CFClient::UI::Combobox;
3066 3109
3110use utf8;
3111
3067our @ISA = CFClient::UI::VBox::; 3112our @ISA = CFClient::UI::Button::;
3068 3113
3069sub new { 3114sub new {
3070 my $class = shift; 3115 my $class = shift;
3071 3116
3072 $class->SUPER::new ( 3117 my $self = $class->SUPER::new (
3118 options => [], # [value, title, longdesc], ...
3119 value => undef,
3120 @_,
3121 );
3122
3123 $self->_set_value ($self->{value});
3124
3125 $self
3126}
3127
3128sub button_down {
3129 my ($self, $ev) = @_;
3130
3131 my @menu_items;
3132
3133 for (@{ $self->{options} }) {
3134 my ($value, $title, $tooltip) = @$_;
3135
3136 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3137 }
3138
3139 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3140}
3141
3142sub _set_value {
3143 my ($self, $value) = @_;
3144
3145 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3146 or return;
3147
3148 $self->{value} = $item->[0];
3149 $self->set_markup ("$item->[1] ⇓");
3150 $self->set_tooltip ($item->[2]);
3151}
3152
3153sub set_value {
3154 my ($self, $value) = @_;
3155
3156 return unless $self->{value} ne $value;
3157
3158 $self->_set_value ($value);
3159 $self->_emit (changed => $value);
3160}
3161
3162#############################################################################
3163
3164package CFClient::UI::Statusbox;
3165
3166our @ISA = CFClient::UI::VBox::;
3167
3168sub new {
3169 my $class = shift;
3170
3171 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 3172 fontsize => 0.8,
3074 @_, 3173 @_,
3075 ) 3174 );
3175
3176 Scalar::Util::weaken (my $this = $self);
3177
3178 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3179
3180 $self
3076} 3181}
3077 3182
3078sub reorder { 3183sub reorder {
3079 my ($self) = @_; 3184 my ($self) = @_;
3080 my $NOW = time; 3185 my $NOW = Time::HiRes::time;
3186
3187 # freeze display when hovering over any label
3188 return if $CFClient::UI::TOOLTIP->{owner}
3189 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3190 values %{ $self->{item} };
3081 3191
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3192 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3193 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3194 }
3085 3195
… …
3088 my @items = sort { 3198 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3199 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3200 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3201 } values %{ $self->{item} };
3092 3202
3203 $self->{timer}->interval (1);
3204
3093 my $count = 10 + 1; 3205 my $count = 10 + 1;
3094 for my $item (@items) { 3206 for my $item (@items) {
3095 last unless --$count; 3207 last unless --$count;
3096 3208
3097 push @widgets, $item->{label} ||= do { 3209 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3210 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3211 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3212 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3213 : $item->{text};
3102 3214
… …
3110 tooltip => $item->{tooltip}, 3222 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3223 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3224 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3225 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3226 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3227 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3228 can_events => 1,
3117 can_hover => 1 3229 can_hover => 1
3118 }; 3230 };
3231
3232 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3233 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3234 $label->update;
3235 $label->set_max_size (undef, $label->{req_h} * $diff)
3236 if $diff < 1;
3237 $self->{timer}->interval (1/30);
3238 } else {
3239 $label->{fg}[3] = $item->{fg}[3] || 1;
3240 }
3241
3242 push @widgets, $label;
3119 } 3243 }
3120 3244
3121 $self->clear; 3245 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3246 $self->SUPER::add (reverse @widgets);
3123} 3247}
… …
3128 $text =~ s/^\s+//; 3252 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 3253 $text =~ s/\s+$//;
3130 3254
3131 return unless $text; 3255 return unless $text;
3132 3256
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 3257 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 3258
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3259 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 3260
3137 if (my $item = $self->{item}{$group}) { 3261 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 3262 if ($item->{text} eq $text) {
3139 $item->{count}++; 3263 $item->{count}++;
3140 } else { 3264 } else {
3141 $item->{count} = 1; 3265 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text; 3266 $item->{text} = $item->{tooltip} = $text;
3143 } 3267 }
3144 $item->{id} = ++$self->{id}; 3268 $item->{id} += 0.2;#d#
3145 $item->{timeout} = $timeout; 3269 $item->{timeout} = $timeout;
3146 delete $item->{label}; 3270 delete $item->{label};
3147 } else { 3271 } else {
3148 $self->{item}{$group} = { 3272 $self->{item}{$group} = {
3149 id => ++$self->{id}, 3273 id => ++$self->{id},
… …
3168 3292
3169 $self->reorder; 3293 $self->reorder;
3170 $self->SUPER::reconfigure; 3294 $self->SUPER::reconfigure;
3171} 3295}
3172 3296
3297sub DESTROY {
3298 my ($self) = @_;
3299
3300 $self->{timer}->cancel;
3301
3302 $self->SUPER::DESTROY;
3303}
3304
3173############################################################################# 3305#############################################################################
3174 3306
3175package CFClient::UI::Inventory; 3307package CFClient::UI::Inventory;
3176 3308
3177our @ISA = CFClient::UI::ScrolledWindow::; 3309our @ISA = CFClient::UI::ScrolledWindow::;
… …
3423 commands => [], 3555 commands => [],
3424 @_, 3556 @_,
3425 ) 3557 )
3426} 3558}
3427 3559
3428# XXX: Do sorting? Argl... 3560my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3561
3562my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3563 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3564my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3565 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3566my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3567 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3568my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3569 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3570my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3571 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3572
3573sub rebuild_spell_list {
3574 my ($self) = @_;
3575
3576 $CFClient::UI::ROOT->on_refresh ($self => sub {
3577 $self->clear;
3578
3579 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3580 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3581 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3582 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3583 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3584
3585 my $row = 0;
3586
3587 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3588 my $spell = $self->{spell}{$_};
3589
3590 $row++;
3591
3592 my $spell_cb = sub {
3593 my ($widget, $ev) = @_;
3594
3595 if ($ev->{button} == 1) {
3596 $::CONN->user_send ("cast $spell->{name}");
3597 } elsif ($ev->{button} == 2) {
3598 $::CONN->user_send ("invoke $spell->{name}");
3599 } elsif ($ev->{button} == 3) {
3600 (new CFClient::UI::Menu
3601 items => [
3602 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3603 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3604 ],
3605 )->popup ($ev);
3606 } else {
3607 return 0;
3608 }
3609
3610 1
3611 };
3612
3613 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3614
3615 #TODO: add path info to tooltip
3616 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3617
3618 $self->add (0, $row, new CFClient::UI::Face
3619 face => $spell->{face},
3620 can_hover => 1,
3621 can_events => 1,
3622 tooltip => $tooltip,
3623 on_button_down => $spell_cb,
3624 );
3625
3626 $self->add (1, $row, new CFClient::UI::Label
3627 expand => 1,
3628 text => $spell->{name},
3629 can_hover => 1,
3630 can_events => 1,
3631 tooltip => $tooltip,
3632 on_button_down => $spell_cb,
3633 );
3634
3635 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3636 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3637 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3638 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3639 }
3640 });
3641}
3642
3429sub add_spell { 3643sub add_spell {
3430 my ($self, $spell) = @_; 3644 my ($self, $spell) = @_;
3645
3431 $self->{spells}->{$spell->{name}} = $spell; 3646 $self->{spell}->{$spell->{name}} = $spell;
3432 3647 $self->rebuild_spell_list;
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460} 3648}
3461 3649
3462sub remove_spell { 3650sub remove_spell {
3463 my ($self, $spell) = @_; 3651 my ($self, $spell) = @_;
3652
3464 delete $self->{spells}->{$spell->{name}}; 3653 delete $self->{spell}->{$spell->{name}};
3465 $self->rebuild_spell_list; 3654 $self->rebuild_spell_list;
3466} 3655}
3467 3656
3657sub clear_spells {
3658 my ($self) = @_;
3659
3660 $self->{spell} = {};
3661 $self->rebuild_spell_list;
3662}
3663
3468############################################################################# 3664#############################################################################
3469 3665
3470package CFClient::UI::Root; 3666package CFClient::UI::Root;
3471 3667
3472our @ISA = CFClient::UI::Container::; 3668our @ISA = CFClient::UI::Container::;
3669
3670use List::Util qw(min max);
3473 3671
3474use CFClient::OpenGL; 3672use CFClient::OpenGL;
3475 3673
3476sub new { 3674sub new {
3477 my $class = shift; 3675 my $class = shift;
… …
3612 3810
3613 delete $queue{$widget+0}; 3811 delete $queue{$widget+0};
3614 3812
3615 my ($w, $h) = $widget->size_request; 3813 my ($w, $h) = $widget->size_request;
3616 3814
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3815 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3816 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3817
3818 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3819 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 3820
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 3821 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 3822 $h = $widget->{force_h} if exists $widget->{force_h};
3622 3823
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3824 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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