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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.259 by root, Tue May 30 07:13:09 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
15 43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_text ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31 } 60 }
32 61
33 return; 62 return;
34 } 63 }
… …
39 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
40} 69}
41 70
42# class methods for events 71# class methods for events
43sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 73 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS;
45} 75}
46 76
47sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 78 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS;
49} 80}
50 81
51sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
52 my ($ev) = @_; 83 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 92 check_tooltip;
62 } 93 }
63 94
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 96
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
98 if $GRAB;
67} 99}
68 100
69sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
70 my ($ev) = @_; 102 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
72 104
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 106
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 108
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
110 if $GRAB;
78 111
79 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 114 $grab->update if $grab;
82 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 132
100 check_tooltip; 133 check_tooltip;
101 } 134 }
102 135
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER;
104} 138}
105 139
106# convert position array to integers 140# convert position array to integers
107sub harmonize { 141sub harmonize {
108 my ($vals) = @_; 142 my ($vals) = @_;
… …
114 $rem += $_ - $i; 148 $rem += $_ - $i;
115 $_ = $i; 149 $_ = $i;
116 } 150 }
117} 151}
118 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
119############################################################################# 194#############################################################################
120 195
121package CFClient::UI::Base; 196package CFClient::UI::Base;
122 197
123use strict; 198use strict;
… …
126 201
127sub new { 202sub new {
128 my $class = shift; 203 my $class = shift;
129 204
130 my $self = bless { 205 my $self = bless {
131 x => 0, 206 x => "center",
132 y => 0, 207 y => "center",
133 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
134 can_events => 1, 211 can_events => 1,
135 @_ 212 @_
136 }, $class; 213 }, $class;
137 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
138 for (keys %$self) { 217 for (keys %$self) {
139 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
141 } 220 }
142 } 221 }
143 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
144 $self 235 $self
145} 236}
146 237
147sub destroy { 238sub destroy {
148 my ($self) = @_; 239 my ($self) = @_;
… …
157 return if $self->{parent}; 248 return if $self->{parent};
158 249
159 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
160} 251}
161 252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
277
278 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self;
280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
162sub hide { 306sub hide {
163 my ($self) = @_; 307 my ($self) = @_;
164 308
165 return unless $self->{parent}; 309 $self->set_invisible;
166 310
167 $self->{parent}->remove ($self); 311 $self->{parent}->remove ($self)
312 if $self->{parent};
168} 313}
169 314
170sub move { 315sub move_abs {
171 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
172 317
173 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
174 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
175 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
176 321
177 $self->update; 322 $self->update;
178} 323}
179 324
180sub set_size { 325sub set_size {
181 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
182 327
183 $self->{user_w} = $w; 328 $self->{force_w} = $w;
184 $self->{user_h} = $h; 329 $self->{force_h} = $h;
185 330
186 $self->check_size; 331 $self->realloc;
187} 332}
188 333
189sub size_request { 334sub size_request {
190 require Carp; 335 require Carp;
191 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
193 338
194sub configure { 339sub configure {
195 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
196 341
197 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
198 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
199 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
200 347
201 # use alignment to adjust x, y 348 # use alignment to adjust x, y
202 349
203 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
204 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
205
206 ($w, $h) = ($w2, $h2);
207 } 352 }
208 353
209 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
210 $self->{x} = $x; 355 $self->{x} = $x;
211 $self->{y} = $y; 356 $self->{y} = $y;
212 $self->update; 357 $self->update;
213 } 358 }
214 359
215 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
216 $self->{w} = $w; 363 $self->{alloc_w} = $w;
217 $self->{h} = $h; 364 $self->{alloc_h} = $h;
218 365
219 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
220 $self->update;
221 } 367 }
222} 368}
223 369
224sub size_allocate { 370sub size_allocate {
225 # nothing to be done 371 # nothing to be done
226} 372}
227 373
374sub children {
375}
376
228sub set_max_size { 377sub set_max_size {
229 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
230 379
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
233} 382}
234 383
235# return top left coordinates 384sub set_tooltip {
236sub _topleft {
237 my ($self, $x, $y) = @_; 385 my ($self, $tooltip) = @_;
238 386
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
240} 398}
241 399
242# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
243sub coord2local { 401sub coord2local {
244 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
245 403
246 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 405}
249 406
250# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
251sub coord2global { 408sub coord2global {
252 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
253 410
254 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 412}
257 413
258sub focus_in { 414sub focus_in {
259 my ($self) = @_; 415 my ($self) = @_;
260 416
261 return if $FOCUS == $self; 417 return if $FOCUS == $self;
262 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
263 419
264 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
265 421
266 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
267 423
268 $focus->update if $focus; 424 $focus->update if $focus;
269 $FOCUS->update; 425 $FOCUS->update;
270} 426}
271 427
… …
274 430
275 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
276 432
277 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
278 434
279 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
280 436
281 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
282} 441}
283 442
284sub mouse_motion { } 443sub mouse_motion { }
285sub button_up { } 444sub button_up { }
286sub key_down { } 445sub key_down { }
287sub key_up { } 446sub key_up { }
288 447
289sub button_down { 448sub button_down {
290 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
291 450
292 $self->focus_in; 451 $self->focus_in;
… …
295sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
296sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
297sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
298sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
299sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
300 529
301sub draw { 530sub draw {
302 my ($self) = @_; 531 my ($self) = @_;
303 532
304 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
320 glVertex $x + $self->{w}, $y + $self->{h}; 549 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
322 glEnd; 551 glEnd;
323 glDisable GL_BLEND; 552 glDisable GL_BLEND;
324 } 553 }
554
555 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix;
557 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
559 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1;
564 glEnd;
565 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 }
325} 568}
326 569
327sub _draw { 570sub _draw {
328 my ($self) = @_; 571 my ($self) = @_;
329 572
330 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
331} 574}
332 575
333sub find_widget {
334 my ($self, $x, $y) = @_;
335
336 return () unless $self->{can_events};
337
338 return $self
339 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
340 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
341
342 ()
343}
344
345sub set_parent {
346 my ($self, $parent) = @_;
347
348 Scalar::Util::weaken ($self->{parent} = $parent);
349}
350
351sub check_size {
352 my ($self) = @_;
353
354 $self->{parent}
355 or return 1;
356
357 my ($w, $h) = $self->{user_w} && $self->{user_h}
358 ? @$self{qw(user_w user_h)}
359 : $self->size_request;
360
361 if ($w != $self->{req_w} || $h != $self->{req_h}) {
362 $self->{req_w} = $w;
363 $self->{req_h} = $h;
364
365 $self->{parent}->check_size
366 or $self->size_allocate (
367 (List::Util::max $self->{w}, $w),
368 (List::Util::max $self->{h}, $h),
369 );
370
371 1
372 } else {
373 0
374 }
375}
376
377sub update {
378 my ($self) = @_;
379
380 $self->{parent}->update
381 if $self->{parent};
382}
383
384sub connect {
385 my ($self, $signal, $cb) = @_;
386
387 push @{ $self->{signal_cb}{$signal} }, $cb;
388}
389
390sub emit {
391 my ($self, $signal, @args) = @_;
392
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
394 $cb->($self, @args);
395 }
396}
397
398sub DESTROY { 576sub DESTROY {
399 my ($self) = @_; 577 my ($self) = @_;
400 578
579 delete $WIDGET{$self+0};
401 #$self->deactivate; 580 #$self->deactivate;
402} 581}
403 582
404############################################################################# 583#############################################################################
405 584
… …
414 my $class = shift; 593 my $class = shift;
415 594
416 # range [value, low, high, page] 595 # range [value, low, high, page]
417 596
418 $class->SUPER::new ( 597 $class->SUPER::new (
419 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
420 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
421 @_ 600 @_
422 ) 601 )
423} 602}
424 603
425sub _draw { 604sub _draw {
426 my ($self) = @_; 605 my ($self) = @_;
427 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
428 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
429 613
430 glEnable GL_BLEND; 614 glEnable GL_BLEND;
431 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
432 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
433 617
434 glBegin GL_QUADS; 618 glBegin GL_QUADS;
435 glVertex 0 , 0; 619 glVertex 0 , 0;
436 glVertex 0 , $h; 620 glVertex 0 , $h;
437 glVertex $w, $h; 621 glVertex $w, $h;
438 glVertex $w, 0; 622 glVertex $w, 0;
439 glEnd; 623 glEnd;
440 624
441 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
442} 627}
443 628
444############################################################################# 629#############################################################################
445 630
446package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
451 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
452 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
453} 638}
454 639
455sub size_request { 640sub size_request {
456 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
457} 644}
458 645
459sub draw { } 646sub draw { }
460 647
461############################################################################# 648#############################################################################
… …
467sub new { 654sub new {
468 my ($class, %arg) = @_; 655 my ($class, %arg) = @_;
469 656
470 my $children = delete $arg{children} || []; 657 my $children = delete $arg{children} || [];
471 658
472 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 659 my $self = $class->SUPER::new (
660 children => [],
661 can_events => 0,
662 %arg,
663 );
473 $self->add ($_) for @$children; 664 $self->add ($_) for @$children;
474 665
475 $self 666 $self
476} 667}
477 668
478sub add { 669sub add {
479 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
480 671
481 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
482 674
483 use sort 'stable'; 675 use sort 'stable';
484 676
485 $self->{children} = [ 677 $self->{children} = [
486 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
487 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
488 ]; 680 ];
489 681
490 $child->check_size; 682 $self->realloc;
683}
684
685sub children {
686 @{ $_[0]{children} }
491} 687}
492 688
493sub remove { 689sub remove {
494 my ($self, $child) = @_; 690 my ($self, $child) = @_;
495 691
496 delete $child->{parent}; 692 delete $child->{parent};
693 $child->hide;
497 694
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
499 696
500 $self->check_size; 697 $self->realloc;
501 $self->update; 698}
699
700sub clear {
701 my ($self) = @_;
702
703 my $children = delete $self->{children};
704 $self->{children} = [];
705
706 for (@$children) {
707 delete $_->{parent};
708 $_->hide;
709 }
710
711 $self->realloc;
502} 712}
503 713
504sub find_widget { 714sub find_widget {
505 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
506 716
… …
581} 791}
582 792
583sub update { 793sub update {
584 my ($self) = @_; 794 my ($self) = @_;
585 795
586 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
587 $self->render_chld;
588 $self->SUPER::update; 797 $self->SUPER::update;
589}
590
591sub render_chld {
592 my ($self) = @_;
593
594 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595 glClearColor 0, 0, 0, 1;
596 glClear GL_COLOR_BUFFER_BIT;
597 $self->child->draw;
598 };
599} 798}
600 799
601sub size_allocate { 800sub size_allocate {
602 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
603 802
604 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
605 806
807sub _render {
808 $_[0]{children}[0]->draw;
809}
810
811sub render_child {
812 my ($self) = @_;
813
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT;
817
606 $self->render_chld; 818 $self->_render;
819 };
607} 820}
608 821
609sub _draw { 822sub _draw {
610 my ($self) = @_; 823 my ($self) = @_;
611 824
612 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
613 826
614 my $tex = $self->{texture} 827 my $tex = $self->{texture}
615 or return; 828 or return;
616 829
617 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1;
621 833
622 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
623 835
624 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
626} 837}
627 838
628############################################################################# 839#############################################################################
629 840
630package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
631 842
632our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
633
634sub new { die }
635
636sub size_request {
637 my ($self) = @_;
638
639 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
640 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
641
642 @$self{qw(child_w child_h)}
643}
644
645sub _draw {
646 my ($self) = @_;
647
648 $self->{children}[1]->draw;
649}
650
651
652#############################################################################
653
654package CFClient::UI::Frame;
655
656our @ISA = CFClient::UI::Bin::;
657
658use CFClient::OpenGL;
659 844
660sub new { 845sub new {
661 my $class = shift; 846 my $class = shift;
662 847
663 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
664 bg => [1, 1, 1, 1], 849 scroll_x => 0,
665 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
666 border => 0.8,
667 @_ 851 @_,
668 ); 852 )
669
670 $self
671} 853}
672 854
673sub _draw { 855sub size_request {
856 my ($self) = @_;
857
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859
860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
864}
865
866sub size_allocate {
674 my ($self) = @_; 867 my ($self, $w, $h) = @_;
675 868
676 my ($w, $h) = ($self->{w}, $self->{h}); 869 my $child = $self->child;
677 870
678 glEnable GL_BLEND; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
680 glEnable GL_TEXTURE_2D;
681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
682 873
683# glBegin GL_QUADS; 874 $self->child->configure (0, 0, $w, $h);
684# glColor 0, 0, 0, 0; 875 $self->update;
685# glVertex 0 , 0; 876}
686# glVertex 0 , $h;
687# glVertex $w, $h;
688# glVertex $w, 0;
689# glEnd;
690 877
878sub set_offset {
879 my ($self, $x, $y) = @_;
691 880
692 $self->child->draw; 881 $self->{view_x} = int $x;
693 glDisable GL_BLEND; 882 $self->{view_y} = int $y;
694 glDisable GL_TEXTURE_2D; 883
884 $self->update;
885}
886
887# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local {
889 my ($self, $x, $y) = @_;
890
891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
893
894sub coord2global {
895 my ($self, $x, $y) = @_;
896
897 $x = List::Util::min $self->{w}, $x - $self->{view_x};
898 $y = List::Util::min $self->{h}, $y - $self->{view_y};
899
900 $self->SUPER::coord2global ($x, $y)
901}
902
903sub find_widget {
904 my ($self, $x, $y) = @_;
905
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y)
912 }
913}
914
915sub _render {
916 my ($self) = @_;
917
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919
920 $self->SUPER::_render;
695} 921}
696 922
697############################################################################# 923#############################################################################
698 924
699package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
700 926
701our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
702
703use CFClient::OpenGL;
704
705my @tex =
706 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
707 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
708 928
709sub new { 929sub new {
710 my $class = shift; 930 my $class = shift;
711 931
712 # TODO: user_x, user_y, overwrite moveto? 932 my $self;
933
934 my $slider = new CFClient::UI::Slider
935 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]);
939 },
940 ;
941
942 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider,
945 @_,
946 );
947
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider});
951
952 $self
953}
954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976
977#############################################################################
978
979package CFClient::UI::Frame;
980
981our @ISA = CFClient::UI::Bin::;
982
983use CFClient::OpenGL;
984
985sub new {
986 my $class = shift;
987
988 $class->SUPER::new (
989 bg => undef,
990 @_,
991 )
992}
993
994sub _draw {
995 my ($self) = @_;
996
997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
999
1000 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} };
1003
1004 glBegin GL_QUADS;
1005 glVertex 0 , 0;
1006 glVertex 0 , $h;
1007 glVertex $w, $h;
1008 glVertex $w, 0;
1009 glEnd;
1010
1011 glDisable GL_BLEND;
1012 }
1013
1014 $self->SUPER::_draw;
1015}
1016
1017#############################################################################
1018
1019package CFClient::UI::FancyFrame;
1020
1021our @ISA = CFClient::UI::Bin::;
1022
1023use CFClient::OpenGL;
1024
1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032
1033sub new {
1034 my $class = shift;
713 1035
714 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
717 border => 0.8, 1039 border => 0.6,
718 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
719 @_ 1043 @_
720 ); 1044 );
721 1045
722 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
723 align => 0, 1047 align => 0,
724 valign => 1, 1048 valign => 1,
725 text => $self->{title}, 1049 text => $self->{title},
726 fontsize => 1; 1050 fontsize => $self->{border};
727 1051
728 $self 1052 $self
729} 1053}
730 1054
731sub border { 1055sub border {
… …
747 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
748 1072
749 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
750 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
751 1075
752 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
753 if $self->{title}; 1077 if $self->{title};
754 1078
755 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
756} 1080}
757 1081
758sub button_down { 1082sub button_down {
759 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
760 1084
1085 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 1086 my $border = $self->border;
762 1087
763 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
768 1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
1098
769 $self->{motion} = sub { 1099 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
771 1101
772 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
773 1104
774 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
776 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
777 }; 1110 };
778 1111
779 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
784 1115
785 $self->{motion} = sub { 1116 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
787 1118
788 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
789 1120
790 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
791 $self->update;
792 }; 1122 };
793 } 1123 }
794} 1124}
795 1125
796sub button_up { 1126sub button_up {
… …
809 my ($self) = @_; 1139 my ($self) = @_;
810 1140
811 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
812 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
813 1143
814 glEnable GL_BLEND;
815 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
816 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
818 1146
819 my $border = $self->border; 1147 my $border = $self->border;
820 1148
821 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
822 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
826 1154
827 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
828 1157
829 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
831 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
832 1161 $bg->{t} = $ch / $bg->{h};
833 glColor @{ $self->{bg} };
834
835 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
839 1164
840 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND;
842 1166
843 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1168
844 $self->child->draw; 1169 $self->child->draw;
845} 1170}
846 1171
847############################################################################# 1172#############################################################################
848 1173
… …
857sub new { 1182sub new {
858 my $class = shift; 1183 my $class = shift;
859 1184
860 $class->SUPER::new ( 1185 $class->SUPER::new (
861 col_expand => [], 1186 col_expand => [],
862 @_ 1187 @_,
863 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
864} 1193}
865 1194
866sub add { 1195sub add {
867 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
868 1197
869 $child->set_parent ($self); 1198 $child->set_parent ($self);
870 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
871 1200
872 $child->check_size; 1201 $self->realloc;
873} 1202}
874 1203
875# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
876sub clear { 1205sub clear {
877 my ($self) = @_; 1206 my ($self) = @_;
878 1207
1208 my @children = $self->children;
879 delete $self->{children}; 1209 delete $self->{children};
880 $self->update; 1210
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215
1216 $self->realloc;
881} 1217}
882 1218
883sub get_wh { 1219sub get_wh {
884 my ($self) = @_; 1220 my ($self) = @_;
885 1221
… …
916sub size_allocate { 1252sub size_allocate {
917 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
918 1254
919 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
920 1256
921 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
922 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
923 1259
924 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
925 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
926 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
927 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
981 } 1317 }
982} 1318}
983 1319
984############################################################################# 1320#############################################################################
985 1321
986package CFClient::UI::HBox; 1322package CFClient::UI::Box;
987
988# TODO: wrap into common Box base class
989 1323
990our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
991 1325
992sub size_request { 1326sub size_request {
993 my ($self) = @_; 1327 my ($self) = @_;
994 1328
995 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
996 1330 ? (
997 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
998 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
999 (List::Util::max map $_->[1], @alloc), 1333 )
1000 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1001} 1338}
1002 1339
1003sub size_allocate { 1340sub size_allocate {
1004 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1005 1342
1006 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1007
1008 my $children = $self->{children}; 1344 my $children = $self->{children};
1009 1345
1010 my @h = map $_->{req_w}, @$children; 1346 my @req;
1011 1347
1012 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1013 1349 @req = ($space / (@$children || 1)) x @$children;
1014 if ($req_h > $h) {
1015 # ah well, not enough space
1016 $_ *= $h / $req_h for @h;
1017 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1018 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1019 $exp ||= 1;
1020 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1021 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1022 my $child = $children->[$_];
1023
1024 my $alloc_h = $h[$_];
1025 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1026 $h[$_] = $alloc_h;
1027 } 1364 }
1028 } 1365 }
1029 1366
1030 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1031 1368
1032 my $y = 0; 1369 my $pos = 0;
1033 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1034 my $child = $children->[$_];
1035 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1036 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1037 1373
1038 $y += $h; 1374 $pos += $alloc;
1039 } 1375 }
1040 1376
1041 1 1377 1
1042} 1378}
1043 1379
1044############################################################################# 1380#############################################################################
1045 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1046package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1047 1398
1048# TODO: wrap into common Box base class
1049
1050our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1051 1400
1052sub size_request { 1401sub new {
1053 my ($self) = @_; 1402 my $class = shift;
1054 1403
1055 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1056 1405 vertical => 1,
1057 ( 1406 @_,
1058 (List::Util::max map $_->[0], @alloc),
1059 (List::Util::sum map $_->[1], @alloc),
1060 ) 1407 )
1061} 1408}
1062 1409
1063sub size_allocate {
1064 my ($self, $w, $h) = @_;
1065
1066 my $children = $self->{children};
1067
1068 my @h = map $_->{req_h}, @$children;
1069
1070 my $req_h = List::Util::sum @h;
1071
1072 if ($req_h > $h) {
1073 # ah well, not enough space
1074 $_ *= $h / $req_h for @h;
1075 } else {
1076 my $exp = List::Util::sum map $_->{expand}, @$children;
1077 $exp ||= 1;
1078
1079 for (0 .. $#$children) {
1080 my $child = $children->[$_];
1081
1082 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1083 }
1084 }
1085
1086 CFClient::UI::harmonize \@h;
1087
1088 my $y = 0;
1089 for (0 .. $#$children) {
1090 my $child = $children->[$_];
1091 my $h = $h[$_];
1092 $child->configure (0, $y, $w, $h);
1093
1094 $y += $h;
1095 }
1096
1097 1
1098}
1099
1100############################################################################# 1410#############################################################################
1101 1411
1102package CFClient::UI::Label; 1412package CFClient::UI::Label;
1103 1413
1104our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1105 1415
1106use CFClient::OpenGL; 1416use CFClient::OpenGL;
1107 1417
1108sub new { 1418sub new {
1109 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1110 1420
1111 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1113 #font => default_font 1425 #font => default_font
1426 #text => initial text
1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1430 layout => (new CFClient::Layout),
1114 fontsize => 1, 1431 fontsize => 1,
1115 text => "",
1116 align => -1, 1432 align => -1,
1117 valign => -1, 1433 valign => -1,
1118 padding => 2, 1434 padding_x => 2,
1119 layout => new CFClient::Layout, 1435 padding_y => 2,
1120 can_events => 0, 1436 can_events => 0,
1121 %arg 1437 %arg
1122 ); 1438 );
1123 1439
1124 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1125 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1126 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1127 $self->{template} = $layout; 1443 $self->{template} = $layout;
1128 } 1444 }
1129 1445
1130 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1447 $self->set_markup (delete $self->{markup});
1448 } else {
1449 $self->set_text (delete $self->{text});
1450 }
1132 1451
1133 $self 1452 $self
1134} 1453}
1135 1454
1136sub escape_text { 1455sub escape($) {
1137 local $_ = $_[1]; 1456 local $_ = $_[0];
1138 1457
1139 s/&/&amp;/g; 1458 s/&/&amp;/g;
1140 s/>/&gt;/g; 1459 s/>/&gt;/g;
1141 s/</&lt;/g; 1460 s/</&lt;/g;
1142 1461
1143 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
1144} 1470}
1145 1471
1146sub set_text { 1472sub set_text {
1147 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1148 1474
1475 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1149 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1150 1480
1151 delete $self->{texture}; 1481 $self->realloc;
1152 $self->check_size;
1153 $self->update; 1482 $self->update;
1154} 1483}
1155 1484
1156sub set_markup { 1485sub set_markup {
1157 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1158 1487
1488 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup";
1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1159 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1160 1495
1161 delete $self->{texture}; 1496 $self->realloc;
1162 $self->check_size;
1163 $self->update; 1497 $self->update;
1164} 1498}
1165 1499
1166sub size_request { 1500sub size_request {
1167 my ($self) = @_; 1501 my ($self) = @_;
1168 1502
1169 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1170 $self->{layout}->set_width ($self->{max_w} || -1); 1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1171 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1172 1508
1173 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1174 1510
1175 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1180 1516
1181 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1182 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1183 } 1519 }
1184 1520
1185 ( 1521 ($w, $h)
1186 $w + $self->{padding} * 2,
1187 $h + $self->{padding} * 2,
1188 )
1189} 1522}
1190 1523
1191sub size_allocate { 1524sub size_allocate {
1192 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1193 1526
… …
1197sub set_fontsize { 1530sub set_fontsize {
1198 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1199 1532
1200 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1201 delete $self->{texture}; 1534 delete $self->{texture};
1202 $self->check_size; 1535
1203 $self->update; 1536 $self->realloc;
1204} 1537}
1205 1538
1206sub _draw { 1539sub _draw {
1207 my ($self) = @_; 1540 my ($self) = @_;
1208 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1209 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1210 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1211 $self->{layout}->set_width ($self->{w}); 1547 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1212 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1213 new_from_layout CFClient::Texture $self->{layout} 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1553
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5);
1557
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1214 }; 1563 };
1215 1564
1216 glEnable GL_BLEND;
1217 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1218 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1219 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220 1567
1568 if ($tex->{format} == GL_ALPHA) {
1221 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1222
1223 $self->{ox} = int (
1224 $self->{align} < 0 ? $self->{padding}
1225 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1226 : ($self->{w} - $tex->{w}) * 0.5
1227 );
1228
1229 $self->{oy} = int (
1230 $self->{valign} < 0 ? $self->{padding}
1231 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1232 : ($self->{h} - $tex->{h}) * 0.5
1233 );
1234
1235 $tex->draw_quad ($self->{ox}, $self->{oy}); 1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1236 1574
1237 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND;
1239} 1576}
1240 1577
1241############################################################################# 1578#############################################################################
1242 1579
1243package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1248 1585
1249sub new { 1586sub new {
1250 my $class = shift; 1587 my $class = shift;
1251 1588
1252 $class->SUPER::new ( 1589 $class->SUPER::new (
1253 fg => [1, 1, 1], 1590 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1591 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1592 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1257 can_hover => 1, 1594 can_hover => 1,
1258 can_focus => 1, 1595 can_focus => 1,
1259 valign => 0, 1596 valign => 0,
1260 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1261 @_ 1599 @_
1262 ) 1600 )
1263} 1601}
1264 1602
1265sub _set_text { 1603sub _set_text {
… …
1275 $self->{text} = $text; 1613 $self->{text} = $text;
1276 1614
1277 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1278 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1279 1617
1280 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1619}
1620
1621sub set_text {
1622 my ($self, $text) = @_;
1623
1624 $self->{cursor} = length $text;
1625 $self->_set_text ($text);
1626
1627 $self->realloc;
1281} 1628}
1282 1629
1283sub get_text { 1630sub get_text {
1284 $_[0]{text} 1631 $_[0]{text}
1285} 1632}
… …
1288 my ($self) = @_; 1635 my ($self) = @_;
1289 1636
1290 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1291 1638
1292 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1299}
1300
1301sub set_text {
1302 my ($self, $text) = @_;
1303
1304 $self->{cursor} = length $text;
1305 $self->_set_text ($text);
1306 $self->update;
1307} 1640}
1308 1641
1309sub key_down { 1642sub key_down {
1310 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1311 1644
… …
1313 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1314 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1315 1648
1316 my $text = $self->get_text; 1649 my $text = $self->get_text;
1317 1650
1318 if ($sym == 8) { 1651 if ($uni == 8) {
1319 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1320 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1321 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1322 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1323 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1324 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1325 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1326 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1327 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1328 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1329 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1330 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1331 $self->emit ('escape'); 1664 $self->_emit ('escape');
1332 } elsif ($uni) { 1665 } elsif ($uni) {
1333 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1334 } 1667 }
1335 1668
1336 $self->_set_text ($text); 1669 $self->_set_text ($text);
1337 $self->update; 1670
1671 $self->realloc;
1338} 1672}
1339 1673
1340sub focus_in { 1674sub focus_in {
1341 my ($self) = @_; 1675 my ($self) = @_;
1342 1676
… …
1418 my ($self, $ev) = @_; 1752 my ($self, $ev) = @_;
1419 1753
1420 my $sym = $ev->{sym}; 1754 my $sym = $ev->{sym};
1421 1755
1422 if ($sym == 13) { 1756 if ($sym == 13) {
1757 unshift @{$self->{history}},
1758 my $txt = $self->get_text;
1759 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = '';
1423 $self->emit (activate => $self->get_text); 1761 $self->_emit (activate => $txt);
1424 $self->update; 1762 $self->update;
1763
1764 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text;
1767 }
1768 if (@{$self->{history} || []} > 0) {
1769 $self->{history_pointer}++;
1770 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1771 $self->{history_pointer} = @{$self->{history} || []} - 1;
1772 }
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 }
1775
1776 } elsif ($sym == CFClient::SDLK_DOWN) {
1777 $self->{history_pointer}--;
1778 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779
1780 if ($self->{history_pointer} >= 0) {
1781 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1782 } else {
1783 $self->set_text ($self->{history_saveback});
1784 }
1425 1785
1426 } else { 1786 } else {
1427 $self->SUPER::key_down ($ev); 1787 $self->SUPER::key_down ($ev);
1428 } 1788 }
1429 1789
… …
1443 1803
1444sub new { 1804sub new {
1445 my $class = shift; 1805 my $class = shift;
1446 1806
1447 $class->SUPER::new ( 1807 $class->SUPER::new (
1448 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1449 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1452 can_hover => 1, 1812 can_hover => 1,
1453 align => 0, 1813 align => 0,
1454 valign => 0, 1814 valign => 0,
1455 can_events => 1, 1815 can_events => 1,
1456 @_ 1816 @_
1457 ) 1817 )
1458} 1818}
1459 1819
1820sub activate { }
1821
1460sub button_up { 1822sub button_up {
1461 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1462 1824
1825 $self->emit ("activate")
1463 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1464 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1465 $self->emit ("activate");
1466 }
1467} 1828}
1468 1829
1469sub _draw { 1830sub _draw {
1470 my ($self) = @_; 1831 my ($self) = @_;
1471 1832
… …
1473 1834
1474 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1475 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1476 } 1837 }
1477 1838
1478 glEnable GL_BLEND;
1479 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1483 1842
1484 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485 1844
1486 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1487 glDisable GL_BLEND;
1488 1846
1489 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1490} 1848}
1491 1849
1492############################################################################# 1850#############################################################################
… …
1503 1861
1504sub new { 1862sub new {
1505 my $class = shift; 1863 my $class = shift;
1506 1864
1507 $class->SUPER::new ( 1865 $class->SUPER::new (
1508 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1509 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1510 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1870 bg => [0, 0, 0, 0.2],
1871 active_bg => [1, 1, 1, 0.5],
1511 state => 0, 1872 state => 0,
1512 can_hover => 1, 1873 can_hover => 1,
1513 @_ 1874 @_
1514 ) 1875 )
1515} 1876}
1516 1877
1517sub size_request { 1878sub size_request {
1518 my ($self) = @_; 1879 my ($self) = @_;
1519 1880
1520 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1521} 1882}
1522 1883
1523sub button_down { 1884sub button_down {
1524 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1525 1886
1526 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1527 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1528 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1529 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1530 } 1891 }
1531} 1892}
1532 1893
1533sub _draw { 1894sub _draw {
1534 my ($self) = @_; 1895 my ($self) = @_;
1535 1896
1536 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1537 1898
1538 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1539 1900
1540 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1541 1904
1542 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543 1906
1544 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1545 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547
1548 my $tex = $self->{state} ? $tex[1] : $tex[0];
1549
1550 $tex->draw_quad (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1551
1552 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1553 glDisable GL_BLEND;
1554} 1912}
1555 1913
1556############################################################################# 1914#############################################################################
1557 1915
1558package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1601 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1602 1960
1603 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1604 } 1962 }
1605 1963
1606 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610 1966
1611 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1612 1968
1613 glDisable GL_BLEND;
1614 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1615} 1970}
1616 1971
1617############################################################################# 1972#############################################################################
1618 1973
… …
1666} 2021}
1667 2022
1668sub set_max { 2023sub set_max {
1669 my ($self, $max) = @_; 2024 my ($self, $max) = @_;
1670 2025
2026 return if $self->{max_val} == $max;
2027
1671 $self->{max_val} = $max; 2028 $self->{max_val} = $max;
2029 $self->update;
1672} 2030}
1673 2031
1674sub set_value { 2032sub set_value {
1675 my ($self, $val, $max) = @_; 2033 my ($self, $val, $max) = @_;
1676 2034
1677 $self->set_max ($max) 2035 $self->set_max ($max)
1678 if defined $max; 2036 if defined $max;
1679 2037
1680 $max = $self->{max_val}; 2038 return if $self->{val} == $val;
2039
1681 $self->{val} = $val; 2040 $self->{val} = $val;
1682
1683 $self->update; 2041 $self->update;
1684} 2042}
1685 2043
1686sub _draw { 2044sub _draw {
1687 my ($self) = @_; 2045 my ($self) = @_;
… …
1750 2108
1751sub new { 2109sub new {
1752 my ($class, %arg) = @_; 2110 my ($class, %arg) = @_;
1753 2111
1754 my $self = $class->SUPER::new ( 2112 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 2113 tooltip => $arg{type},
2114 can_hover => 1,
1756 can_events => 1, 2115 can_events => 1,
1757 can_hover => 1,
1758 %arg, 2116 %arg,
1759 ); 2117 );
1760 2118
1761 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1762 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2120 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1770 2128
1771 $self->{value}->set_fontsize ($fsize); 2129 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 2130 $self->{max} ->set_fontsize ($fsize);
1773} 2131}
1774 2132
2133sub set_max {
2134 my ($self, $max) = @_;
2135
2136 $self->{gauge}->set_max ($max);
2137 $self->{max}->set_text ($max);
2138}
2139
1775sub set_value { 2140sub set_value {
1776 my ($self, $val, $max) = @_; 2141 my ($self, $val, $max) = @_;
1777 2142
1778 $self->set_max ($max) 2143 $self->set_max ($max)
1779 if defined $max; 2144 if defined $max;
1780 2145
1781 $self->{gauge}->set_value ($val, $max); 2146 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 2147 $self->{value}->set_text ($val);
1783}
1784
1785sub set_max {
1786 my ($self, $max) = @_;
1787
1788 $self->{gauge}->set_max ($max);
1789 $self->{max}->set_text ($max);
1790} 2148}
1791 2149
1792############################################################################# 2150#############################################################################
1793 2151
1794package CFClient::UI::Slider; 2152package CFClient::UI::Slider;
… …
1804 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1805 2163
1806sub new { 2164sub new {
1807 my $class = shift; 2165 my $class = shift;
1808 2166
1809 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1810 2168
1811 # TODO: 0-width page 2169 # TODO: 0-width page
1812 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1813 # TODO: calculations are off 2171 # TODO: calculations are off
1814 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1815 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1816 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2175 bg => [0, 0, 0, 0.2],
2176 active_bg => [1, 1, 1, 0.5],
1817 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1818 req_w => 20, 2178 min_w => $::WIDTH / 80,
1819 req_h => 20, 2179 min_h => $::WIDTH / 80,
1820 vertical => 0, 2180 vertical => 0,
1821 can_hover => 1, 2181 can_hover => 1,
1822 inner_pad => 5, 2182 inner_pad => 0.02,
1823 @_ 2183 @_
1824 ); 2184 );
1825 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1826 $self 2189 $self
1827} 2190}
1828 2191
2192sub changed { }
2193
2194sub set_range {
2195 my ($self, $range) = @_;
2196
2197 ($range, $self->{range}) = ($self->{range}, $range);
2198
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2201}
2202
2203sub set_value {
2204 my ($self, $value) = @_;
2205
2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2207
2208 $hi = $lo + 1 if $hi <= $lo;
2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2212 $value = $lo if $value < $lo;
2213 $value = $hi - $page if $value > $hi - $page;
2214
2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2216 if $unit;
2217
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219
2220 if ($value != $old_value) {
2221 $self->_emit (changed => $value);
2222 $self->update;
2223 }
2224}
2225
1829sub size_request { 2226sub size_request {
1830 my ($self) = @_; 2227 my ($self) = @_;
1831 2228
1832 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1833 my $h = $self->{req_h};
1834
1835 $self->{vertical} ? ($h, $w) : ($w, $h)
1836} 2230}
1837 2231
1838sub button_down { 2232sub button_down {
1839 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1840 2234
1841 $self->SUPER::button_down ($ev, $x, $y); 2235 $self->SUPER::button_down ($ev, $x, $y);
2236
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238
1842 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1843} 2240}
1844 2241
1845sub mouse_motion { 2242sub mouse_motion {
1846 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1847 2244
1848 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247
2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2253 }
2254}
2255
2256sub update {
2257 my ($self) = @_;
2258
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2260 $self->set_value ($self->{range}[0]);
2261
1849 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1850 2264
1851 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1852 2266
1853 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1854 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1855 2269
1856 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
1857 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
1858 $x = $lo if $x < $lo;
1859 $x = $hi - $page if $x > $hi - $page;
1860 $self->{range}[0] = $x;
1861 2272
1862 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
1863 $self->update; 2274 $self->{knob_w} = $knob_w;
1864 } 2275 });
1865}
1866 2276
1867# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
1868# so that the handle doesn't leave the texture. This calculation isn't 100%
1869# correct propably, but it does the job for now
1870sub _calc_inner_pad_px {
1871 my ($self, $w) = @_;
1872 ($w / 100) * $self->{inner_pad} # % to pixels
1873} 2278}
1874 2279
1875sub _draw { 2280sub _draw {
1876 my ($self) = @_; 2281 my ($self) = @_;
1877 2282
1878 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
1879 2284
1880 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
1881 2286
1882 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
1883 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
1884 2289
2290 glTranslate 1, 0, 0;
1885 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
1886 glTranslate 0, -$self->{w}, 0;
1887
1888 ($w, $h) = ($h, $w);
1889 } 2292 }
1890 2293
1891 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1892 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1893 2296
1894 my ($value, $lo, $hi, $page) = @{$self->{range}};
1895
1896 $hi = $value + 1 if $lo == $hi;
1897
1898 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1899 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1900
1901 $page = int $page * $inner_w / ($hi - $lo);
1902 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1903
1904 $w -= $page;
1905 $page &= ~1;
1906 glTranslate $page * 0.5, 0, 0;
1907 $page ||= 2;
1908
1909 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1910 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1911
1912 glEnable GL_BLEND;
1913 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1914 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
1915 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1916 2299
1917 # draw background 2300 # draw background
1918 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1919 2302
1920 # draw handle 2303 # draw handle
1921 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2304 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1922 2305
1923 glDisable GL_BLEND;
1924 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
1925} 2307}
2308
2309#############################################################################
2310
2311package CFClient::UI::ValSlider;
2312
2313our @ISA = CFClient::UI::HBox::;
2314
2315sub new {
2316 my ($class, %arg) = @_;
2317
2318 my $range = delete $arg{range};
2319
2320 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift },
2324 from_value => sub { shift },
2325 %arg,
2326 );
2327
2328 $self->{slider}->connect (changed => sub {
2329 my ($self, $value) = @_;
2330 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2331 $self->{parent}->emit (changed => $value);
2332 });
2333
2334# $self->{entry}->connect (changed => sub {
2335# my ($self, $value) = @_;
2336# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2337# $self->{parent}->emit (changed => $value);
2338# });
2339
2340 $self->add ($self->{slider}, $self->{entry});
2341
2342 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2343
2344 $self
2345}
2346
2347sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) }
1926 2349
1927############################################################################# 2350#############################################################################
1928 2351
1929package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
1930 2353
… …
1934 2357
1935sub new { 2358sub new {
1936 my $class = shift; 2359 my $class = shift;
1937 2360
1938 my $self = $class->SUPER::new ( 2361 my $self = $class->SUPER::new (
1939 fontsize => 1, 2362 fontsize => 1,
2363 can_events => 0,
1940 #font => default_font 2364 #font => default_font
1941 @_, 2365 @_,
1942 2366
1943 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
1944 par => [], 2368 par => [],
1945 height => 0, 2369 height => 0,
1946 children => [ 2370 children => [
1947 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
1949 ], 2373 ],
1950 ); 2374 );
1951 2375
1952 $self->{children}[1]->connect (changed => sub { 2376 $self->{children}[1]->connect (changed => sub { $self->update });
1953 $self->update;
1954 });
1955 2377
1956 $self 2378 $self
1957} 2379}
1958 2380
1959sub set_fontsize { 2381sub set_fontsize {
1960 my ($self, $fontsize) = @_; 2382 my ($self, $fontsize) = @_;
1961 2383
1962 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
1963 $self->reflow; 2385 $self->reflow;
1964}
1965
1966sub text_height {
1967 my ($self, $text) = @_;
1968
1969 my $layout = $self->{layout};
1970
1971 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1972 $layout->set_width ($self->{w});
1973 $layout->set_text ($text);
1974
1975 ($layout->size)[1]
1976}
1977
1978sub reflow {
1979 my ($self) = @_;
1980
1981 $self->{need_reflow}++;
1982 $self->update;
1983} 2386}
1984 2387
1985sub size_allocate { 2388sub size_allocate {
1986 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
1987 2390
… …
1992 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
1993 2396
1994 $self->reflow; 2397 $self->reflow;
1995} 2398}
1996 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
1997sub add_paragraph { 2434sub add_paragraph {
1998 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
1999 2436
2000 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2001 2438 my ($w, $h) = $self->text_size ($line);
2002 my $height = $self->text_height ($text);
2003
2004 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2005 2442
2006 push @{$self->{par}}, [$height, $color, $text];
2007
2008 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2009 $self->{children}[1]->update;
2010} 2444}
2011 2445
2012sub update { 2446sub update {
2013 my ($self) = @_; 2447 my ($self) = @_;
2014 2448
… …
2016 2450
2017 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2018 2452
2019 delete $self->{texture}; 2453 delete $self->{texture};
2020 2454
2021 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2022 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2023 my $height = 0; 2459 my $height = 0;
2024 2460
2025 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2026 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2027 2476
2028 $self->{height} = $height; 2477 $self->{height} = $height;
2029 2478
2030 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2031 2480
2032 delete $self->{texture}; 2481 delete $self->{texture};
2033 } 2482 }
2034 2483
2035 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2036 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2038 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2039 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2041 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043
2044 my $top = int $self->{children}[1]{range}[0];
2045
2046 my $y0 = $top;
2047 my $y1 = $top + $self->{h};
2048
2049 my $y = 0;
2050
2051 my $layout = $self->{layout};
2052
2053 $layout->set_font ($self->{font}) if $self->{font};
2054 2502
2055 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2056 my $h = $par->[0]; 2504 my $h = $par->[1];
2057 2505
2058 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2059 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2060 2510
2061 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2062 my ($W, $H) = $layout->size; 2512
2063 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2064 } 2515 }
2065 2516
2066 $y += $h; 2517 $y += $h;
2067 } 2518 }
2068 2519
2069 glDisable GL_TEXTURE_2D;
2070 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2071 }; 2521 };
2072 }); 2522 });
2073} 2523}
2074 2524
2075sub _draw { 2525sub _draw {
2076 my ($self) = @_; 2526 my ($self) = @_;
2077 2527
2078 if ($self->{texture}) {
2079 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2080 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1;
2081 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2082 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2083 }
2084 2533
2085 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2086 2535
2087} 2536}
2088 2537
… …
2136 2585
2137sub new { 2586sub new {
2138 my $class = shift; 2587 my $class = shift;
2139 2588
2140 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2141 state => 0, 2590 state => 0,
2142 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2592 @_
2145 ); 2593 );
2146 2594
2147 if ($self->{state}) {
2148 $self->{state} = 0;
2149 $self->toggle_flopper;
2150 }
2151
2152 $self 2595 $self
2153} 2596}
2154 2597
2155sub toggle_flopper { 2598sub toggle_flopper {
2156 my ($self) = @_; 2599 my ($self) = @_;
2157 2600
2158 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2159 if ($self->{state} = !$self->{state}) {
2160 $CFClient::UI::ROOT->add ($self->{other});
2161 $self->{other}->move ($self->coord2global (0, $self->{h}));
2162 $self->emit ("open");
2163 } else {
2164 $CFClient::UI::ROOT->remove ($self->{other});
2165 $self->emit ("close");
2166 }
2167
2168 $self->emit (changed => $self->{state});
2169} 2602}
2170 2603
2171############################################################################# 2604#############################################################################
2172 2605
2173package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2183 @_, 2616 @_,
2184 can_events => 0, 2617 can_events => 0,
2185 ) 2618 )
2186} 2619}
2187 2620
2188sub set_text { 2621sub set_tooltip_from {
2189 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2190 2623
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 my $tooltip = $widget->{tooltip};
2192 $self->{label}->set_text ($text); 2625
2193 $self->add ($self->{label}); 2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2633 $self->add (new CFClient::UI::Label
2634 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8,
2637 fg => [0, 0, 0, 1],
2638 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 );
2194} 2641}
2195 2642
2196sub size_request { 2643sub size_request {
2197 my ($self) = @_; 2644 my ($self) = @_;
2198 2645
2199 $self->child->set_max_size ($::WIDTH * 0.3);
2200
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2647
2203 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2204} 2649}
2205 2650
2651sub size_allocate {
2652 my ($self, $w, $h) = @_;
2653
2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2673}
2674
2206sub _draw { 2675sub _draw {
2207 my ($self) = @_; 2676 my ($self) = @_;
2208 2677
2209 glPushMatrix;
2210 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2211 2679
2212 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2213 2681
2214 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2225 glVertex 0 , $h; 2693 glVertex 0 , $h;
2226 glVertex $w, $h; 2694 glVertex $w, $h;
2227 glVertex $w, 0; 2695 glVertex $w, 0;
2228 glEnd; 2696 glEnd;
2229 2697
2230 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2231 2699
2232 glTranslate 2, 2;
2233 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2234} 2701}
2235 2702
2236############################################################################# 2703#############################################################################
2237 2704
2705package CFClient::UI::Face;
2706
2707our @ISA = CFClient::UI::Base::;
2708
2709use CFClient::OpenGL;
2710
2711sub new {
2712 my $class = shift;
2713
2714 my $self = $class->SUPER::new (
2715 aspect => 1,
2716 can_events => 0,
2717 @_,
2718 );
2719
2720 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self);
2722
2723 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1,
2726 interval => $self->{animspeed},
2727 cb => sub {
2728 ++$widget->{frame};
2729 $widget->update;
2730 },
2731 );
2732 }
2733
2734 $self
2735}
2736
2737sub size_request {
2738 (32, 8)
2739}
2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2749sub _draw {
2750 my ($self) = @_;
2751
2752 return unless $::CONN;
2753
2754 my $face;
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764
2765 if ($tex) {
2766 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D;
2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2781}
2782
2783#############################################################################
2784
2785package CFClient::UI::Inventory;
2786
2787our @ISA = CFClient::UI::ScrolledWindow::;
2788
2789sub new {
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824
2825#############################################################################
2826
2827package CFClient::UI::Menu;
2828
2829our @ISA = CFClient::UI::FancyFrame::;
2830
2831use CFClient::OpenGL;
2832
2833sub new {
2834 my $class = shift;
2835
2836 my $self = $class->SUPER::new (
2837 items => [],
2838 z => 100,
2839 @_,
2840 );
2841
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843
2844 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item;
2846
2847 # handle various types of items, only text for now
2848 if (!ref $widget) {
2849 $widget = new CFClient::UI::Label
2850 can_hover => 1,
2851 can_events => 1,
2852 text => $widget;
2853 }
2854
2855 $self->{item}{$widget} = $item;
2856
2857 $self->{vbox}->add ($widget);
2858 }
2859
2860 $self
2861}
2862
2863# popup given the event (must be a mouse button down event currently)
2864sub popup {
2865 my ($self, $ev) = @_;
2866
2867 $self->_emit ("popdown");
2868
2869 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self;
2871 $self->{button} = $ev->{button};
2872
2873 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875}
2876
2877sub mouse_motion {
2878 my ($self, $ev, $x, $y) = @_;
2879
2880 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER};
2883}
2884
2885sub button_up {
2886 my ($self, $ev, $x, $y) = @_;
2887
2888 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB;
2890 $self->hide;
2891
2892 $self->_emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover};
2894 }
2895}
2896
2897#############################################################################
2898
2899package CFClient::UI::Statusbox;
2900
2901our @ISA = CFClient::UI::VBox::;
2902
2903sub new {
2904 my $class = shift;
2905
2906 $class->SUPER::new (
2907 fontsize => 0.8,
2908 @_,
2909 )
2910}
2911
2912sub reorder {
2913 my ($self) = @_;
2914 my $NOW = time;
2915
2916 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 }
2919
2920 my @widgets;
2921
2922 my @items = sort {
2923 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} };
2926
2927 my $count = 10 + 1;
2928 for my $item (@items) {
2929 last unless --$count;
2930
2931 push @widgets, $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text};
2936
2937 for ($short) {
2938 s/^\s+//;
2939 s/\s+/ /g;
2940 }
2941
2942 new CFClient::UI::Label
2943 markup => $short,
2944 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg},
2950 can_events => 1,
2951 can_hover => 1
2952 };
2953 }
2954
2955 $self->clear;
2956 $self->SUPER::add (reverse @widgets);
2957}
2958
2959sub add {
2960 my ($self, $text, %arg) = @_;
2961
2962 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2966
2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2968
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970
2971 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) {
2973 $item->{count}++;
2974 } else {
2975 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text;
2977 }
2978 $item->{id} = ++$self->{id};
2979 $item->{timeout} = $timeout;
2980 delete $item->{label};
2981 } else {
2982 $self->{item}{$group} = {
2983 id => ++$self->{id},
2984 text => $text,
2985 timeout => $timeout,
2986 tooltip => $text,
2987 fg => [0.8, 0.8, 0.8, 0.8],
2988 pri => 0,
2989 count => 1,
2990 %arg,
2991 };
2992 }
2993
2994 $self->reorder;
2995}
2996
2997sub reconfigure {
2998 my ($self) = @_;
2999
3000 delete $_->{label}
3001 for values %{ $self->{item} || {} };
3002
3003 $self->reorder;
3004 $self->SUPER::reconfigure;
3005}
3006
3007#############################################################################
3008
2238package CFClient::UI::Root; 3009package CFClient::UI::Root;
2239 3010
2240our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2241 3012
2242use CFClient::OpenGL; 3013use CFClient::OpenGL;
2243 3014
2244sub check_size { 3015sub new {
2245 my ($self) = @_; 3016 my $class = shift;
2246 3017
2247 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3018 my $self = $class->SUPER::new (
3019 visible => 1,
3020 @_,
3021 );
3022
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self
2248} 3026}
2249 3027
2250sub size_request { 3028sub size_request {
2251 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
2252}
2253 3030
2254sub configure { 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
3046}
3047
3048sub size_allocate {
2255 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2256 3050
2257 $self->SUPER::configure ($x, $y, $w, $h);
2258
2259 for my $child (@{$self->{children}}) { 3051 for my $child ($self->children) {
2260 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2261 3053
2262 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2263 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3055 $Y = $child->{force_y} if exists $child->{force_y};
3056
3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
2264 $child->configure ($X, $Y, $W,$H); 3060 $child->configure ($X, $Y, $W, $H);
2265 } 3061 }
2266} 3062}
2267 3063
2268sub _topleft { 3064sub coord2local {
2269 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2270 3066
2271 ($x, $y) 3067 ($x, $y)
2272} 3068}
2273 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2274sub update { 3076sub update {
2275 my ($self) = @_; 3077 my ($self) = @_;
2276 3078
2277 $self->check_size; 3079 $::WANT_REFRESH++;
2278 ::refresh ();
2279} 3080}
2280 3081
2281sub add { 3082sub add {
2282 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2283 3084
2284 # integerize window positions 3085 $_->{is_toplevel} = 1
2285 $child->{x} = int $child->{x}; 3086 for @children;
2286 $child->{y} = int $child->{y};
2287 3087
2288 $self->SUPER::add ($child); 3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2289} 3104}
2290 3105
2291sub on_refresh { 3106sub on_refresh {
2292 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2293 3108
2294 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2295} 3110}
2296 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2297sub draw { 3118sub draw {
2298 my ($self) = @_; 3119 my ($self) = @_;
2299 3120
2300 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2301 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2302 } 3124 }
3125
3126 if ($self->{realloc}) {
3127 my @queue;
3128
3129 while () {
3130 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach
3132
3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3137 }
3138
3139 my $widget = pop @queue || last;
3140
3141 $widget->{visible} or last; # do not resize invisible widgets
3142
3143 my ($w, $h) = $widget->size_request;
3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3167 }
3168 }
3169
3170 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0;
3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h);
3190 }
3191 }
3192 }
3193
3194 while ($self->{post_alloc_hook}) {
3195 $_->()
3196 for values %{delete $self->{post_alloc_hook}};
3197 }
3198
2303 3199
2304 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2305 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2306 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2307 3203
2308 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2309 glLoadIdentity; 3205 glLoadIdentity;
2310 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2311 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2312 glLoadIdentity; 3208 glLoadIdentity;
2313 3209
2314 $self->_draw; 3210 $self->_draw;
2315} 3211}
… …
2317############################################################################# 3213#############################################################################
2318 3214
2319package CFClient::UI; 3215package CFClient::UI;
2320 3216
2321$ROOT = new CFClient::UI::Root; 3217$ROOT = new CFClient::UI::Root;
2322$TOOLTIP = new CFClient::UI::Tooltip; 3218$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2323 3219
23241 32201
2325 3221

Diff Legend

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