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.316 by root, Sun Jul 2 13:57:58 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;
… …
423 my ($self) = @_; 445 my ($self) = @_;
424 446
425 return if $FOCUS == $self; 447 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
427 449
428 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
429 451
430 $focus->update if $focus; 452 $self->update;
431 $FOCUS->update;
432 453
433 0 454 0
434} 455}
435 456
436sub invoke_focus_out { 457sub invoke_focus_out {
437 my ($self) = @_; 458 my ($self) = @_;
438 459
439 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
440 461
441 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
442 463
443 $focus->update if $focus; #? 464 $self->update;
444 465
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 467 unless $FOCUS;
447 468
448 0 469 0
449} 470}
450 471
451sub grab_focus { 472sub grab_focus {
452 my ($self) = @_; 473 my ($self) = @_;
453 474
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,
… …
1096 1139
1097 if ($self->{has_close_button}) { 1140 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1141 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1142 new CFClient::UI::ImageButton
1100 path => 'x1_close.png', 1143 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1144 on_activate => sub { $self->emit ("delete") };
1102 1145
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1146 $self->CFClient::UI::Container::add ($self->{close_button});
1104 } 1147 }
1105 1148
1106 $self 1149 $self
… …
1152 $self->child->configure ($border, $border, $w, $h); 1195 $self->child->configure ($border, $border, $w, $h);
1153 1196
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1198 if $self->{close_button};
1156 1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1207
1157 1 1208 1
1158} 1209}
1159 1210
1160sub invoke_button_down { 1211sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
… …
1583 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1584 1635
1585 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1587 1638
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1590 1640
1591 delete $self->{size_req}; 1641 delete $self->{size_req};
1592 $self->realloc; 1642 $self->realloc;
1593 $self->update; 1643 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1601 1651
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1653
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1606 1655
1607 delete $self->{size_req}; 1656 delete $self->{size_req};
1608 $self->realloc; 1657 $self->realloc;
1609 $self->update; 1658 $self->update;
… …
1621 1670
1622 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1623 1672
1624 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1625 $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);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1677
1628 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1629 1679
1630 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
… …
1664 1714
1665sub reconfigure { 1715sub reconfigure {
1666 my ($self) = @_; 1716 my ($self) = @_;
1667 1717
1668 delete $self->{size_req}; 1718 delete $self->{size_req};
1719 delete $self->{texture};
1669 1720
1670 $self->SUPER::reconfigure; 1721 $self->SUPER::reconfigure;
1671} 1722}
1672 1723
1673sub _draw { 1724sub _draw {
1674 my ($self) = @_; 1725 my ($self) = @_;
1675 1726
1676 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1677 1728
1678 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1679 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1680 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1681 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1682 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685 1736
1686 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1687 }; 1738 };
1688 1739
1689 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1693 1744
1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1697 }; 1748 };
1698 1749
1699 glEnable GL_TEXTURE_2D;
1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1703 1752
1704 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 }
1712
1713 glDisable GL_TEXTURE_2D;
1714} 1754}
1715 1755
1716############################################################################# 1756#############################################################################
1717 1757
1718package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1829 1869
1830 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1831 1871
1832 # byte-index to char-index 1872 # byte-index to char-index
1833 my $text = $self->{text}; 1873 my $text = $self->{text};
1834 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1836 1876
1837 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1838 $self->update; 1878 $self->update;
1839 1879
1840 1 1880 1
… …
2060 my ($self) = @_; 2100 my ($self) = @_;
2061 2101
2062 (6) x 2 2102 (6) x 2
2063} 2103}
2064 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
2065sub invoke_button_down { 2113sub invoke_button_down {
2066 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
2067 2115
2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070 $self->{state} = !$self->{state}; 2118 $self->toggle;
2071 $self->emit (changed => $self->{state});
2072 } else { 2119 } else {
2073 return 0 2120 return 0
2074 } 2121 }
2075 2122
2076 1 2123 1
… …
2112 my $self = $class->SUPER::new ( 2159 my $self = $class->SUPER::new (
2113 can_events => 0, 2160 can_events => 0,
2114 @_, 2161 @_,
2115 ); 2162 );
2116 2163
2117 $self->{path} 2164 $self->{path} || $self->{tex}
2118 or Carp::croak "required attribute 'path' not set"; 2165 or Carp::croak "'path' or 'tex' attributes required";
2119 2166
2120 $self->{tex} = $texture_cache{$self->{path}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2121 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;
2122 2169
2123 Scalar::Util::weaken $texture_cache{$self->{path}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2124 2171
2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2247 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2248 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2249 2296
2250 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2251 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2252 2302
2253 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
… …
2275 2325
2276 if ($t3) { 2326 if ($t3) {
2277 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2278 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2279 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283 glEnd; 2333 glEnd;
2284 } 2334 }
2285 2335
2286 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2442 } 2492 }
2443 2493
2444 1 2494 1
2445} 2495}
2446 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
2447sub update { 2507sub update {
2448 my ($self) = @_; 2508 my ($self) = @_;
2449 2509
2450 delete $self->{knob_w}; 2510 delete $self->{knob_w};
2451 $self->SUPER::update; 2511 $self->SUPER::update;
… …
2550sub new { 2610sub new {
2551 my $class = shift; 2611 my $class = shift;
2552 2612
2553 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2554 fontsize => 1, 2614 fontsize => 1,
2555 can_events => 0, 2615 can_events => 1,
2556 indent => 0, 2616 indent => 0,
2557 #font => default_font 2617 #font => default_font
2558 @_, 2618 @_,
2559 2619
2560 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2561 par => [], 2621 par => [],
2562 height => 0, 2622 height => 0,
2563 children => [ 2623 children => [
2564 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2565 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2600 2660
2601 $self->reflow; 2661 $self->reflow;
2602 2662
2603 local $self->{children} = [$empty, $slider]; 2663 local $self->{children} = [$empty, $slider];
2604 $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
2605} 2675}
2606 2676
2607sub get_layout { 2677sub get_layout {
2608 my ($self, $para) = @_; 2678 my ($self, $para) = @_;
2609 2679
… …
2726 my $y0 = $top; 2796 my $y0 = $top;
2727 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2728 2798
2729 my $y = 0; 2799 my $y = 0;
2730 2800
2731 glEnable GL_BLEND;
2732 #TODO# not correct in windows where rgba is forced off
2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735 for my $para (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2736 my $h = $para->{h}; 2802 my $h = $para->{h};
2737 2803
2738 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2739 2805
2740 my $layout = $self->get_layout ($para); 2806 my $layout = $self->get_layout ($para);
2741 2807
2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744 glRasterPos $para->{indent}, $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746 2809
2747 if (my @w = @{ $para->{widget} }) { 2810 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes; 2811 my @s = $layout->get_shapes;
2749 2812
2750 glDisable GL_BLEND;
2751 for (@w) { 2813 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, (); 2814 my ($dx, $dy) = splice @s, 0, 2, ();
2753 2815
2754 $_->{x} = $dx + $para->{indent}; 2816 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0; 2817 $_->{y} = $dy + $y - $y0;
2756 2818
2757 $_->draw; 2819 $_->draw;
2758 } 2820 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 } 2821 }
2762 } 2822 }
2763 2823
2764 $y += $h; 2824 $y += $h;
2765 } 2825 }
2766
2767 glDisable GL_BLEND;
2768 }; 2826 };
2769 }); 2827 });
2770} 2828}
2771 2829
2772sub reconfigure { 2830sub reconfigure {
… …
3068 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
3069 my ($widget, $cb, $tooltip) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
3070 3128
3071 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
3072 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 {
3073 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
3074 can_hover => 1, 3146 can_hover => 1,
3075 can_events => 1, 3147 can_events => 1,
3076 markup => $widget, 3148 markup => $widget,
3077 tooltip => $tooltip 3149 tooltip => $tooltip;
3150 }
3078 } 3151 }
3079 3152
3080 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
3081 3154
3082 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
3149 3222
3150 $self->SUPER::add (@widgets); 3223 $self->SUPER::add (@widgets);
3151 3224
3152 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} }; 3226 if @{ $self->{children} };
3227}
3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3154} 3233}
3155 3234
3156sub set_current_page { 3235sub set_current_page {
3157 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
3158 3237
… …
3224 tooltip => $tooltip, 3303 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) }, 3304 on_activate => sub { $self->set_current_page ($widget) },
3226 ); 3305 );
3227 3306
3228 $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
3229} 3314}
3230 3315
3231sub set_current_page { 3316sub set_current_page {
3232 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3233 3318
… …
3438 3523
3439############################################################################# 3524#############################################################################
3440 3525
3441package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3442 3527
3443our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3444 3529
3445sub new { 3530sub new {
3446 my $class = shift; 3531 my $class = shift;
3447 3532
3448 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3450 @_, 3535 @_,
3451 ); 3536 );
3452 3537
3453 $self 3538 $self
3454} 3539}
3455 3540
3456sub set_items { 3541sub set_items {
3457 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3458 3543
3459 $self->{child}->clear; 3544 $self->clear;
3460 return unless $items; 3545 return unless $items;
3461 3546
3462 my @items = sort { 3547 my @items = sort {
3463 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
… …
3468 3553
3469 my $row = 0; 3554 my $row = 0;
3470 for my $item (@items) { 3555 for my $item (@items) {
3471 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3472 3557
3473 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3476 3561
3477 $row++; 3562 $row++;
3478 } 3563 }
3479} 3564}
3480 3565
… …
3792 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793 3878
3794 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3795 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3796 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
3797 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3798 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3799 3890
3800 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}) {
3801 $widget->{old_w} = $widget->{w}; 3892 $widget->{old_w} = $widget->{w};

Diff Legend

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