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.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.339 by root, Sun Jul 30 12:15:19 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 warn "button down $ev->{button}\n";#d# 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
89 102
90 if (!$BUTTON_STATE) { 103 unless ($GRAB) {
91 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
92 105
93 $GRAB = $widget; 106 $GRAB = $widget;
94 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
95 108
96 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->cb->();
97 } 110 }
98 111
99 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
100 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
101 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
102 if $GRAB; 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 }
103} 122}
104 123
105sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
106 my ($ev) = @_; 125 my ($ev) = @_;
107 my ($x, $y) = ($ev->{x}, $ev->{y});
108 126
109 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
110 128
111 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
112 130
113 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
114 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
115 133
116 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
117 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
118 $grab->update if $grab; 136 $grab->update if $grab;
119 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
120 138
139 check_hover $widget;
121 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
122 } 141 }
123} 142}
124 143
125sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
126 my ($ev) = @_; 145 my ($ev) = @_;
127 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
128 147
129 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
130 149
131 if ($widget != $HOVER) { 150 check_hover $widget;
132 my $hover = $HOVER; $HOVER = $widget;
133 151
134 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
135 $HOVER->update if $HOVER && $HOVER->{can_hover};
136
137 $TOOLTIP_WATCHER->start;
138 }
139
140 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
141 if $HOVER; 153 if $HOVER;
142} 154}
143 155
144# convert position array to integers 156# convert position array to integers
145sub harmonize { 157sub harmonize {
… …
191 203
192 } 204 }
193 } 205 }
194 206
195 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
196} 216}
197 217
198############################################################################# 218#############################################################################
199 219
200package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
347 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
348 368
349 if ($self->{aspect}) { 369 if ($self->{aspect}) {
350 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
351 371
352 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
353 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
354 374
355 # use alignment to adjust x, y 375 # use alignment to adjust x, y
356 376
357 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
358 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
409 429
410# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
411sub coord2local { 431sub coord2local {
412 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
413 433
434 Carp::confess unless $self->{parent};#d#
435
414 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
415} 437}
416 438
417# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
418sub coord2global { 440sub coord2global {
419 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
442
443 Carp::confess unless $self->{parent};#d#
420 444
421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
422} 446}
423 447
424sub invoke_focus_in { 448sub invoke_focus_in {
… …
458 482
459sub invoke_mouse_motion { 0 } 483sub invoke_mouse_motion { 0 }
460sub invoke_button_up { 0 } 484sub invoke_button_up { 0 }
461sub invoke_key_down { 0 } 485sub invoke_key_down { 0 }
462sub invoke_key_up { 0 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
463 488
464sub invoke_button_down { 489sub invoke_button_down {
465 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
466 491
467 $self->grab_focus; 492 $self->grab_focus;
468 493
469 warn "button down $ev->{button} $x $y\n";#d#
470
471 0 494 0
472} 495}
473 496
474sub connect { 497sub connect {
475 my ($self, $signal, $cb) = @_; 498 my ($self, $signal, $cb) = @_;
476 499
477 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 }
478} 506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
479 514
480sub emit { 515sub emit {
481 my ($self, $signal, @args) = @_; 516 my ($self, $signal, @args) = @_;
482 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
483 #d##TODO# stop propagating at first true, do not use sum 527 #d##TODO# stop propagating at first true, do not use sum
484 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
485 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
486 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
487} 531}
488 532
489sub find_widget { 533sub find_widget {
490 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
491 535
… …
687 if $children; 731 if $children;
688 732
689 $self 733 $self
690} 734}
691 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
692sub add { 744sub add {
693 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
694 746
695 $_->set_parent ($self) 747 $_->set_parent ($self)
696 for @widgets; 748 for @widgets;
… …
981 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
982 }, 1034 },
983 ; 1035 ;
984 1036
985 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
986 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
987 slider => $slider, 1040 slider => $slider,
988 %arg, 1041 %arg,
989 ); 1042 );
990 1043
991 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
992 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
… …
1000 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
1001 1054
1002 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
1003} 1056}
1004 1057
1005sub invoke_button_down { 1058sub invoke_mouse_wheel {
1006 my ($self, $ev) = @_; 1059 my ($self, $ev) = @_;
1007 1060
1008 warn "button down $ev->{button}\n";#d# 1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1009 1065 1
1010 0
1011} 1066}
1012 1067
1013sub update_slider { 1068sub update_slider {
1014 my ($self) = @_; 1069 my ($self) = @_;
1015 1070
… …
1241 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1242 1297
1243 ! ! $self->{motion} 1298 ! ! $self->{motion}
1244} 1299}
1245 1300
1301sub invoke_visibility_change {
1302 my ($self, $visible) = @_;
1303
1304 delete $self->{motion} unless $visible;
1305
1306 0
1307}
1308
1246sub _draw { 1309sub _draw {
1247 my ($self) = @_; 1310 my ($self) = @_;
1248 1311
1249 my $child = $self->{children}[0]; 1312 my $child = $self->{children}[0];
1250 1313
… …
1309sub children { 1372sub children {
1310 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311} 1374}
1312 1375
1313sub add { 1376sub add {
1314 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1315 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1316 $child->set_parent ($self); 1381 $child->set_parent ($self);
1317 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1318 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1319 $self->realloc; 1387 $self->realloc;
1320} 1388}
1321 1389
1322sub remove { 1390sub remove {
1323 my ($self, $child) = @_; 1391 my ($self, $child) = @_;
… …
1575 } 1643 }
1576 1644
1577 $self 1645 $self
1578} 1646}
1579 1647
1580sub escape($) {
1581 local $_ = $_[0];
1582
1583 s/&/&amp;/g;
1584 s/>/&gt;/g;
1585 s/</&lt;/g;
1586
1587 $_
1588}
1589
1590sub update { 1648sub update {
1591 my ($self) = @_; 1649 my ($self) = @_;
1592 1650
1593 delete $self->{texture}; 1651 delete $self->{texture};
1594 $self->SUPER::update; 1652 $self->SUPER::update;
… …
2003 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
2004} 2062}
2005 2063
2006############################################################################# 2064#############################################################################
2007 2065
2066package CFClient::UI::CheckBox;
2067
2068our @ISA = CFClient::UI::DrawBG::;
2069
2070my @tex =
2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2072 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073
2074use CFClient::OpenGL;
2075
2076sub new {
2077 my $class = shift;
2078
2079 $class->SUPER::new (
2080 padding_x => 2,
2081 padding_y => 2,
2082 fg => [1, 1, 1],
2083 active_fg => [1, 1, 0],
2084 bg => [0, 0, 0, 0.2],
2085 active_bg => [1, 1, 1, 0.5],
2086 state => 0,
2087 can_hover => 1,
2088 @_
2089 )
2090}
2091
2092sub size_request {
2093 my ($self) = @_;
2094
2095 (6) x 2
2096}
2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
2106sub invoke_button_down {
2107 my ($self, $ev, $x, $y) = @_;
2108
2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2111 $self->toggle;
2112 } else {
2113 return 0
2114 }
2115
2116 1
2117}
2118
2119sub _draw {
2120 my ($self) = @_;
2121
2122 $self->SUPER::_draw;
2123
2124 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2125
2126 my ($w, $h) = @$self{qw(w h)};
2127
2128 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2129
2130 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2131
2132 my $tex = $self->{state} ? $tex[1] : $tex[0];
2133
2134 glEnable GL_TEXTURE_2D;
2135 $tex->draw_quad_alpha (0, 0, $s, $s);
2136 glDisable GL_TEXTURE_2D;
2137}
2138
2139#############################################################################
2140
2141package CFClient::UI::Image;
2142
2143our @ISA = CFClient::UI::Base::;
2144
2145use CFClient::OpenGL;
2146
2147our %texture_cache;
2148
2149sub new {
2150 my $class = shift;
2151
2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
2156
2157 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required";
2159
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2162
2163 Scalar::Util::weaken $texture_cache{$self->{path}};
2164
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166
2167 $self
2168}
2169
2170sub STORABLE_freeze {
2171 my ($self, $cloning) = @_;
2172
2173 $self->{path}
2174 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2175
2176 $self->{path}
2177}
2178
2179sub STORABLE_attach {
2180 my ($self, $cloning, $path) = @_;
2181
2182 $self->new (path => $path)
2183}
2184
2185sub size_request {
2186 my ($self) = @_;
2187
2188 ($self->{tex}{w}, $self->{tex}{h})
2189}
2190
2191sub _draw {
2192 my ($self) = @_;
2193
2194 my $tex = $self->{tex};
2195
2196 my ($w, $h) = ($self->{w}, $self->{h});
2197
2198 if ($self->{rot90}) {
2199 glRotate 90, 0, 0, 1;
2200 glTranslate 0, -$self->{w}, 0;
2201
2202 ($w, $h) = ($h, $w);
2203 }
2204
2205 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207
2208 $tex->draw_quad (0, 0, $w, $h);
2209
2210 glDisable GL_TEXTURE_2D;
2211}
2212
2213#############################################################################
2214
2008package CFClient::UI::ImageButton; 2215package CFClient::UI::ImageButton;
2009 2216
2010our @ISA = CFClient::UI::Image::; 2217our @ISA = CFClient::UI::Image::;
2011 2218
2012use CFClient::OpenGL; 2219use CFClient::OpenGL;
… …
2035 $self->emit ("activate") 2242 $self->emit ("activate")
2036 if $x >= 0 && $x < $self->{w} 2243 if $x >= 0 && $x < $self->{w}
2037 && $y >= 0 && $y < $self->{h}; 2244 && $y >= 0 && $y < $self->{h};
2038 2245
2039 1 2246 1
2040}
2041
2042#############################################################################
2043
2044package CFClient::UI::CheckBox;
2045
2046our @ISA = CFClient::UI::DrawBG::;
2047
2048my @tex =
2049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2050 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2051
2052use CFClient::OpenGL;
2053
2054sub new {
2055 my $class = shift;
2056
2057 $class->SUPER::new (
2058 padding_x => 2,
2059 padding_y => 2,
2060 fg => [1, 1, 1],
2061 active_fg => [1, 1, 0],
2062 bg => [0, 0, 0, 0.2],
2063 active_bg => [1, 1, 1, 0.5],
2064 state => 0,
2065 can_hover => 1,
2066 @_
2067 )
2068}
2069
2070sub size_request {
2071 my ($self) = @_;
2072
2073 (6) x 2
2074}
2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
2084sub invoke_button_down {
2085 my ($self, $ev, $x, $y) = @_;
2086
2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2089 $self->toggle;
2090 } else {
2091 return 0
2092 }
2093
2094 1
2095}
2096
2097sub _draw {
2098 my ($self) = @_;
2099
2100 $self->SUPER::_draw;
2101
2102 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2103
2104 my ($w, $h) = @$self{qw(w h)};
2105
2106 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2107
2108 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2109
2110 my $tex = $self->{state} ? $tex[1] : $tex[0];
2111
2112 glEnable GL_TEXTURE_2D;
2113 $tex->draw_quad_alpha (0, 0, $s, $s);
2114 glDisable GL_TEXTURE_2D;
2115}
2116
2117#############################################################################
2118
2119package CFClient::UI::Image;
2120
2121our @ISA = CFClient::UI::Base::;
2122
2123use CFClient::OpenGL;
2124
2125our %texture_cache;
2126
2127sub new {
2128 my $class = shift;
2129
2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
2134
2135 $self->{path} || $self->{tex}
2136 or Carp::croak "'path' or 'tex' attributes required";
2137
2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2140
2141 Scalar::Util::weaken $texture_cache{$self->{path}};
2142
2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2144
2145 $self
2146}
2147
2148sub size_request {
2149 my ($self) = @_;
2150
2151 ($self->{tex}{w}, $self->{tex}{h})
2152}
2153
2154sub _draw {
2155 my ($self) = @_;
2156
2157 my $tex = $self->{tex};
2158
2159 my ($w, $h) = ($self->{w}, $self->{h});
2160
2161 if ($self->{rot90}) {
2162 glRotate 90, 0, 0, 1;
2163 glTranslate 0, -$self->{w}, 0;
2164
2165 ($w, $h) = ($h, $w);
2166 }
2167
2168 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170
2171 $tex->draw_quad_alpha (0, 0, $w, $h);
2172
2173 glDisable GL_TEXTURE_2D;
2174} 2247}
2175 2248
2176############################################################################# 2249#############################################################################
2177 2250
2178package CFClient::UI::VGauge; 2251package CFClient::UI::VGauge;
… …
2463 } 2536 }
2464 2537
2465 1 2538 1
2466} 2539}
2467 2540
2541sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_;
2543
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2547
2548 ! ! $delta
2549}
2550
2468sub update { 2551sub update {
2469 my ($self) = @_; 2552 my ($self) = @_;
2470 2553
2471 delete $self->{knob_w}; 2554 delete $self->{knob_w};
2472 $self->SUPER::update; 2555 $self->SUPER::update;
… …
2571sub new { 2654sub new {
2572 my $class = shift; 2655 my $class = shift;
2573 2656
2574 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2575 fontsize => 1, 2658 fontsize => 1,
2576 can_events => 0, 2659 can_events => 1,
2577 indent => 0, 2660 indent => 0,
2578 #font => default_font 2661 #font => default_font
2579 @_, 2662 @_,
2580 2663
2581 layout => (new CFClient::Layout), 2664 layout => (new CFClient::Layout),
… …
2623 2706
2624 local $self->{children} = [$empty, $slider]; 2707 local $self->{children} = [$empty, $slider];
2625 $self->SUPER::invoke_size_allocate ($w, $h) 2708 $self->SUPER::invoke_size_allocate ($w, $h)
2626} 2709}
2627 2710
2711sub invoke_mouse_wheel {
2712 my ($self, $ev) = @_;
2713
2714 return 0 unless $ev->{dy}; # only vertical movements
2715
2716 $self->{children}[1]->emit (mouse_wheel => $ev);
2717
2718 1
2719}
2720
2628sub get_layout { 2721sub get_layout {
2629 my ($self, $para) = @_; 2722 my ($self, $para) = @_;
2630 2723
2631 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2632 2725
… …
2670 $self->{height} = 0; 2763 $self->{height} = 0;
2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672} 2765}
2673 2766
2674sub add_paragraph { 2767sub add_paragraph {
2675 my ($self, $color, $para, $indent) = @_; 2768 my $self = shift;
2676 2769
2677 my ($text, @w) = ref $para ? @$para : $para; 2770 for my $para (@_) {
2678
2679 $para = { 2771 $para = {
2772 fg => [1, 1, 1, 1],
2773 indent => 0,
2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2680 w => 1e10, 2777 w => 1e10,
2681 wrapped => 1, 2778 wrapped => 1,
2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2686 }; 2779 };
2687 2780
2688 $self->add (@w) if @w; 2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689 push @{$self->{par}}, $para; 2782 push @{$self->{par}}, $para;
2783 }
2690 2784
2691 $self->{need_reflow}++; 2785 $self->{need_reflow}++;
2692 $self->update; 2786 $self->update;
2693} 2787}
2694 2788
… …
2928 3022
2929 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2930 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2931 or return; 3025 or return;
2932 3026
3027 if ($widget->{visible}) {
2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934 3029
2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936 if $x + $self->{w} > $self->{root}{w}; 3031 if $x + $self->{w} > $self->{root}{w};
2937 3032
2938 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2939 }); 3037 });
2940} 3038}
2941 3039
2942sub _draw { 3040sub _draw {
2943 my ($self) = @_; 3041 my ($self) = @_;
… …
2969 3067
2970############################################################################# 3068#############################################################################
2971 3069
2972package CFClient::UI::Face; 3070package CFClient::UI::Face;
2973 3071
2974our @ISA = CFClient::UI::Base::; 3072our @ISA = CFClient::UI::DrawBG::;
2975 3073
2976use CFClient::OpenGL; 3074use CFClient::OpenGL;
2977 3075
2978sub new { 3076sub new {
2979 my $class = shift; 3077 my $class = shift;
… …
3015 3113
3016sub _draw { 3114sub _draw {
3017 my ($self) = @_; 3115 my ($self) = @_;
3018 3116
3019 return unless $::CONN; 3117 return unless $::CONN;
3118
3119 $self->SUPER::_draw;
3020 3120
3021 my $face; 3121 my $face;
3022 3122
3023 if ($self->{frame}) { 3123 if ($self->{frame}) {
3024 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
… …
3271 $self->emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3272} 3372}
3273 3373
3274############################################################################# 3374#############################################################################
3275 3375
3276package CFClient::UI::Combobox; 3376package CFClient::UI::Selector;
3277 3377
3278use utf8; 3378use utf8;
3279 3379
3280our @ISA = CFClient::UI::Button::; 3380our @ISA = CFClient::UI::Button::;
3281 3381
… …
3481sub new { 3581sub new {
3482 my $class = shift; 3582 my $class = shift;
3483 3583
3484 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3485 col_expand => [0, 1, 0], 3585 col_expand => [0, 1, 0],
3586 items => [],
3486 @_, 3587 @_,
3487 ); 3588 );
3488 3589
3590 $self->set_sort_order (undef);
3591
3489 $self 3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFClient::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3490} 3628}
3491 3629
3492sub set_items { 3630sub set_items {
3493 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3494 3632
3495 $self->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3496 return unless $items; 3634 $self->update_items;
3497
3498 my @items = sort {
3499 ($a->{type} <=> $b->{type})
3500 or ($a->{name} cmp $b->{name})
3501 } values %$items;
3502
3503 $self->{real_items} = \@items;
3504
3505 my $row = 0;
3506 for my $item (@items) {
3507 CFClient::Item::update_widgets $item;
3508
3509 $self->add (0, $row, $item->{face_widget});
3510 $self->add (1, $row, $item->{desc_widget});
3511 $self->add (2, $row, $item->{weight_widget});
3512
3513 $row++;
3514 }
3515} 3635}
3516 3636
3517############################################################################# 3637#############################################################################
3518 3638
3519package CFClient::UI::SpellList; 3639package CFClient::UI::SpellList;
… …
3831 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3832 3952
3833 $w = max $widget->{min_w}, $w; 3953 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h; 3954 $h = max $widget->{min_h}, $h;
3835 3955
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838 3961
3839 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3840 $h = int $h + 0.5; 3963 $h = int $h + 0.5;

Diff Legend

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