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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

… …
9use CFClient; 9use CFClient;
10use CFClient::Texture; 10use CFClient::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT;
14our $ROOT; 15our $ROOT;
15our $TOOLTIP; 16our $TOOLTIP;
16our $BUTTON_STATE; 17our $BUTTON_STATE;
17 18
18our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
19 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}
43
20sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
21 if (!$GRAB) { 47 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
26 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
27 54
28 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
29 56
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 58
32 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 60 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
… …
153sub rescale_widgets { 171sub rescale_widgets {
154 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
155 173
156 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
166 } 189 }
167 } 190 }
168 191
169 reconfigure_widgets; 192 reconfigure_widgets;
170} 193}
… …
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
… …
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub show_centered { 254sub set_visible {
217 my ($self) = @_; 255 my ($self) = @_;
256
218 return if $self->{parent}; 257 return if $self->{visible};
219 258
220 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
221 261
222 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 263
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
225 }, 265
226 ); 266 $_->set_visible for $self->children;
227} 267}
228 268
229sub set_invisible { 269sub set_invisible {
230 my ($self) = @_; 270 my ($self) = @_;
231 271
232 # broken show/hide model 272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
233 275
234 delete $self->{root}; 276 delete $self->{root};
235 delete $self->{visible}; 277 delete $self->{visible};
236 278
237 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
239 281
240 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
242 284
243 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
244} 305}
245 306
246sub hide { 307sub hide {
247 my ($self) = @_; 308 my ($self) = @_;
248 309
… …
250 311
251 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
252 if $self->{parent}; 313 if $self->{parent};
253} 314}
254 315
255sub move { 316sub move_abs {
256 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
257 318
258 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
259 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
260 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
261 322
262 $self->update; 323 $self->update;
263} 324}
264 325
265sub set_size { 326sub set_size {
266 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
267 328
268 $self->{user_w} = $w; 329 $self->{force_w} = $w;
269 $self->{user_h} = $h; 330 $self->{force_h} = $h;
270 331
271 $self->check_size; 332 $self->realloc;
272} 333}
273 334
274sub size_request { 335sub size_request {
275 require Carp; 336 require Carp;
276 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
278 339
279sub configure { 340sub configure {
280 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
281 342
282 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
283 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
284 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
285 348
286 # use alignment to adjust x, y 349 # use alignment to adjust x, y
287 350
288 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
289 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
290
291 ($w, $h) = ($w2, $h2);
292 } 353 }
293 354
294 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
295 $self->{x} = $x; 356 $self->{x} = $x;
296 $self->{y} = $y; 357 $self->{y} = $y;
297 $self->update; 358 $self->update;
298 } 359 }
299 360
300 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
301 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
302 } 368 }
303} 369}
304 370
305sub size_allocate { 371sub size_allocate {
306 # nothing to be done 372 # nothing to be done
307} 373}
308 374
309sub reconfigure {
310 my ($self) = @_;
311
312 $self->check_size (1);
313 $self->update;
314}
315
316sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
317} 381}
318 382
319sub set_max_size { 383sub set_max_size {
320 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
321 385
… …
380 444
381 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
382 unless $FOCUS; 446 unless $FOCUS;
383} 447}
384 448
385sub mouse_motion { } 449sub mouse_motion { 0 }
386sub button_up { } 450sub button_up { 0 }
387sub key_down { } 451sub key_down { 0 }
388sub key_up { } 452sub key_up { 0 }
389 453
390sub button_down { 454sub button_down {
391 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
392 456
393 $self->focus_in; 457 $self->focus_in;
394}
395 458
396sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
397sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
398sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
399sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
400sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
401 535
402sub draw { 536sub draw {
403 my ($self) = @_; 537 my ($self) = @_;
404 538
405 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
406 550
407 glPushMatrix; 551 glPushMatrix;
408 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
409 $self->_draw;
410 glPopMatrix;
411 553
412 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
413 my ($x, $y) = @$self{qw(x y)};
414
415 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
416 glEnable GL_BLEND; 556 glEnable GL_BLEND;
417 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
418 glBegin GL_QUADS; 558 glBegin GL_QUADS;
419 glVertex $x , $y; 559 glVertex 0 , 0;
420 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
421 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
422 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
423 glEnd; 563 glEnd;
424 glDisable GL_BLEND; 564 glDisable GL_BLEND;
425 } 565 }
426 566
427 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
428 glPushMatrix; 568 glPushMatrix;
429 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
431 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
432 glVertex 0 , 0; 572 glVertex 0 , 0;
433 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
434 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
435 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
436 glEnd; 576 glEnd;
437 glPopMatrix; 577 glPopMatrix;
438 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
439 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
440} 583}
441 584
442sub _draw { 585sub _draw {
443 my ($self) = @_; 586 my ($self) = @_;
444 587
445 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
446}
447
448sub find_widget {
449 my ($self, $x, $y) = @_;
450
451 return () unless $self->{can_events};
452
453 return $self
454 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
455 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
456
457 ()
458}
459
460sub set_parent {
461 my ($self, $parent) = @_;
462
463 Scalar::Util::weaken ($self->{parent} = $parent);
464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
468 # TODO: req_w _does_change after ->reconfigure
469 $self->check_size
470 unless exists $self->{req_w};
471
472 $self->show;
473}
474
475sub check_size {
476 my ($self, $forced) = @_;
477
478 $self->{force_alloc} = 1 if $forced;
479 $CFClient::UI::ROOT->{check_size}{$self} = $self;
480}
481
482sub update {
483 my ($self) = @_;
484
485 $self->{parent}->update
486 if $self->{parent};
487}
488
489sub connect {
490 my ($self, $signal, $cb) = @_;
491
492 push @{ $self->{signal_cb}{$signal} }, $cb;
493}
494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
501sub emit {
502 my ($self, $signal, @args) = @_;
503
504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
506} 589}
507 590
508sub DESTROY { 591sub DESTROY {
509 my ($self) = @_; 592 my ($self) = @_;
510 593
… …
542 625
543 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
544 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
545 628
546 glEnable GL_BLEND; 629 glEnable GL_BLEND;
547 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
548 glColor @$color; 631 glColor_premultiply @$color;
549 632
550 glBegin GL_QUADS; 633 glBegin GL_QUADS;
551 glVertex 0 , 0; 634 glVertex 0 , 0;
552 glVertex 0 , $h; 635 glVertex 0 , $h;
553 glVertex $w, $h; 636 glVertex $w, $h;
… …
568 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
569 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
570} 653}
571 654
572sub size_request { 655sub size_request {
573 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
574} 659}
575 660
576sub draw { } 661sub draw { }
577 662
578############################################################################# 663#############################################################################
… …
582our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
583 668
584sub new { 669sub new {
585 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
586 671
587 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
588 673
589 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
590 children => [], 675 children => [],
591 can_events => 0, 676 can_events => 0,
592 %arg, 677 %arg,
593 ); 678 );
679
594 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
595 682
596 $self 683 $self
597} 684}
598 685
599sub add { 686sub add {
… …
607 $self->{children} = [ 694 $self->{children} = [
608 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
609 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
610 ]; 697 ];
611 698
612 $self->check_size (1); 699 $self->realloc;
613 $self->update;
614} 700}
615 701
616sub children { 702sub children {
617 @{ $_[0]{children} } 703 @{ $_[0]{children} }
618} 704}
… …
623 delete $child->{parent}; 709 delete $child->{parent};
624 $child->hide; 710 $child->hide;
625 711
626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
627 713
628 $self->check_size (1); 714 $self->realloc;
629 $self->update;
630} 715}
631 716
632sub clear { 717sub clear {
633 my ($self) = @_; 718 my ($self) = @_;
634 719
… …
638 for (@$children) { 723 for (@$children) {
639 delete $_->{parent}; 724 delete $_->{parent};
640 $_->hide; 725 $_->hide;
641 } 726 }
642 727
643 $self->check_size; 728 $self->realloc;
644 $self->update;
645} 729}
646 730
647sub find_widget { 731sub find_widget {
648 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
649 733
650 $x -= $self->{x}; 734 $x -= $self->{x};
651 $y -= $self->{y}; 735 $y -= $self->{y};
652 736
653 my $res; 737 my $res;
654 738
655 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
656 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
657 and return $res; 741 and return $res;
658 } 742 }
659 743
660 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
709 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
710} 794}
711 795
712############################################################################# 796#############################################################################
713 797
798# back-buffered drawing area
799
714package CFClient::UI::Window; 800package CFClient::UI::Window;
715 801
716our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
717 803
718use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
736 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
737 $self->update; 823 $self->update;
738} 824}
739 825
740sub _render { 826sub _render {
827 my ($self) = @_;
828
741 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
742} 830}
743 831
744sub render_child { 832sub render_child {
745 my ($self) = @_; 833 my ($self) = @_;
746 834
747 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
748 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
749 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
750 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
751 $self->_render; 846 $self->_render;
752 }; 847 };
753} 848}
754 849
755sub _draw { 850sub _draw {
756 my ($self) = @_; 851 my ($self) = @_;
757 852
758 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
759 854
760 my $tex = $self->{texture} 855 my $tex = $self->{texture}
761 or return; 856 or return;
762 857
763 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
765 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
766 861
767 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
768 863
769 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
770} 865}
… …
786} 881}
787 882
788sub size_request { 883sub size_request {
789 my ($self) = @_; 884 my ($self) = @_;
790 885
791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
792 887
793 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
794} 892}
795 893
796sub size_allocate { 894sub size_allocate {
797 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
798 896
897 my $child = $self->child;
898
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
801 901
802 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
803 $self->update; 903 $self->update;
804} 904}
805 905
… …
841} 941}
842 942
843sub _render { 943sub _render {
844 my ($self) = @_; 944 my ($self) = @_;
845 945
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
948
846 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
847 950
848 $self->SUPER::_render; 951 $self->SUPER::_render;
849} 952}
850 953
… …
853package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
854 957
855our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
856 959
857sub new { 960sub new {
858 my $class = shift; 961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
859 964
860 my $self; 965 my $self;
861 966
862 my $slider = new CFClient::UI::Slider 967 my $slider = new CFClient::UI::Slider
863 vertical => 1, 968 vertical => 1,
864 range => [0, 0, 1, 0.01], # HACK fix 969 range => [0, 0, 1, 0.01], # HACK fix
865 connect_changed => sub { 970 on_changed => sub {
866 $self->{vp}->set_offset (0, $_[1]); 971 $self->{vp}->set_offset (0, $_[1]);
867 }, 972 },
868 ; 973 ;
869 974
870 $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
871 vp => (new CFClient::UI::ViewPort expand => 1), 976 vp => (new CFClient::UI::ViewPort expand => 1),
872 slider => $slider, 977 slider => $slider,
873 @_, 978 %arg,
874 ); 979 );
875 980
876 $self->{vp}->add ($self->{scrolled});
877 $self->add ($self->{vp});
878 $self->add ($self->{slider}); 981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
879 983
880 $self 984 $self
985}
986
987sub add {
988 my ($self, $widget) = @_;
989
990 $self->{vp}->add ($self->{child} = $widget);
881} 991}
882 992
883sub update { 993sub update {
884 my ($self) = @_; 994 my ($self) = @_;
885 995
… …
924 1034
925 if ($self->{bg}) { 1035 if ($self->{bg}) {
926 my ($w, $h) = @$self{qw(w h)}; 1036 my ($w, $h) = @$self{qw(w h)};
927 1037
928 glEnable GL_BLEND; 1038 glEnable GL_BLEND;
929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
930 glColor @{ $self->{bg} }; 1040 glColor_premultiply @{ $self->{bg} };
931 1041
932 glBegin GL_QUADS; 1042 glBegin GL_QUADS;
933 glVertex 0 , 0; 1043 glVertex 0 , 0;
934 glVertex 0 , $h; 1044 glVertex 0 , $h;
935 glVertex $w, $h; 1045 glVertex $w, $h;
… …
948 1058
949our @ISA = CFClient::UI::Bin::; 1059our @ISA = CFClient::UI::Bin::;
950 1060
951use CFClient::OpenGL; 1061use CFClient::OpenGL;
952 1062
953my @tex = 1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
954 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
955 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
956 1070
957sub new { 1071sub new {
958 my $class = shift; 1072 my ($class, %arg) = @_;
959 1073
960 # TODO: user_x, user_y, overwrite moveto? 1074 my $title = delete $arg{title};
961 1075
962 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
963 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
964 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
965 border => 0.6, 1079 border => 0.6,
966 is_toplevel => 1,
967 can_events => 1, 1080 can_events => 1,
968 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
969 ); 1084 );
970 1085
971 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
972 align => 0, 1087 align => 0,
973 valign => 1, 1088 valign => 1,
974 text => $self->{title}, 1089 text => $title,
975 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
976 1092
977 $self 1093 $self
1094}
1095
1096sub add {
1097 my ($self, @widgets) = @_;
1098
1099 $self->SUPER::add (@widgets);
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
978} 1101}
979 1102
980sub border { 1103sub border {
981 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
982} 1105}
983 1106
984sub size_request { 1107sub size_request {
985 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
986 1112
987 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
988 1114
989 ( 1115 (
990 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
993} 1119}
994 1120
995sub size_allocate { 1121sub size_allocate {
996 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
997 1123
1124 if ($self->{title}) {
1125 $self->{title}{w} = $w;
1126 $self->{title}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h);
1128 }
1129
1130 my $border = $self->border;
1131
998 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
999 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
1000 1134
1001 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1002 if $self->{title};
1003
1004 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
1005} 1136}
1006 1137
1007sub button_down { 1138sub button_down {
1008 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
1009 1140
… …
1025 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
1026 1157
1027 my $dx = $ev->{x} - $ox; 1158 my $dx = $ev->{x} - $ox;
1028 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
1029 1160
1030 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1031 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1163
1032 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1033 $self->check_size; 1165 $self->realloc;
1034 }; 1166 };
1035 1167
1036 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
1037 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1038 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1040 $self->{motion} = sub { 1172 $self->{motion} = sub {
1041 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1042 1174
1043 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
1044 1176
1045 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1046 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1047 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
1048 } 1185 1
1049} 1186}
1050 1187
1051sub button_up { 1188sub button_up {
1052 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
1053 1190
1054 delete $self->{motion}; 1191 !!delete $self->{motion}
1055} 1192}
1056 1193
1057sub mouse_motion { 1194sub mouse_motion {
1058 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
1059 1196
1060 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
1061} 1200}
1062 1201
1063sub _draw { 1202sub _draw {
1064 my ($self) = @_; 1203 my ($self) = @_;
1065 1204
1205 my $child = $self->{children}[0];
1206
1066 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
1067 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
1068 1209
1069 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
1070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1071 1212
1072 my $border = $self->border; 1213 my $border = $self->border;
1073 1214
1074 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
1075 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1076 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1077 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1078 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1079 1220
1080 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1081 my $bg = $tex[0]; 1222 glColor @{ $self->{bg} };
1082 1223
1083 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
1225 # solve this better(?)
1084 my $rep_x = $cw / $bg->{w}; 1226 $bg->{s} = $cw / $bg->{w};
1085 my $rep_y = $ch / $bg->{h}; 1227 $bg->{t} = $ch / $bg->{h};
1086
1087 glColor @{ $self->{bg} };
1088
1089 $bg->{s} = $rep_x;
1090 $bg->{t} = $rep_y;
1091 $bg->{wrap_mode} = 1;
1092 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093 } 1229 }
1094 1230
1095 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
1096 1232
1097 $self->{title}->draw if $self->{title};
1098
1099 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
1100} 1239}
1101 1240
1102############################################################################# 1241#############################################################################
1103 1242
1104package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
1126 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
1127 1266
1128 $child->set_parent ($self); 1267 $child->set_parent ($self);
1129 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
1130 1269
1131 $self->check_size (1); 1270 $self->realloc;
1132} 1271}
1133 1272
1134# TODO: move to container class maybe? send children a signal on removal? 1273# TODO: move to container class maybe? send children a signal on removal?
1135sub clear { 1274sub clear {
1136 my ($self) = @_; 1275 my ($self) = @_;
… …
1141 for (@children) { 1280 for (@children) {
1142 delete $_->{parent}; 1281 delete $_->{parent};
1143 $_->hide; 1282 $_->hide;
1144 } 1283 }
1145 1284
1146 $self->check_size (1); 1285 $self->realloc;
1147 $self->update;
1148} 1286}
1149 1287
1150sub get_wh { 1288sub get_wh {
1151 my ($self) = @_; 1289 my ($self) = @_;
1152 1290
… …
1248 } 1386 }
1249} 1387}
1250 1388
1251############################################################################# 1389#############################################################################
1252 1390
1253package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1254
1255# TODO: wrap into common Box base class
1256 1392
1257our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1258 1394
1259sub size_request { 1395sub size_request {
1260 my ($self) = @_; 1396 my ($self) = @_;
1261 1397
1262 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1263 1399 ? (
1264 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1265 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1266 (List::Util::max map $_->[1], @alloc), 1402 )
1267 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1268} 1407}
1269 1408
1270sub size_allocate { 1409sub size_allocate {
1271 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1272 1411
1273 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1274
1275 my $children = $self->{children}; 1413 my $children = $self->{children};
1276 1414
1277 my @h = map $_->{req_w}, @$children; 1415 my @req;
1278 1416
1279 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1280 1418 @req = ($space / (@$children || 1)) x @$children;
1281 if ($req_h > $h) {
1282 # ah well, not enough space
1283 $_ *= $h / $req_h for @h;
1284 } else { 1419 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1421 my $req = List::Util::sum @req;
1422
1423 if ($req > $space) {
1424 # ah well, not enough space
1425 $_ *= $space / $req for @req;
1426 } else {
1285 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1286 $exp ||= 1;
1287 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1288 for (0 .. $#$children) { 1432 for 0 .. $#$children;
1289 my $child = $children->[$_];
1290
1291 my $alloc_h = $h[$_];
1292 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1293 $h[$_] = $alloc_h;
1294 } 1433 }
1295 } 1434 }
1296 1435
1297 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1298 1437
1299 my $y = 0; 1438 my $pos = 0;
1300 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1303 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1304 1442
1305 $y += $h; 1443 $pos += $alloc;
1306 } 1444 }
1307 1445
1308 1 1446 1
1309} 1447}
1310 1448
1311############################################################################# 1449#############################################################################
1312 1450
1451package CFClient::UI::HBox;
1452
1453our @ISA = CFClient::UI::Box::;
1454
1455sub new {
1456 my $class = shift;
1457
1458 $class->SUPER::new (
1459 vertical => 0,
1460 @_,
1461 )
1462}
1463
1464#############################################################################
1465
1313package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1314 1467
1315# TODO: wrap into common Box base class
1316
1317our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1318 1469
1319sub size_request { 1470sub new {
1320 my ($self) = @_; 1471 my $class = shift;
1321 1472
1322 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1323 1474 vertical => 1,
1324 ( 1475 @_,
1325 (List::Util::max map $_->[0], @alloc),
1326 (List::Util::sum map $_->[1], @alloc),
1327 ) 1476 )
1328}
1329
1330sub size_allocate {
1331 my ($self, $w, $h) = @_;
1332
1333 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1335 my $children = $self->{children};
1336
1337 my @h = map $_->{req_h}, @$children;
1338
1339 my $req_h = List::Util::sum @h;
1340
1341 if ($req_h > $h) {
1342 # ah well, not enough space
1343 $_ *= $h / $req_h for @h;
1344 } else {
1345 my $exp = List::Util::sum map $_->{expand}, @$children;
1346 $exp ||= 1;
1347
1348 for (0 .. $#$children) {
1349 my $child = $children->[$_];
1350
1351 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1352 }
1353 }
1354
1355 CFClient::UI::harmonize \@h;
1356
1357 my $y = 0;
1358 for (0 .. $#$children) {
1359 my $child = $children->[$_];
1360 my $h = $h[$_];
1361 $child->configure (0, $y, $w, $h);
1362
1363 $y += $h;
1364 }
1365
1366 1
1367} 1477}
1368 1478
1369############################################################################# 1479#############################################################################
1370 1480
1371package CFClient::UI::Label; 1481package CFClient::UI::Label;
… …
1388 ellipsise => 3, # end 1498 ellipsise => 3, # end
1389 layout => (new CFClient::Layout), 1499 layout => (new CFClient::Layout),
1390 fontsize => 1, 1500 fontsize => 1,
1391 align => -1, 1501 align => -1,
1392 valign => -1, 1502 valign => -1,
1393 padding => 2, 1503 padding_x => 2,
1504 padding_y => 2,
1394 can_events => 0, 1505 can_events => 0,
1395 %arg 1506 %arg
1396 ); 1507 );
1397 1508
1398 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
… …
1434 $self->{text} = "T$text"; 1545 $self->{text} = "T$text";
1435 1546
1436 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1437 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1438 1549
1550 $self->realloc;
1439 $self->update; 1551 $self->update;
1440 $self->check_size;
1441} 1552}
1442 1553
1443sub set_markup { 1554sub set_markup {
1444 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1445 1556
… …
1449 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450 1561
1451 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1452 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1453 1564
1565 $self->realloc;
1454 $self->update; 1566 $self->update;
1455 $self->check_size;
1456} 1567}
1457 1568
1458sub size_request { 1569sub size_request {
1459 my ($self) = @_; 1570 my ($self) = @_;
1460 1571
… …
1474 1585
1475 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1476 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1477 } 1588 }
1478 1589
1479 ( 1590 ($w, $h)
1480 $w + $self->{padding} * 2,
1481 $h + $self->{padding} * 2,
1482 )
1483} 1591}
1484 1592
1485sub size_allocate { 1593sub size_allocate {
1486 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1487 1595
1596 delete $self->{ox};
1597
1488 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1489} 1600}
1490 1601
1491sub set_fontsize { 1602sub set_fontsize {
1492 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1493 1604
1494 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1495 delete $self->{texture}; 1606 delete $self->{texture};
1496 1607
1497 $self->update; 1608 $self->realloc;
1498 $self->check_size;
1499} 1609}
1500 1610
1501sub _draw { 1611sub _draw {
1502 my ($self) = @_; 1612 my ($self) = @_;
1503 1613
… …
1509 $self->{layout}->set_width ($self->{w}); 1619 $self->{layout}->set_width ($self->{w});
1510 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1620 $self->{layout}->set_ellipsise ($self->{ellipsise});
1511 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1512 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1513 1623
1514 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1624 new_from_layout CFClient::Texture $self->{layout}
1625 };
1515 1626
1627 unless (exists $self->{ox}) {
1516 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1517 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1518 : ($self->{w} - $tex->{w}) * 0.5); 1630 : ($self->{w} - $tex->{w}) * 0.5);
1519 1631
1520 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1521 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1522 : ($self->{h} - $tex->{h}) * 0.5); 1634 : ($self->{h} - $tex->{h}) * 0.5);
1523
1524 $tex
1525 }; 1635 };
1526 1636
1527 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1529 1639
1640 glColor_premultiply @{$self->{fg}}
1530 if ($tex->{format} == GL_ALPHA) { 1641 if $tex->{format} == GL_ALPHA;
1531 glColor @{$self->{fg}}; 1642
1532 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1533 } else {
1534 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1535 }
1536 1644
1537 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1538} 1646}
1539 1647
1540############################################################################# 1648#############################################################################
… …
1567 1675
1568 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1569 1677
1570 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1571 1679
1572 delete $self->{texture};
1573
1574 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1575 $self->{text} = $text; 1681 $self->{text} = $text;
1576 1682
1577 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1578 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1579 1685
1580 $self->_emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1581} 1688}
1582 1689
1583sub set_text { 1690sub set_text {
1584 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1585 1692
1586 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1587 $self->_set_text ($text); 1694 $self->_set_text ($text);
1588 $self->update; 1695
1589 $self->check_size; 1696 $self->realloc;
1590} 1697}
1591 1698
1592sub get_text { 1699sub get_text {
1593 $_[0]{text} 1700 $_[0]{text}
1594} 1701}
… …
1624 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1625 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1626 $self->_emit ('escape'); 1733 $self->_emit ('escape');
1627 } elsif ($uni) { 1734 } elsif ($uni) {
1628 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1629 } 1738 }
1630 1739
1631 $self->_set_text ($text); 1740 $self->_set_text ($text);
1632 $self->update; 1741
1633 $self->check_size; 1742 $self->realloc;
1743
1744 1
1634} 1745}
1635 1746
1636sub focus_in { 1747sub focus_in {
1637 my ($self) = @_; 1748 my ($self) = @_;
1638 1749
… …
1653 utf8::encode $text; 1764 utf8::encode $text;
1654 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1655 1766
1656 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1657 $self->update; 1768 $self->update;
1769
1770 1
1658} 1771}
1659 1772
1660sub mouse_motion { 1773sub mouse_motion {
1661 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1662# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1663} 1778}
1664 1779
1665sub _draw { 1780sub _draw {
1666 my ($self) = @_; 1781 my ($self) = @_;
1667 1782
1668 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1669 1784
1670 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1671 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1672 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1673 } else { 1788 } else {
1674 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1675 } 1790 }
1676 1791
1677 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1679 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1680 glVertex 0 , 0; 1795 glVertex 0 , 0;
1681 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1682 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1683 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1744 } else { 1859 } else {
1745 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1746 } 1861 }
1747 1862
1748 } else { 1863 } else {
1749 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1750 } 1867 1
1751
1752} 1868}
1753 1869
1754############################################################################# 1870#############################################################################
1755 1871
1756package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1765 1881
1766sub new { 1882sub new {
1767 my $class = shift; 1883 my $class = shift;
1768 1884
1769 $class->SUPER::new ( 1885 $class->SUPER::new (
1770 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1771 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1772 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1773 can_hover => 1, 1890 can_hover => 1,
1774 align => 0, 1891 align => 0,
1775 valign => 0, 1892 valign => 0,
… …
1784 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1785 1902
1786 $self->emit ("activate") 1903 $self->emit ("activate")
1787 if $x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1788 && $y >= 0 && $y < $self->{h}; 1905 && $y >= 0 && $y < $self->{h};
1906
1907 1
1789} 1908}
1790 1909
1791sub _draw { 1910sub _draw {
1792 my ($self) = @_; 1911 my ($self) = @_;
1793 1912
1794 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1795
1796 if ($GRAB == $self) {
1797 $self->{fg} = $self->{active_fg};
1798 }
1799 1914
1800 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1803 1918
… …
1822 1937
1823sub new { 1938sub new {
1824 my $class = shift; 1939 my $class = shift;
1825 1940
1826 $class->SUPER::new ( 1941 $class->SUPER::new (
1827 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1828 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1829 active_fg => [1, 1, 0], 1945 active_fg => [1, 1, 0],
1830 bg => [0, 0, 0, 0.2], 1946 bg => [0, 0, 0, 0.2],
1831 active_bg => [1, 1, 1, 0.5], 1947 active_bg => [1, 1, 1, 0.5],
1832 state => 0, 1948 state => 0,
… …
1836} 1952}
1837 1953
1838sub size_request { 1954sub size_request {
1839 my ($self) = @_; 1955 my ($self) = @_;
1840 1956
1841 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1842} 1958}
1843 1959
1844sub button_down { 1960sub button_down {
1845 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1846 1962
1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1849 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1850 $self->_emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1851 } 1971 1
1852} 1972}
1853 1973
1854sub _draw { 1974sub _draw {
1855 my ($self) = @_; 1975 my ($self) = @_;
1856 1976
1857 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1858 1978
1859 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1860 1980
1861 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1981 my ($w, $h) = @$self{qw(w h)};
1982
1983 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1862 1984
1863 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1864 1986
1865 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1866 1988
… …
2021 2143
2022 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
2023 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
2024 2146
2025 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
2026 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2027 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
2028 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2029 2152
2030 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
2031 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
… …
2131 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
2132 active_fg => [0, 0, 0], 2255 active_fg => [0, 0, 0],
2133 bg => [0, 0, 0, 0.2], 2256 bg => [0, 0, 0, 0.2],
2134 active_bg => [1, 1, 1, 0.5], 2257 active_bg => [1, 1, 1, 0.5],
2135 range => [0, 0, 100, 10, 0], 2258 range => [0, 0, 100, 10, 0],
2136 req_w => $::WIDTH / 80, 2259 min_w => $::WIDTH / 80,
2137 req_h => $::WIDTH / 80, 2260 min_h => $::WIDTH / 80,
2138 vertical => 0, 2261 vertical => 0,
2139 can_hover => 1, 2262 can_hover => 1,
2140 inner_pad => 0.02, 2263 inner_pad => 0.02,
2141 @_ 2264 @_
2142 ); 2265 );
… …
2145 $self->update; 2268 $self->update;
2146 2269
2147 $self 2270 $self
2148} 2271}
2149 2272
2273sub changed { }
2274
2150sub set_range { 2275sub set_range {
2151 my ($self, $range) = @_; 2276 my ($self, $range) = @_;
2152 2277
2153 ($range, $self->{range}) = ($self->{range}, $range); 2278 ($range, $self->{range}) = ($self->{range}, $range);
2154 2279
… …
2180} 2305}
2181 2306
2182sub size_request { 2307sub size_request {
2183 my ($self) = @_; 2308 my ($self) = @_;
2184 2309
2185 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
2186 my $h = $self->{req_h};
2187
2188 $self->{vertical} ? ($h, $w) : ($w, $h)
2189} 2311}
2190 2312
2191sub button_down { 2313sub button_down {
2192 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
2193 2315
2194 $self->SUPER::button_down ($ev, $x, $y); 2316 $self->SUPER::button_down ($ev, $x, $y);
2195 2317
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197 2319
2198 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2199} 2321}
2200 2322
2201sub mouse_motion { 2323sub mouse_motion {
2202 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2203 2325
… …
2207 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2208 2330
2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2210 2332
2211 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2212 } 2338 1
2213} 2339}
2214 2340
2215sub update { 2341sub update {
2216 my ($self) = @_; 2342 my ($self) = @_;
2217 2343
2218 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2219 $self->set_value ($self->{range}[0]); 2352 $self->set_value ($self->{range}[0]);
2220 2353
2221 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100; 2355 my $range = ($hi - $page - $lo) || 1e-100;
2223 2356
… …
2229 $value = ($value - $lo) / $range; 2362 $value = ($value - $lo) / $range;
2230 $value = $value * $self->{scale} + $self->{offset}; 2363 $value = $value * $self->{scale} + $self->{offset};
2231 2364
2232 $self->{knob_x} = $value - $knob_w * 0.5; 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2233 $self->{knob_w} = $knob_w; 2366 $self->{knob_w} = $knob_w;
2234 }); 2367 }
2235
2236 $self->SUPER::update;
2237}
2238
2239sub _draw {
2240 my ($self) = @_;
2241 2368
2242 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2243 2370
2244 glScale $self->{w}, $self->{h}; 2371 glScale $self->{w}, $self->{h};
2245 2372
… …
2439 2566
2440 delete $self->{texture}; 2567 delete $self->{texture};
2441 } 2568 }
2442 2569
2443 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2444 glClearColor 0.5, 0.5, 0.5, 0; 2571 glClearColor 0, 0, 0, 0;
2445 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2446 2573
2447 my $top = int $self->{children}[1]{range}[0]; 2574 my $top = int $self->{children}[1]{range}[0];
2448 2575
2449 my $y0 = $top; 2576 my $y0 = $top;
… …
2484sub _draw { 2611sub _draw {
2485 my ($self) = @_; 2612 my ($self) = @_;
2486 2613
2487 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2488 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2489 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2490 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2491 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2492 2619
2493 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2494 2621
2495} 2622}
… …
2544 2671
2545sub new { 2672sub new {
2546 my $class = shift; 2673 my $class = shift;
2547 2674
2548 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2549 state => 0, 2676 state => 0,
2550 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2551 @_ 2678 @_
2552 ); 2679 );
2553 2680
2554 if ($self->{state}) {
2555 $self->{state} = 0;
2556 $self->toggle_flopper;
2557 }
2558
2559 $self 2681 $self
2560} 2682}
2561 2683
2562sub toggle_flopper { 2684sub toggle_flopper {
2563 my ($self) = @_; 2685 my ($self) = @_;
2564 2686
2565 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2566 if ($self->{state} = !$self->{state}) {
2567 $CFClient::UI::ROOT->add ($self->{other});
2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2569 $self->_emit ("open");
2570 } else {
2571 $CFClient::UI::ROOT->remove ($self->{other});
2572 $self->_emit ("close");
2573 }
2574
2575 $self->_emit (changed => $self->{state});
2576} 2688}
2577 2689
2578############################################################################# 2690#############################################################################
2579 2691
2580package CFClient::UI::Tooltip; 2692package CFClient::UI::Tooltip;
… …
2593} 2705}
2594 2706
2595sub set_tooltip_from { 2707sub set_tooltip_from {
2596 my ($self, $widget) = @_; 2708 my ($self, $widget) = @_;
2597 2709
2710 my $tooltip = $widget->{tooltip};
2711
2712 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}";
2717 }
2718
2598 $self->add (new CFClient::UI::Label 2719 $self->add (new CFClient::UI::Label
2599 markup => $widget->{tooltip}, 2720 markup => $tooltip,
2600 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2601 fontsize => 0.8, 2722 fontsize => 0.8,
2602 fg => [0, 0, 0, 1], 2723 fg => [0, 0, 0, 1],
2603 ellipsise => 0, 2724 ellipsise => 0,
2604 font => ($widget->{tooltip_font} || $::FONT_PROP), 2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2615 2736
2616sub size_allocate { 2737sub size_allocate {
2617 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2618 2739
2619 $self->SUPER::size_allocate ($w - 4, $h - 4); 2740 $self->SUPER::size_allocate ($w - 4, $h - 4);
2741}
2742
2743sub visibility_change {
2744 my ($self, $visible) = @_;
2745
2746 return unless $visible;
2747
2748 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner}
2750 or return;
2751
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH;
2756
2757 $self->move_abs ($x, $y);
2758 });
2620} 2759}
2621 2760
2622sub _draw { 2761sub _draw {
2623 my ($self) = @_; 2762 my ($self) = @_;
2624 2763
… …
2641 glVertex $w, $h; 2780 glVertex $w, $h;
2642 glVertex $w, 0; 2781 glVertex $w, 0;
2643 glEnd; 2782 glEnd;
2644 2783
2645 glTranslate 2 - 0.375, 2 - 0.375; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2785
2646 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2647} 2787}
2648 2788
2649############################################################################# 2789#############################################################################
2650 2790
… …
2709 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2710 2850
2711 if ($tex) { 2851 if ($tex) {
2712 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2714 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2715 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2716 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2717 } 2857 }
2718} 2858}
2719 2859
… …
2726 $self->SUPER::DESTROY; 2866 $self->SUPER::DESTROY;
2727} 2867}
2728 2868
2729############################################################################# 2869#############################################################################
2730 2870
2731package CFClient::UI::Inventory; 2871package CFClient::UI::Buttonbar;
2732 2872
2733our @ISA = CFClient::UI::ScrolledWindow::; 2873our @ISA = CFClient::UI::HBox::;
2734 2874
2735sub new { 2875# TODO: should actualyl wrap buttons and other goodies.
2736 my $class = shift;
2737
2738 my $self = $class->SUPER::new (
2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2740 @_,
2741 );
2742
2743 $self
2744}
2745
2746sub set_items {
2747 my ($self, $items) = @_;
2748
2749 $self->{scrolled}->clear;
2750 return unless $items;
2751
2752 my @items = sort {
2753 ($a->{type} <=> $b->{type})
2754 or ($a->{name} cmp $b->{name})
2755 } @$items;
2756
2757 $self->{real_items} = \@items;
2758
2759 my $row = 0;
2760 for my $item (@items) {
2761 CFClient::Item::update_widgets $item;
2762
2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2766
2767 $row++;
2768 }
2769}
2770
2771sub size_request {
2772 my ($self) = @_;
2773 ($self->{req_w}, $self->{req_h});
2774}
2775 2876
2776############################################################################# 2877#############################################################################
2777 2878
2778package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2779 2880
… …
2820 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2821 $GRAB = $self; 2922 $GRAB = $self;
2822 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2823 2924
2824 $self->show; 2925 $self->show;
2825 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2826} 2927}
2827 2928
2828sub mouse_motion { 2929sub mouse_motion {
2829 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2830 2931
2831 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2832 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2833 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2834} 2937}
2835 2938
2836sub button_up { 2939sub button_up {
2837 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2838 2941
… …
2840 undef $GRAB; 2943 undef $GRAB;
2841 $self->hide; 2944 $self->hide;
2842 2945
2843 $self->_emit ("popdown"); 2946 $self->_emit ("popdown");
2844 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2952 1
2953}
2954
2955#############################################################################
2956
2957package CFClient::UI::Multiplexer;
2958
2959our @ISA = CFClient::UI::Container::;
2960
2961sub new {
2962 my $class = shift;
2963
2964 my $self = $class->SUPER::new (
2965 @_,
2966 );
2967
2968 $self->{current} = $self->{children}[0]
2969 if @{ $self->{children} };
2970
2971 $self
2972}
2973
2974sub add {
2975 my ($self, @widgets) = @_;
2976
2977 $self->SUPER::add (@widgets);
2978
2979 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} };
2981}
2982
2983sub set_current_page {
2984 my ($self, $page_or_widget) = @_;
2985
2986 my $widget = ref $page_or_widget
2987 ? $page_or_widget
2988 : $self->{children}[$page_or_widget];
2989
2990 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992
2993 $self->_emit (page_changed => $self->{current});
2994
2995 $self->realloc;
2996}
2997
2998sub visible_children {
2999 $_[0]{current}
3000}
3001
3002sub size_request {
3003 my ($self) = @_;
3004
3005 $self->{current}->size_request
3006}
3007
3008sub size_allocate {
3009 my ($self, $w, $h) = @_;
3010
3011 $self->{current}->configure (0, 0, $w, $h);
3012}
3013
3014sub _draw {
3015 my ($self) = @_;
3016
3017 $self->{current}->draw;
3018}
3019
3020#############################################################################
3021
3022package CFClient::UI::Notebook;
3023
3024our @ISA = CFClient::UI::VBox::;
3025
3026sub new {
3027 my $class = shift;
3028
3029 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self
3033 @_,
3034 );
2845 } 3035
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3037 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3038
3039 $self
3040}
3041
3042sub add {
3043 my ($self, $title, $widget, $tooltip) = @_;
3044
3045 Scalar::Util::weaken $self;
3046
3047 $self->{buttonbar}->add (new CFClient::UI::Button
3048 markup => $title,
3049 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) },
3051 );
3052
3053 $self->{multiplexer}->add ($widget);
3054}
3055
3056sub set_current_page {
3057 my ($self, $page) = @_;
3058
3059 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current});
2846} 3061}
2847 3062
2848############################################################################# 3063#############################################################################
2849 3064
2850package CFClient::UI::Statusbox; 3065package CFClient::UI::Statusbox;
… …
2955 $self->SUPER::reconfigure; 3170 $self->SUPER::reconfigure;
2956} 3171}
2957 3172
2958############################################################################# 3173#############################################################################
2959 3174
2960package CFClient::UI::Root; 3175package CFClient::UI::Inventory;
2961 3176
2962our @ISA = CFClient::UI::Container::; 3177our @ISA = CFClient::UI::ScrolledWindow::;
2963
2964use CFClient::OpenGL;
2965 3178
2966sub new { 3179sub new {
2967 my $class = shift; 3180 my $class = shift;
2968 3181
2969 $class->SUPER::new ( 3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
3424 @_,
3425 )
3426}
3427
3428# XXX: Do sorting? Argl...
3429sub add_spell {
3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3432
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root;
3471
3472our @ISA = CFClient::UI::Container::;
3473
3474use CFClient::OpenGL;
3475
3476sub new {
3477 my $class = shift;
3478
3479 my $self = $class->SUPER::new (
2970 visible => 1, 3480 visible => 1,
2971 @_, 3481 @_,
2972 ) 3482 );
2973}
2974 3483
2975sub configure { 3484 Scalar::Util::weaken ($self->{root} = $self);
2976 my ($self, $x, $y, $w, $h) = @_;
2977 3485
2978 $self->{w} = $w; 3486 $self
2979 $self->{h} = $h;
2980}
2981
2982sub check_size {
2983 my ($self) = @_;
2984
2985 $self->size_allocate ($self->{w}, $self->{h})
2986 if $self->{w};
2987} 3487}
2988 3488
2989sub size_request { 3489sub size_request {
2990 my ($self) = @_; 3490 my ($self) = @_;
2991 3491
2992 ($self->{w}, $self->{h}) 3492 ($self->{w}, $self->{h})
3493}
3494
3495sub _to_pixel {
3496 my ($coord, $size, $max) = @_;
3497
3498 $coord =
3499 $coord eq "center" ? ($max - $size) * 0.5
3500 : $coord eq "max" ? $max
3501 : $coord;
3502
3503 $coord = 0 if $coord < 0;
3504 $coord = $max - $size if $coord > $max - $size;
3505
3506 int $coord + 0.5
2993} 3507}
2994 3508
2995sub size_allocate { 3509sub size_allocate {
2996 my ($self, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
2997 3511
2998 for my $child ($self->children) { 3512 for my $child ($self->children) {
2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3000 3514
3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3515 $X = $child->{force_x} if exists $child->{force_x};
3002 if exists $child->{req_x}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
3003 3517
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3518 $X = _to_pixel $X, $W, $self->{w};
3005 if exists $child->{req_y}; 3519 $Y = _to_pixel $Y, $H, $self->{h};
3006
3007 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3008 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009 3520
3010 $child->configure ($X, $Y, $W, $H); 3521 $child->configure ($X, $Y, $W, $H);
3011 } 3522 }
3012} 3523}
3013 3524
… …
3024} 3535}
3025 3536
3026sub update { 3537sub update {
3027 my ($self) = @_; 3538 my ($self) = @_;
3028 3539
3029 $self->check_size;
3030 $::WANT_REFRESH++; 3540 $::WANT_REFRESH++;
3031} 3541}
3032 3542
3033sub add { 3543sub add {
3034 my ($self, @children) = @_; 3544 my ($self, @children) = @_;
3035 3545
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
3042 for my $child (@children) {
3043 $child->{is_toplevel} = 1; 3546 $_->{is_toplevel} = 1
3044 3547 for @children;
3045 # integerise window positions
3046 $child->{x} = int $child->{x};
3047 $child->{y} = int $child->{y};
3048 }
3049 3548
3050 $self->SUPER::add (@children); 3549 $self->SUPER::add (@children);
3051} 3550}
3052 3551
3053sub remove { 3552sub remove {
3054 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3055 3554
3056 $self->SUPER::remove (@children); 3555 $self->SUPER::remove (@children);
3556
3557 delete $self->{is_toplevel}
3558 for @children;
3057 3559
3058 while (@children) { 3560 while (@children) {
3059 my $w = pop @children; 3561 my $w = pop @children;
3060 push @children, $w->children; 3562 push @children, $w->children;
3061 $w->set_invisible; 3563 $w->set_invisible;
… …
3080 while ($self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
3081 $_->() 3583 $_->()
3082 for values %{delete $self->{refresh_hook}}; 3584 for values %{delete $self->{refresh_hook}};
3083 } 3585 }
3084 3586
3085 if ($self->{check_size}) { 3587 if ($self->{realloc}) {
3086 my @queue = ([], []); 3588 my %queue;
3589 my @queue;
3590 my $widget;
3087 3591
3088 for (;;) { 3592 outer:
3089 if ($self->{check_size}) { 3593 while () {
3090 # heuristic: check containers last 3594 if (my $realloc = delete $self->{realloc}) {
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3595 for $widget (values %$realloc) {
3092 for values %{delete $self->{check_size}} 3596 $widget->{visible} or next; # do not resize invisible widgets
3597
3598 $queue{$widget+0}++ and next; # duplicates are common
3599
3600 push @{ $queue[$widget->{visible}] }, $widget;
3601 }
3093 } 3602 }
3094 3603
3095 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3604 while () {
3605 @queue or last outer;
3096 3606
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3607 $widget = pop @{ $queue[-1] || [] }
3098 ? @$widget{qw(user_w user_h)} 3608 and last;
3099 : $widget->size_request;
3100
3101 if (delete $widget->{force_alloc}
3102 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3104 3609
3610 pop @queue;
3611 }
3612
3613 delete $queue{$widget+0};
3614
3615 my ($w, $h) = $widget->size_request;
3616
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3619
3620 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h};
3622
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3624 || delete $widget->{force_realloc}) {
3105 $widget->{req_w} = $w; 3625 $widget->{req_w} = $w;
3106 $widget->{req_h} = $h; 3626 $widget->{req_h} = $h;
3107 3627
3108 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3628 $self->{size_alloc}{$widget+0} = $widget;
3109 3629
3110 $widget->{parent}->check_size
3111 if $widget->{parent}; 3630 if (my $parent = $widget->{parent}) {
3631 $self->{realloc}{$parent+0} = $parent
3632 unless $queue{$parent+0};
3633
3634 $parent->{force_size_alloc} = 1;
3635 $self->{size_alloc}{$parent+0} = $parent;
3636 }
3112 } 3637 }
3638
3639 delete $self->{realloc}{$widget+0};
3113 } 3640 }
3114 } 3641 }
3115 3642
3116 while ($self->{size_alloc}) { 3643 while (my $size_alloc = delete $self->{size_alloc}) {
3117 for (values %{delete $self->{size_alloc}}) { 3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
3118 my ($widget, $w, $h) = @$_; 3645 values %$size_alloc;
3646
3647 while () {
3648 my $widget = pop @queue || last;
3649
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3119 3651
3120 $w = 0 if $w < 0; 3652 $w = 0 if $w < 0;
3121 $h = 0 if $h < 0; 3653 $h = 0 if $h < 0;
3122 3654
3655 $w = int $w + 0.5;
3656 $h = int $h + 0.5;
3657
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659 $widget->{old_w} = $widget->{w};
3660 $widget->{old_h} = $widget->{h};
3661
3123 $widget->{w} = $w; 3662 $widget->{w} = $w;
3124 $widget->{h} = $h; 3663 $widget->{h} = $h;
3664
3125 $widget->emit (size_allocate => $w, $h); 3665 $widget->emit (size_allocate => $w, $h);
3666 }
3126 } 3667 }
3127 } 3668 }
3128 3669
3129 while ($self->{post_alloc_hook}) { 3670 while ($self->{post_alloc_hook}) {
3130 $_->() 3671 $_->()
3131 for values %{delete $self->{post_alloc_hook}}; 3672 for values %{delete $self->{post_alloc_hook}};
3132 } 3673 }
3674
3133 3675
3134 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3135 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3136 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
3137 3679
… …
3139 glLoadIdentity; 3681 glLoadIdentity;
3140 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3141 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
3142 glLoadIdentity; 3684 glLoadIdentity;
3143 3685
3686 {
3687 package CFClient::UI::Base;
3688
3689 ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h});
3691 }
3692
3144 $self->_draw; 3693 $self->_draw;
3145} 3694}
3146 3695
3147############################################################################# 3696#############################################################################
3148 3697

Diff Legend

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