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.323 by root, Wed Jul 5 03:01:01 2006 UTC vs.
Revision 1.338 by root, Mon Jul 24 08:23:28 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;
… …
345 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
346 368
347 if ($self->{aspect}) { 369 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
349 371
350 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
352 374
353 # use alignment to adjust x, y 375 # use alignment to adjust x, y
354 376
355 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
407 429
408# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
409sub coord2local { 431sub coord2local {
410 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
411 433
434 Carp::confess unless $self->{parent};#d#
435
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 437}
414 438
415# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
416sub coord2global { 440sub coord2global {
417 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
418 442
443 Carp::confess unless $self->{parent};#d#
444
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 446}
421 447
422sub invoke_focus_in { 448sub invoke_focus_in {
423 my ($self) = @_; 449 my ($self) = @_;
… …
452 478
453 $FOCUS->emit ("focus_out") if $FOCUS; 479 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 480 $self->emit ("focus_in");
455} 481}
456 482
457sub invoke_mouse_motion { 1 } 483sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 484sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 485sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
461 488
462sub invoke_button_down { 489sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
464 491
465 $self->grab_focus; 492 $self->grab_focus;
466 493
467 1 494 0
468} 495}
469 496
470sub connect { 497sub connect {
471 my ($self, $signal, $cb) = @_; 498 my ($self, $signal, $cb) = @_;
472 499
473 push @{ $self->{signal_cb}{$signal} }, $cb; 500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
474} 506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
475 514
476sub emit { 515sub emit {
477 my ($self, $signal, @args) = @_; 516 my ($self, $signal, @args) = @_;
478 517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
479 #d##TODO# stop propagating at first true, do not use sum 527 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 531}
484 532
485sub find_widget { 533sub find_widget {
486 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
487 535
… …
587} 635}
588 636
589sub DESTROY { 637sub DESTROY {
590 my ($self) = @_; 638 my ($self) = @_;
591 639
640 return if CFClient::in_destruct;
641
592 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
593 643
594 eval { $self->destroy }; 644 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 646}
… …
679 729
680 $self->add (@$children) 730 $self->add (@$children)
681 if $children; 731 if $children;
682 732
683 $self 733 $self
734}
735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
684} 742}
685 743
686sub add { 744sub add {
687 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
688 746
… …
975 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
976 }, 1034 },
977 ; 1035 ;
978 1036
979 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
981 slider => $slider, 1040 slider => $slider,
982 %arg, 1041 %arg,
983 ); 1042 );
984 1043
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
… …
992 1051
993sub add { 1052sub add {
994 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
995 1054
996 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
1056}
1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
997} 1066}
998 1067
999sub update_slider { 1068sub update_slider {
1000 my ($self) = @_; 1069 my ($self) = @_;
1001 1070
… …
1080 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1152 border => 0.6,
1084 can_events => 1, 1153 can_events => 1,
1085 min_w => 16, 1154 min_w => 64,
1086 min_h => 16, 1155 min_h => 32,
1087 %arg, 1156 %arg,
1088 ); 1157 );
1089 1158
1090 $self->{title_widget} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1160 align => 0,
… …
1295sub children { 1364sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1366}
1298 1367
1299sub add { 1368sub add {
1300 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1301 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1302 $child->set_parent ($self); 1373 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1304 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1379 $self->realloc;
1306} 1380}
1307 1381
1308sub remove { 1382sub remove {
1309 my ($self, $child) = @_; 1383 my ($self, $child) = @_;
… …
1561 } 1635 }
1562 1636
1563 $self 1637 $self
1564} 1638}
1565 1639
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574}
1575
1576sub update { 1640sub update {
1577 my ($self) = @_; 1641 my ($self) = @_;
1578 1642
1579 delete $self->{texture}; 1643 delete $self->{texture};
1580 $self->SUPER::update; 1644 $self->SUPER::update;
… …
1826 1890
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 1892
1829 # byte-index to char-index 1893 # byte-index to char-index
1830 my $text = $self->{text}; 1894 my $text = $self->{text};
1831 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1833 1897
1834 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1835 $self->update; 1899 $self->update;
1836 1900
1837 1 1901 1
… …
1989 $self->SUPER::_draw; 2053 $self->SUPER::_draw;
1990} 2054}
1991 2055
1992############################################################################# 2056#############################################################################
1993 2057
2058package CFClient::UI::CheckBox;
2059
2060our @ISA = CFClient::UI::DrawBG::;
2061
2062my @tex =
2063 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2064 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065
2066use CFClient::OpenGL;
2067
2068sub new {
2069 my $class = shift;
2070
2071 $class->SUPER::new (
2072 padding_x => 2,
2073 padding_y => 2,
2074 fg => [1, 1, 1],
2075 active_fg => [1, 1, 0],
2076 bg => [0, 0, 0, 0.2],
2077 active_bg => [1, 1, 1, 0.5],
2078 state => 0,
2079 can_hover => 1,
2080 @_
2081 )
2082}
2083
2084sub size_request {
2085 my ($self) = @_;
2086
2087 (6) x 2
2088}
2089
2090sub toggle {
2091 my ($self) = @_;
2092
2093 $self->{state} = !$self->{state};
2094 $self->emit (changed => $self->{state});
2095 $self->update;
2096}
2097
2098sub invoke_button_down {
2099 my ($self, $ev, $x, $y) = @_;
2100
2101 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2102 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2103 $self->toggle;
2104 } else {
2105 return 0
2106 }
2107
2108 1
2109}
2110
2111sub _draw {
2112 my ($self) = @_;
2113
2114 $self->SUPER::_draw;
2115
2116 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2117
2118 my ($w, $h) = @$self{qw(w h)};
2119
2120 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2121
2122 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2123
2124 my $tex = $self->{state} ? $tex[1] : $tex[0];
2125
2126 glEnable GL_TEXTURE_2D;
2127 $tex->draw_quad_alpha (0, 0, $s, $s);
2128 glDisable GL_TEXTURE_2D;
2129}
2130
2131#############################################################################
2132
2133package CFClient::UI::Image;
2134
2135our @ISA = CFClient::UI::Base::;
2136
2137use CFClient::OpenGL;
2138
2139our %texture_cache;
2140
2141sub new {
2142 my $class = shift;
2143
2144 my $self = $class->SUPER::new (
2145 can_events => 0,
2146 @_,
2147 );
2148
2149 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required";
2151
2152 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2154
2155 Scalar::Util::weaken $texture_cache{$self->{path}};
2156
2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158
2159 $self
2160}
2161
2162sub STORABLE_freeze {
2163 my ($self, $cloning) = @_;
2164
2165 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2167
2168 $self->{path}
2169}
2170
2171sub STORABLE_attach {
2172 my ($self, $cloning, $path) = @_;
2173
2174 $self->new (path => $path)
2175}
2176
2177sub size_request {
2178 my ($self) = @_;
2179
2180 ($self->{tex}{w}, $self->{tex}{h})
2181}
2182
2183sub _draw {
2184 my ($self) = @_;
2185
2186 my $tex = $self->{tex};
2187
2188 my ($w, $h) = ($self->{w}, $self->{h});
2189
2190 if ($self->{rot90}) {
2191 glRotate 90, 0, 0, 1;
2192 glTranslate 0, -$self->{w}, 0;
2193
2194 ($w, $h) = ($h, $w);
2195 }
2196
2197 glEnable GL_TEXTURE_2D;
2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199
2200 $tex->draw_quad (0, 0, $w, $h);
2201
2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
1994package CFClient::UI::ImageButton; 2207package CFClient::UI::ImageButton;
1995 2208
1996our @ISA = CFClient::UI::Image::; 2209our @ISA = CFClient::UI::Image::;
1997 2210
1998use CFClient::OpenGL; 2211use CFClient::OpenGL;
… …
2021 $self->emit ("activate") 2234 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w} 2235 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h}; 2236 && $y >= 0 && $y < $self->{h};
2024 2237
2025 1 2238 1
2026}
2027
2028#############################################################################
2029
2030package CFClient::UI::CheckBox;
2031
2032our @ISA = CFClient::UI::DrawBG::;
2033
2034my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038use CFClient::OpenGL;
2039
2040sub new {
2041 my $class = shift;
2042
2043 $class->SUPER::new (
2044 padding_x => 2,
2045 padding_y => 2,
2046 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2050 state => 0,
2051 can_hover => 1,
2052 @_
2053 )
2054}
2055
2056sub size_request {
2057 my ($self) = @_;
2058
2059 (6) x 2
2060}
2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
2070sub invoke_button_down {
2071 my ($self, $ev, $x, $y) = @_;
2072
2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2075 $self->toggle;
2076 } else {
2077 return 0
2078 }
2079
2080 1
2081}
2082
2083sub _draw {
2084 my ($self) = @_;
2085
2086 $self->SUPER::_draw;
2087
2088 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2089
2090 my ($w, $h) = @$self{qw(w h)};
2091
2092 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2093
2094 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2095
2096 my $tex = $self->{state} ? $tex[1] : $tex[0];
2097
2098 glEnable GL_TEXTURE_2D;
2099 $tex->draw_quad_alpha (0, 0, $s, $s);
2100 glDisable GL_TEXTURE_2D;
2101}
2102
2103#############################################################################
2104
2105package CFClient::UI::Image;
2106
2107our @ISA = CFClient::UI::Base::;
2108
2109use CFClient::OpenGL;
2110
2111our %texture_cache;
2112
2113sub new {
2114 my $class = shift;
2115
2116 my $self = $class->SUPER::new (
2117 can_events => 0,
2118 @_,
2119 );
2120
2121 $self->{path}
2122 or Carp::croak "required attribute 'path' not set";
2123
2124 $self->{tex} = $texture_cache{$self->{path}} ||=
2125 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2126
2127 Scalar::Util::weaken $texture_cache{$self->{path}};
2128
2129 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2130
2131 $self
2132}
2133
2134sub size_request {
2135 my ($self) = @_;
2136
2137 ($self->{tex}{w}, $self->{tex}{h})
2138}
2139
2140sub _draw {
2141 my ($self) = @_;
2142
2143 my $tex = $self->{tex};
2144
2145 my ($w, $h) = ($self->{w}, $self->{h});
2146
2147 if ($self->{rot90}) {
2148 glRotate 90, 0, 0, 1;
2149 glTranslate 0, -$self->{w}, 0;
2150
2151 ($w, $h) = ($h, $w);
2152 }
2153
2154 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156
2157 $tex->draw_quad_alpha (0, 0, $w, $h);
2158
2159 glDisable GL_TEXTURE_2D;
2160} 2239}
2161 2240
2162############################################################################# 2241#############################################################################
2163 2242
2164package CFClient::UI::VGauge; 2243package CFClient::UI::VGauge;
… …
2449 } 2528 }
2450 2529
2451 1 2530 1
2452} 2531}
2453 2532
2533sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_;
2535
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2539
2540 ! ! $delta
2541}
2542
2454sub update { 2543sub update {
2455 my ($self) = @_; 2544 my ($self) = @_;
2456 2545
2457 delete $self->{knob_w}; 2546 delete $self->{knob_w};
2458 $self->SUPER::update; 2547 $self->SUPER::update;
… …
2557sub new { 2646sub new {
2558 my $class = shift; 2647 my $class = shift;
2559 2648
2560 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2561 fontsize => 1, 2650 fontsize => 1,
2562 can_events => 0, 2651 can_events => 1,
2563 indent => 0, 2652 indent => 0,
2564 #font => default_font 2653 #font => default_font
2565 @_, 2654 @_,
2566 2655
2567 layout => (new CFClient::Layout), 2656 layout => (new CFClient::Layout),
… …
2609 2698
2610 local $self->{children} = [$empty, $slider]; 2699 local $self->{children} = [$empty, $slider];
2611 $self->SUPER::invoke_size_allocate ($w, $h) 2700 $self->SUPER::invoke_size_allocate ($w, $h)
2612} 2701}
2613 2702
2703sub invoke_mouse_wheel {
2704 my ($self, $ev) = @_;
2705
2706 return 0 unless $ev->{dy}; # only vertical movements
2707
2708 $self->{children}[1]->emit (mouse_wheel => $ev);
2709
2710 1
2711}
2712
2614sub get_layout { 2713sub get_layout {
2615 my ($self, $para) = @_; 2714 my ($self, $para) = @_;
2616 2715
2617 my $layout = $self->{layout}; 2716 my $layout = $self->{layout};
2618 2717
… …
2656 $self->{height} = 0; 2755 $self->{height} = 0;
2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2658} 2757}
2659 2758
2660sub add_paragraph { 2759sub add_paragraph {
2661 my ($self, $color, $para, $indent) = @_; 2760 my $self = shift;
2662 2761
2663 my ($text, @w) = ref $para ? @$para : $para; 2762 for my $para (@_) {
2664
2665 $para = { 2763 $para = {
2764 fg => [1, 1, 1, 1],
2765 indent => 0,
2766 markup => "",
2767 widget => [],
2768 ref $para ? %$para : (markup => $para),
2666 w => 1e10, 2769 w => 1e10,
2667 wrapped => 1, 2770 wrapped => 1,
2668 fg => $color,
2669 indent => $indent,
2670 markup => $text,
2671 widget => \@w,
2672 }; 2771 };
2673 2772
2674 $self->add (@w) if @w; 2773 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2675 push @{$self->{par}}, $para; 2774 push @{$self->{par}}, $para;
2775 }
2676 2776
2677 $self->{need_reflow}++; 2777 $self->{need_reflow}++;
2678 $self->update; 2778 $self->update;
2679} 2779}
2680 2780
… …
2914 3014
2915 $self->{root}->on_post_alloc ("move_$self" => sub { 3015 $self->{root}->on_post_alloc ("move_$self" => sub {
2916 my $widget = $self->{owner} 3016 my $widget = $self->{owner}
2917 or return; 3017 or return;
2918 3018
3019 if ($widget->{visible}) {
2919 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3020 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2920 3021
2921 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3022 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2922 if $x + $self->{w} > $self->{root}{w}; 3023 if $x + $self->{w} > $self->{root}{w};
2923 3024
2924 $self->move_abs ($x, $y); 3025 $self->move_abs ($x, $y);
3026 } else {
3027 $self->hide;
3028 }
2925 }); 3029 });
2926} 3030}
2927 3031
2928sub _draw { 3032sub _draw {
2929 my ($self) = @_; 3033 my ($self) = @_;
… …
2955 3059
2956############################################################################# 3060#############################################################################
2957 3061
2958package CFClient::UI::Face; 3062package CFClient::UI::Face;
2959 3063
2960our @ISA = CFClient::UI::Base::; 3064our @ISA = CFClient::UI::DrawBG::;
2961 3065
2962use CFClient::OpenGL; 3066use CFClient::OpenGL;
2963 3067
2964sub new { 3068sub new {
2965 my $class = shift; 3069 my $class = shift;
… …
3001 3105
3002sub _draw { 3106sub _draw {
3003 my ($self) = @_; 3107 my ($self) = @_;
3004 3108
3005 return unless $::CONN; 3109 return unless $::CONN;
3110
3111 $self->SUPER::_draw;
3006 3112
3007 my $face; 3113 my $face;
3008 3114
3009 if ($self->{frame}) { 3115 if ($self->{frame}) {
3010 my $anim = $::CONN->{anim}[$self->{anim}]; 3116 my $anim = $::CONN->{anim}[$self->{anim}];
… …
3257 $self->emit (page_changed => $self->{multiplexer}{current}); 3363 $self->emit (page_changed => $self->{multiplexer}{current});
3258} 3364}
3259 3365
3260############################################################################# 3366#############################################################################
3261 3367
3262package CFClient::UI::Combobox; 3368package CFClient::UI::Selector;
3263 3369
3264use utf8; 3370use utf8;
3265 3371
3266our @ISA = CFClient::UI::Button::; 3372our @ISA = CFClient::UI::Button::;
3267 3373
… …
3467sub new { 3573sub new {
3468 my $class = shift; 3574 my $class = shift;
3469 3575
3470 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
3471 col_expand => [0, 1, 0], 3577 col_expand => [0, 1, 0],
3578 items => [],
3472 @_, 3579 @_,
3473 ); 3580 );
3474 3581
3582 $self->set_sort_order (undef);
3583
3475 $self 3584 $self
3585}
3586
3587sub update_items {
3588 my ($self) = @_;
3589
3590 $self->clear;
3591
3592 my @item = $self->{sort}->(@{ $self->{items} });
3593
3594 my @adds;
3595 my $row = 0;
3596 for my $item ($self->{sort}->(@{ $self->{items} })) {
3597 CFClient::Item::update_widgets $item;
3598
3599 push @adds, 0, $row, $item->{face_widget};
3600 push @adds, 1, $row, $item->{desc_widget};
3601 push @adds, 2, $row, $item->{weight_widget};
3602
3603 $row++;
3604 }
3605
3606 $self->add (@adds);
3607}
3608
3609sub set_sort_order {
3610 my ($self, $order) = @_;
3611
3612 $self->{sort} = $order ||= sub {
3613 sort {
3614 $a->{type} <=> $b->{type}
3615 or $a->{name} cmp $b->{name}
3616 } @_
3617 };
3618
3619 $self->update_items;
3476} 3620}
3477 3621
3478sub set_items { 3622sub set_items {
3479 my ($self, $items) = @_; 3623 my ($self, $items) = @_;
3480 3624
3481 $self->clear; 3625 $self->{items} = [$items ? values %$items : ()];
3482 return unless $items; 3626 $self->update_items;
3483
3484 my @items = sort {
3485 ($a->{type} <=> $b->{type})
3486 or ($a->{name} cmp $b->{name})
3487 } values %$items;
3488
3489 $self->{real_items} = \@items;
3490
3491 my $row = 0;
3492 for my $item (@items) {
3493 CFClient::Item::update_widgets $item;
3494
3495 $self->add (0, $row, $item->{face_widget});
3496 $self->add (1, $row, $item->{desc_widget});
3497 $self->add (2, $row, $item->{weight_widget});
3498
3499 $row++;
3500 }
3501} 3627}
3502 3628
3503############################################################################# 3629#############################################################################
3504 3630
3505package CFClient::UI::SpellList; 3631package CFClient::UI::SpellList;
… …
3814 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3815 3941
3816 $w = 0 if $w < 0; 3942 $w = 0 if $w < 0;
3817 $h = 0 if $h < 0; 3943 $h = 0 if $h < 0;
3818 3944
3945 $w = max $widget->{min_w}, $w;
3946 $h = max $widget->{min_h}, $h;
3947
3948# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3949# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3950
3951 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3952 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3953
3819 $w = int $w + 0.5; 3954 $w = int $w + 0.5;
3820 $h = int $h + 0.5; 3955 $h = int $h + 0.5;
3821 3956
3822 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3957 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3823 $widget->{old_w} = $widget->{w}; 3958 $widget->{old_w} = $widget->{w};

Diff Legend

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