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.317 by root, Sun Jul 2 18:52:05 2006 UTC vs.
Revision 1.330 by root, Sun Jul 23 04:37:51 2006 UTC

… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
90 103
91 $GRAB = $widget; 104 $GRAB = $widget;
92 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
93 106
94 $TOOLTIP_WATCHER->cb->(); 107 $TOOLTIP_WATCHER->cb->();
95 } 108 }
96 109
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 111
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
100 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
189 203
190 } 204 }
191 } 205 }
192 206
193 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
194} 216}
195 217
196############################################################################# 218#############################################################################
197 219
198package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
452 474
453 $FOCUS->emit ("focus_out") if $FOCUS; 475 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 476 $self->emit ("focus_in");
455} 477}
456 478
457sub invoke_mouse_motion { 1 } 479sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 480sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 481sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
461 484
462sub invoke_button_down { 485sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
464 487
465 $self->grab_focus; 488 $self->grab_focus;
466 489
467 1 490 0
468} 491}
469 492
470sub connect { 493sub connect {
471 my ($self, $signal, $cb) = @_; 494 my ($self, $signal, $cb) = @_;
472 495
… …
474} 497}
475 498
476sub emit { 499sub emit {
477 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
478 501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
479 #d##TODO# stop propagating at first true, do not use sum 509 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 513}
484 514
485sub find_widget { 515sub find_widget {
486 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
487 517
… …
587} 617}
588 618
589sub DESTROY { 619sub DESTROY {
590 my ($self) = @_; 620 my ($self) = @_;
591 621
622 return if CFClient::in_destruct;
623
592 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
593 625
594 eval { $self->destroy }; 626 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 628}
… …
975 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
976 }, 1008 },
977 ; 1009 ;
978 1010
979 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
981 slider => $slider, 1014 slider => $slider,
982 %arg, 1015 %arg,
983 ); 1016 );
984 1017
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1019 $self->add ($child) if $child;
… …
992 1025
993sub add { 1026sub add {
994 my ($self, $widget) = @_; 1027 my ($self, $widget) = @_;
995 1028
996 $self->{vp}->add ($self->{child} = $widget); 1029 $self->{vp}->add ($self->{child} = $widget);
1030}
1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
997} 1040}
998 1041
999sub update_slider { 1042sub update_slider {
1000 my ($self) = @_; 1043 my ($self) = @_;
1001 1044
… …
1080 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1126 border => 0.6,
1084 can_events => 1, 1127 can_events => 1,
1085 min_w => 16, 1128 min_w => 64,
1086 min_h => 16, 1129 min_h => 32,
1087 %arg, 1130 %arg,
1088 ); 1131 );
1089 1132
1090 $self->{title_widget} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1134 align => 0,
… …
1591 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1592 1635
1593 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1594 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1595 1638
1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1598 1640
1599 delete $self->{size_req}; 1641 delete $self->{size_req};
1600 $self->realloc; 1642 $self->realloc;
1601 $self->update; 1643 $self->update;
… …
1607 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1608 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1609 1651
1610 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611 1653
1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1614 1655
1615 delete $self->{size_req}; 1656 delete $self->{size_req};
1616 $self->realloc; 1657 $self->realloc;
1617 $self->update; 1658 $self->update;
… …
1629 1670
1630 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1631 1672
1632 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1633 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635 1677
1636 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1637 1679
1638 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
… …
1672 1714
1673sub reconfigure { 1715sub reconfigure {
1674 my ($self) = @_; 1716 my ($self) = @_;
1675 1717
1676 delete $self->{size_req}; 1718 delete $self->{size_req};
1719 delete $self->{texture};
1677 1720
1678 $self->SUPER::reconfigure; 1721 $self->SUPER::reconfigure;
1679} 1722}
1680 1723
1681sub _draw { 1724sub _draw {
1682 my ($self) = @_; 1725 my ($self) = @_;
1683 1726
1684 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1685 1728
1686 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1687 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1688 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1689 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1690 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693 1736
1694 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1695 }; 1738 };
1696 1739
1697 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1701 1744
1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1705 }; 1748 };
1706 1749
1707 glEnable GL_TEXTURE_2D;
1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 1752
1712 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714 glColor @{$self->{fg}};
1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719 }
1720
1721 glDisable GL_TEXTURE_2D;
1722} 1754}
1723 1755
1724############################################################################# 1756#############################################################################
1725 1757
1726package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1837 1869
1838 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1839 1871
1840 # byte-index to char-index 1872 # byte-index to char-index
1841 my $text = $self->{text}; 1873 my $text = $self->{text};
1842 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1844 1876
1845 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1846 $self->update; 1878 $self->update;
1847 1879
1848 1 1880 1
… …
2068 my ($self) = @_; 2100 my ($self) = @_;
2069 2101
2070 (6) x 2 2102 (6) x 2
2071} 2103}
2072 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
2073sub invoke_button_down { 2113sub invoke_button_down {
2074 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
2075 2115
2076 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2077 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2078 $self->{state} = !$self->{state}; 2118 $self->toggle;
2079 $self->emit (changed => $self->{state});
2080 } else { 2119 } else {
2081 return 0 2120 return 0
2082 } 2121 }
2083 2122
2084 1 2123 1
… …
2120 my $self = $class->SUPER::new ( 2159 my $self = $class->SUPER::new (
2121 can_events => 0, 2160 can_events => 0,
2122 @_, 2161 @_,
2123 ); 2162 );
2124 2163
2125 $self->{path} 2164 $self->{path} || $self->{tex}
2126 or Carp::croak "required attribute 'path' not set"; 2165 or Carp::croak "'path' or 'tex' attributes required";
2127 2166
2128 $self->{tex} = $texture_cache{$self->{path}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2129 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2130 2169
2131 Scalar::Util::weaken $texture_cache{$self->{path}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2132 2171
2133 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2453 } 2492 }
2454 2493
2455 1 2494 1
2456} 2495}
2457 2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2505}
2506
2458sub update { 2507sub update {
2459 my ($self) = @_; 2508 my ($self) = @_;
2460 2509
2461 delete $self->{knob_w}; 2510 delete $self->{knob_w};
2462 $self->SUPER::update; 2511 $self->SUPER::update;
… …
2561sub new { 2610sub new {
2562 my $class = shift; 2611 my $class = shift;
2563 2612
2564 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2565 fontsize => 1, 2614 fontsize => 1,
2566 can_events => 0, 2615 can_events => 1,
2567 indent => 0, 2616 indent => 0,
2568 #font => default_font 2617 #font => default_font
2569 @_, 2618 @_,
2570 2619
2571 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2572 par => [], 2621 par => [],
2573 height => 0, 2622 height => 0,
2574 children => [ 2623 children => [
2575 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2576 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2611 2660
2612 $self->reflow; 2661 $self->reflow;
2613 2662
2614 local $self->{children} = [$empty, $slider]; 2663 local $self->{children} = [$empty, $slider];
2615 $self->SUPER::invoke_size_allocate ($w, $h) 2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2616} 2675}
2617 2676
2618sub get_layout { 2677sub get_layout {
2619 my ($self, $para) = @_; 2678 my ($self, $para) = @_;
2620 2679
… …
2737 my $y0 = $top; 2796 my $y0 = $top;
2738 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2739 2798
2740 my $y = 0; 2799 my $y = 0;
2741 2800
2742 glEnable GL_BLEND;
2743 #TODO# not correct in windows where rgba is forced off
2744 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2745
2746 for my $para (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2747 my $h = $para->{h}; 2802 my $h = $para->{h};
2748 2803
2749 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2750 2805
2751 my $layout = $self->get_layout ($para); 2806 my $layout = $self->get_layout ($para);
2752 2807
2753 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2754
2755 glRasterPos $para->{indent}, $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2756 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757 2809
2758 if (my @w = @{ $para->{widget} }) { 2810 if (my @w = @{ $para->{widget} }) {
2759 my @s = $layout->get_shapes; 2811 my @s = $layout->get_shapes;
2760 2812
2761 glDisable GL_BLEND;
2762 for (@w) { 2813 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, (); 2814 my ($dx, $dy) = splice @s, 0, 2, ();
2764 2815
2765 $_->{x} = $dx + $para->{indent}; 2816 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0; 2817 $_->{y} = $dy + $y - $y0;
2767 2818
2768 $_->draw; 2819 $_->draw;
2769 } 2820 }
2770 glEnable GL_BLEND;
2771 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772 } 2821 }
2773 } 2822 }
2774 2823
2775 $y += $h; 2824 $y += $h;
2776 } 2825 }
2777
2778 glDisable GL_BLEND;
2779 }; 2826 };
2780 }); 2827 });
2781} 2828}
2782 2829
2783sub reconfigure { 2830sub reconfigure {
… …
3079 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
3080 my ($widget, $cb, $tooltip) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
3081 3128
3082 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
3083 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
3084 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
3085 can_hover => 1, 3146 can_hover => 1,
3086 can_events => 1, 3147 can_events => 1,
3087 markup => $widget, 3148 markup => $widget,
3088 tooltip => $tooltip 3149 tooltip => $tooltip;
3150 }
3089 } 3151 }
3090 3152
3091 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
3092 3154
3093 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
3160 3222
3161 $self->SUPER::add (@widgets); 3223 $self->SUPER::add (@widgets);
3162 3224
3163 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
3164 if @{ $self->{children} }; 3226 if @{ $self->{children} };
3227}
3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3165} 3233}
3166 3234
3167sub set_current_page { 3235sub set_current_page {
3168 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
3169 3237
… …
3235 tooltip => $tooltip, 3303 tooltip => $tooltip,
3236 on_activate => sub { $self->set_current_page ($widget) }, 3304 on_activate => sub { $self->set_current_page ($widget) },
3237 ); 3305 );
3238 3306
3239 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3308}
3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3240} 3314}
3241 3315
3242sub set_current_page { 3316sub set_current_page {
3243 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3244 3318
… …
3449 3523
3450############################################################################# 3524#############################################################################
3451 3525
3452package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3453 3527
3454our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3455 3529
3456sub new { 3530sub new {
3457 my $class = shift; 3531 my $class = shift;
3458 3532
3459 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3460 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3461 @_, 3535 @_,
3462 ); 3536 );
3463 3537
3464 $self 3538 $self
3465} 3539}
3466 3540
3467sub set_items { 3541sub set_items {
3468 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3469 3543
3470 $self->{child}->clear; 3544 $self->clear;
3471 return unless $items; 3545 return unless $items;
3472 3546
3473 my @items = sort { 3547 my @items = sort {
3474 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3475 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
… …
3479 3553
3480 my $row = 0; 3554 my $row = 0;
3481 for my $item (@items) { 3555 for my $item (@items) {
3482 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3483 3557
3484 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3485 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3486 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3487 3561
3488 $row++; 3562 $row++;
3489 } 3563 }
3490} 3564}
3491 3565
… …
3803 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3804 3878
3805 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3806 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3807 3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887
3808 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3809 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3810 3890
3811 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3812 $widget->{old_w} = $widget->{w}; 3892 $widget->{old_w} = $widget->{w};

Diff Legend

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