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.259 by root, Tue May 30 07:13:09 2006 UTC vs.
Revision 1.312 by root, Fri Jun 23 23:54:30 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 179
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $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}; 181 $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}; 182 $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.]+$/; 183 $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}; 184 $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}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 186
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 189
188 } 190 }
189 } 191 }
190 192
191 reconfigure_widgets; 193 reconfigure_widgets;
… …
270 272
271 return unless $self->{visible}; 273 return unless $self->{visible};
272 274
273 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
274 276
277 delete $self->{visible};
275 delete $self->{root}; 278 delete $self->{root};
276 delete $self->{visible};
277 279
278 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
280 282
281 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
283 285
284 $self->focus_out; 286 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
287} 288}
288 289
289sub set_visibility { 290sub set_visibility {
290 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
313} 314}
314 315
315sub move_abs { 316sub move_abs {
316 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
317 318
318 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
321 322
322 $self->update; 323 $self->update;
323} 324}
324 325
… …
332} 333}
333 334
334sub size_request { 335sub size_request {
335 require Carp; 336 require Carp;
336 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
337} 342}
338 343
339sub configure { 344sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
341 346
… …
365 370
366 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
367 } 372 }
368} 373}
369 374
370sub size_allocate {
371 # nothing to be done
372}
373
374sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
375} 381}
376 382
377sub set_max_size { 383sub set_max_size {
378 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
379 385
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
382} 390}
383 391
384sub set_tooltip { 392sub set_tooltip {
385 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
386 394
… …
391 399
392 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
393 401
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
397 } 405 }
398} 406}
399 407
400# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
401sub coord2local { 409sub coord2local {
… …
409 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
410 418
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
412} 420}
413 421
414sub focus_in { 422sub invoke_focus_in {
415 my ($self) = @_; 423 my ($self) = @_;
416 424
417 return if $FOCUS == $self; 425 return if $FOCUS == $self;
418 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
419 427
420 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
421 429
422 $self->_emit (focus_in => $focus);
423
424 $focus->update if $focus; 430 $focus->update if $focus;
425 $FOCUS->update; 431 $FOCUS->update;
426}
427 432
433 0
434}
435
428sub focus_out { 436sub invoke_focus_out {
429 my ($self) = @_; 437 my ($self) = @_;
430 438
431 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
432 440
433 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
434 442
435 $self->_emit (focus_out => $focus);
436
437 $focus->update if $focus; #? 443 $focus->update if $focus; #?
438 444
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 446 unless $FOCUS;
441}
442 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
443sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
444sub button_up { } 458sub invoke_button_up { 1 }
445sub key_down { } 459sub invoke_key_down { 1 }
446sub key_up { } 460sub invoke_key_up { 1 }
447 461
448sub button_down { 462sub invoke_button_down {
449 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
450 464
451 $self->focus_in; 465 $self->grab_focus;
452}
453 466
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
459 484
460sub find_widget { 485sub find_widget {
461 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
462 487
463 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
472sub set_parent { 497sub set_parent {
473 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
474 499
475 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible}; 501 $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} 502}
501 503
502sub realloc { 504sub realloc {
503 my ($self) = @_; 505 my ($self) = @_;
504 506
… …
525 527
526 $self->realloc; 528 $self->realloc;
527 $self->update; 529 $self->update;
528} 530}
529 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
535
530sub draw { 536sub draw {
531 my ($self) = @_; 537 my ($self) = @_;
532 538
533 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
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534 548
535 glPushMatrix; 549 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 551
540 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 554 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 556 glBegin GL_QUADS;
547 glVertex $x , $y; 557 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
551 glEnd; 561 glEnd;
552 glDisable GL_BLEND; 562 glDisable GL_BLEND;
553 } 563 }
554 564
555 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 566 glPushMatrix;
557 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 570 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
564 glEnd; 574 glEnd;
565 glPopMatrix; 575 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
568} 581}
569 582
570sub _draw { 583sub _draw {
571 my ($self) = @_; 584 my ($self) = @_;
572 585
… …
575 588
576sub DESTROY { 589sub DESTROY {
577 my ($self) = @_; 590 my ($self) = @_;
578 591
579 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
580 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
581} 596}
582 597
583############################################################################# 598#############################################################################
584 599
585package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
610 625
611 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
613 628
614 glEnable GL_BLEND; 629 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 631 glColor_premultiply @$color;
617 632
618 glBegin GL_QUADS; 633 glBegin GL_QUADS;
619 glVertex 0 , 0; 634 glVertex 0 , 0;
620 glVertex 0 , $h; 635 glVertex 0 , $h;
621 glVertex $w, $h; 636 glVertex $w, $h;
… …
652our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
653 668
654sub new { 669sub new {
655 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
656 671
657 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
658 673
659 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
660 children => [], 675 children => [],
661 can_events => 0, 676 can_events => 0,
662 %arg, 677 %arg,
663 ); 678 );
679
664 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
665 682
666 $self 683 $self
667} 684}
668 685
669sub add { 686sub add {
… …
717 $x -= $self->{x}; 734 $x -= $self->{x};
718 $y -= $self->{y}; 735 $y -= $self->{y};
719 736
720 my $res; 737 my $res;
721 738
722 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
724 and return $res; 741 and return $res;
725 } 742 }
726 743
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748} 765}
749 766
750sub add { 767sub add {
751 my ($self, $child) = @_; 768 my ($self, $child) = @_;
752 769
753 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
756} 772}
757 773
758sub remove { 774sub remove {
759 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
768 784
769sub size_request { 785sub size_request {
770 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
771} 787}
772 788
773sub size_allocate { 789sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
775 791
776 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
777} 795}
778 796
779############################################################################# 797#############################################################################
798
799# back-buffered drawing area
780 800
781package CFClient::UI::Window; 801package CFClient::UI::Window;
782 802
783our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
784 804
… …
795 815
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 817 $self->SUPER::update;
798} 818}
799 819
800sub size_allocate { 820sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
802 822
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
805} 826}
806 827
807sub _render { 828sub _render {
829 my ($self) = @_;
830
808 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
809} 832}
810 833
811sub render_child { 834sub render_child {
812 my ($self) = @_; 835 my ($self) = @_;
813 836
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
817 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
818 $self->_render; 848 $self->_render;
819 }; 849 };
820} 850}
821 851
822sub _draw { 852sub _draw {
823 my ($self) = @_; 853 my ($self) = @_;
824 854
825 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
826 856
827 my $tex = $self->{texture} 857 my $tex = $self->{texture}
828 or return; 858 or return;
829 859
830 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
833 863
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 865
836 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
837} 867}
… …
861 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
862 892
863 ($w, $h) 893 ($w, $h)
864} 894}
865 895
866sub size_allocate { 896sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
868 898
869 my $child = $self->child; 899 my $child = $self->child;
870 900
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 903
874 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
875 $self->update; 905 $self->update;
906
907 1
876} 908}
877 909
878sub set_offset { 910sub set_offset {
879 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
880 912
… …
913} 945}
914 946
915sub _render { 947sub _render {
916 my ($self) = @_; 948 my ($self) = @_;
917 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 954
920 $self->SUPER::_render; 955 $self->SUPER::_render;
921} 956}
922 957
… …
925package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
926 961
927our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
928 963
929sub new { 964sub new {
930 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
931 968
932 my $self; 969 my $self;
933 970
934 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
935 vertical => 1, 972 vertical => 1,
… …
940 ; 977 ;
941 978
942 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 981 slider => $slider,
945 @_, 982 %arg,
946 ); 983 );
947 984
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
951 987
952 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
953} 995}
954 996
955sub update { 997sub update {
956 my ($self) = @_; 998 my ($self) = @_;
957 999
… …
960 # todo: overwrite size_allocate of child 1002 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1005}
964 1006
965sub size_allocate { 1007sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969 1009
970 my $child = $self->{vp}->child; 1010 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
972} 1014}
973 1015
974#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll 1017# update viewport offset on scroll
976 1018
… …
996 1038
997 if ($self->{bg}) { 1039 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
999 1041
1000 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
1003 1045
1004 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1047 glVertex 0 , 0;
1006 glVertex 0 , $h; 1048 glVertex 0 , $h;
1007 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1029my @border = 1071my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 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); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1074
1033sub new { 1075sub new {
1034 my $class = shift; 1076 my ($class, %arg) = @_;
1035 1077
1036 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1081 border => 0.6,
1040 can_events => 1, 1082 can_events => 1,
1041 min_w => 16, 1083 min_w => 16,
1042 min_h => 16, 1084 min_h => 16,
1043 @_ 1085 %arg,
1044 ); 1086 );
1045 1087
1046 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1047 align => 0, 1089 align => 0,
1048 valign => 1, 1090 valign => 1,
1049 text => $self->{title}, 1091 text => $self->{title},
1050 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
1051 1103
1052 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1113}
1054 1114
1055sub border { 1115sub border {
1056 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1057} 1117}
1058 1118
1059sub size_request { 1119sub size_request {
1060 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
1061 1127
1062 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1063 1129
1064 ( 1130 (
1065 $w + $self->border * 2, 1131 $w + $self->border * 2,
1066 $h + $self->border * 2, 1132 $h + $self->border * 2,
1067 ) 1133 )
1068} 1134}
1069 1135
1070sub size_allocate { 1136sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1072 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
1073 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1075 1149
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
1082sub button_down { 1158sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1084 1160
1085 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1162 my $border = $self->border;
1087 1163
… …
1103 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
1104 1180
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1183
1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1185 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1186 };
1111 1187
1112 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
1118 1194
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1196
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1198 # HACK: the next line is required to enforce placement
1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1200 };
1201 } else {
1202 return 0;
1203 }
1204
1123 } 1205 1
1124} 1206}
1125 1207
1126sub button_up { 1208sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1128 1210
1129 delete $self->{motion}; 1211 ! ! delete $self->{motion}
1130} 1212}
1131 1213
1132sub mouse_motion { 1214sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1134 1216
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218
1219 ! ! $self->{motion}
1136} 1220}
1137 1221
1138sub _draw { 1222sub _draw {
1139 my ($self) = @_; 1223 my ($self) = @_;
1140 1224
1225 my $child = $self->{children}[0];
1226
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1227 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1228 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1229
1144 glEnable GL_TEXTURE_2D; 1230 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1232
1147 my $border = $self->border; 1233 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1248 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1249 }
1164 1250
1165 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1166 1252
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1253 $child->draw;
1254
1255 if ($self->{title_widget}) {
1256 glTranslate 0, $border - $self->{h};
1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
1170} 1264}
1171 1265
1172############################################################################# 1266#############################################################################
1173 1267
1174package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1197 1291
1198 $child->set_parent ($self); 1292 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1200 1294
1201 $self->realloc; 1295 $self->realloc;
1296}
1297
1298sub remove {
1299 my ($self, $child) = @_;
1300
1301 # TODO: not yet implemented
1202} 1302}
1203 1303
1204# TODO: move to container class maybe? send children a signal on removal? 1304# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1305sub clear {
1206 my ($self) = @_; 1306 my ($self) = @_;
… …
1247 (sum @$ws), 1347 (sum @$ws),
1248 (sum @$hs), 1348 (sum @$hs),
1249 ) 1349 )
1250} 1350}
1251 1351
1252sub size_allocate { 1352sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1254 1354
1255 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1256 1356
1257 my $req_w = (sum @$ws) || 1; 1357 my $req_w = (sum @$ws) || 1;
… …
1289 } 1389 }
1290 1390
1291 $y += $row_h; 1391 $y += $row_h;
1292 } 1392 }
1293 1393
1394 1
1294} 1395}
1295 1396
1296sub find_widget { 1397sub find_widget {
1297 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1298 1399
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1438 )
1338} 1439}
1339 1440
1340sub size_allocate { 1441sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1342 1443
1343 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1445 my @children = $self->visible_children;
1345 1446
1346 my @req; 1447 my @req;
1347 1448
1348 if ($self->{homogeneous}) { 1449 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1450 @req = ($space / (@children || 1)) x @children;
1350 } else { 1451 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1453 my $req = List::Util::sum @req;
1353 1454
1354 if ($req > $space) { 1455 if ($req > $space) {
1355 # ah well, not enough space 1456 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1457 $_ *= $space / $req for @req;
1357 } else { 1458 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1460
1360 $space = ($space - $req) / $expand; # remaining space to give away 1461 $space = ($space - $req) / $expand; # remaining space to give away
1361 1462
1362 $req[$_] += $space * $children->[$_]{expand} 1463 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1464 for 0 .. $#children;
1364 } 1465 }
1365 } 1466 }
1366 1467
1367 CFClient::UI::harmonize \@req; 1468 CFClient::UI::harmonize \@req;
1368 1469
1369 my $pos = 0; 1470 my $pos = 0;
1370 for (0 .. $#$children) { 1471 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1472 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1474
1374 $pos += $alloc; 1475 $pos += $alloc;
1375 } 1476 }
1376 1477
1377 1 1478 1
… …
1467 1568
1468 delete $self->{texture}; 1569 delete $self->{texture};
1469 $self->SUPER::update; 1570 $self->SUPER::update;
1470} 1571}
1471 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1472sub set_text { 1580sub set_text {
1473 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1474 1582
1475 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1477 1585
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1480 1588
1589 delete $self->{size_req};
1481 $self->realloc; 1590 $self->realloc;
1482 $self->update; 1591 $self->update;
1483} 1592}
1484 1593
1485sub set_markup { 1594sub set_markup {
… …
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1601
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1495 1604
1605 delete $self->{size_req};
1496 $self->realloc; 1606 $self->realloc;
1497 $self->update; 1607 $self->update;
1498} 1608}
1499 1609
1500sub size_request { 1610sub size_request {
1501 my ($self) = @_; 1611 my ($self) = @_;
1502 1612
1613 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1619
1509 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1510 1621
1511 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1625
1515 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1516 1627
1517 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1519 } 1633 };
1520 1634
1521 ($w, $h) 1635 @{ $self->{size_req} }
1522} 1636}
1523 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1524sub size_allocate { 1642sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1526 1644
1645 delete $self->{ox};
1646
1527 delete $self->{texture}; 1647 delete $self->{texture}
1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1528} 1651}
1529 1652
1530sub set_fontsize { 1653sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1532 1655
1533 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1534 delete $self->{texture}; 1657 delete $self->{texture};
1535 1658
1536 $self->realloc; 1659 $self->realloc;
1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1537} 1668}
1538 1669
1539sub _draw { 1670sub _draw {
1540 my ($self) = @_; 1671 my ($self) = @_;
1541 1672
… …
1547 $self->{layout}->set_width ($self->{w}); 1678 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1679 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1682
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1683 new_from_layout CFClient::Texture $self->{layout}
1684 };
1553 1685
1686 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1689 : ($self->{w} - $tex->{w}) * 0.5);
1557 1690
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1693 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1563 }; 1694 };
1564 1695
1565 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1567 1700
1568 if ($tex->{format} == GL_ALPHA) { 1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1569 glColor @{$self->{fg}}; 1703 glColor @{$self->{fg}};
1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1571 } else { 1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1573 } 1708 }
1574 1709
1575 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1576} 1711}
1577 1712
… …
1594 can_hover => 1, 1729 can_hover => 1,
1595 can_focus => 1, 1730 can_focus => 1,
1596 valign => 0, 1731 valign => 0,
1597 can_events => 1, 1732 can_events => 1,
1598 #text => ... 1733 #text => ...
1734 #hidden => "*",
1599 @_ 1735 @_
1600 ) 1736 )
1601} 1737}
1602 1738
1603sub _set_text { 1739sub _set_text {
… …
1605 1741
1606 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1607 1743
1608 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1609 1745
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1747 $self->{text} = $text;
1614 1748
1615 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1617 1752
1618 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1619} 1757}
1620 1758
1621sub set_text { 1759sub set_text {
1622 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1623 1761
1624 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 1763 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 1764}
1629 1765
1630sub get_text { 1766sub get_text {
1631 $_[0]{text} 1767 $_[0]{text}
1632} 1768}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1638 1774
1639 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1640} 1776}
1641 1777
1642sub key_down { 1778sub invoke_key_down {
1643 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1644 1780
1645 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1659 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1660 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 1800 $self->emit ('escape');
1665 } elsif ($uni) { 1801 } elsif ($uni) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1667 } 1805 }
1668 1806
1669 $self->_set_text ($text); 1807 $self->_set_text ($text);
1670 1808
1671 $self->realloc; 1809 $self->realloc;
1672}
1673 1810
1811 1
1812}
1813
1674sub focus_in { 1814sub invoke_focus_in {
1675 my ($self) = @_; 1815 my ($self) = @_;
1676 1816
1677 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1678 1818
1679 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1680} 1820}
1681 1821
1682sub button_down { 1822sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1684 1824
1685 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 1826
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 1828
1689 # byte-index to char-index 1829 # byte-index to char-index
1690 my $text = $self->{text}; 1830 my $text = $self->{text};
1691 utf8::encode $text; 1831 utf8::encode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1693 1833
1694 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1695 $self->update; 1835 $self->update;
1836
1837 1
1696} 1838}
1697 1839
1698sub mouse_motion { 1840sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1843
1844 1
1701} 1845}
1702 1846
1703sub _draw { 1847sub _draw {
1704 my ($self) = @_; 1848 my ($self) = @_;
1705 1849
1706 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1707 1851
1708 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1711 } else { 1855 } else {
1712 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1713 } 1857 }
1714 1858
1715 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1718 glVertex 0 , 0; 1862 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1746 1890
1747our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1748 1892
1749use CFClient::OpenGL; 1893use CFClient::OpenGL;
1750 1894
1751sub key_down { 1895sub invoke_key_down {
1752 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1753 1897
1754 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1755 1899
1756 if ($sym == 13) { 1900 if ($sym == 13) {
1757 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1759 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1762 $self->update; 1907 $self->update;
1763 1908
1764 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1782 } else { 1927 } else {
1783 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1784 } 1929 }
1785 1930
1786 } else { 1931 } else {
1787 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1788 } 1935 1
1789
1790} 1936}
1791 1937
1792############################################################################# 1938#############################################################################
1793 1939
1794package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1815 can_events => 1, 1961 can_events => 1,
1816 @_ 1962 @_
1817 ) 1963 )
1818} 1964}
1819 1965
1820sub activate { }
1821
1822sub button_up { 1966sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1824 1968
1825 $self->emit ("activate") 1969 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
1972
1973 1
1828} 1974}
1829 1975
1830sub _draw { 1976sub _draw {
1831 my ($self) = @_; 1977 my ($self) = @_;
1832 1978
1833 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 1980
1839 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1842 1984
1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1844 1986
1845 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1846 1988
1847 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1848} 2026}
1849 2027
1850############################################################################# 2028#############################################################################
1851 2029
1852package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1879 my ($self) = @_; 2057 my ($self) = @_;
1880 2058
1881 (6) x 2 2059 (6) x 2
1882} 2060}
1883 2061
1884sub button_down { 2062sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1886 2064
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1890 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
1891 } 2073 1
1892} 2074}
1893 2075
1894sub _draw { 2076sub _draw {
1895 my ($self) = @_; 2077 my ($self) = @_;
1896 2078
… …
1916package CFClient::UI::Image; 2098package CFClient::UI::Image;
1917 2099
1918our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1919 2101
1920use CFClient::OpenGL; 2102use CFClient::OpenGL;
1921use Carp qw/confess/;
1922 2103
1923our %loaded_images; 2104our %texture_cache;
1924 2105
1925sub new { 2106sub new {
1926 my $class = shift; 2107 my $class = shift;
1927 2108
1928 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1929 2113
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
1931 2116
1932 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1934 2119
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
1936 2121
1937 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940 2123
1941 $self 2124 $self
1942} 2125}
1943 2126
1944sub size_request { 2127sub size_request {
1945 my ($self) = @_; 2128 my ($self) = @_;
1946 2129
1947 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
1948} 2131}
1949 2132
1950sub _draw { 2133sub _draw {
1951 my ($self) = @_; 2134 my ($self) = @_;
1952 2135
… …
2063 2246
2064 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
2066 2249
2067 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2255
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2187 $self->update; 2371 $self->update;
2188 2372
2189 $self 2373 $self
2190} 2374}
2191 2375
2192sub changed { }
2193
2194sub set_range { 2376sub set_range {
2195 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2196 2378
2197 ($range, $self->{range}) = ($self->{range}, $range); 2379 ($range, $self->{range}) = ($self->{range}, $range);
2198 2380
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2381 if ("@$range" ne "@{$self->{range}}") {
2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2201} 2385}
2202 2386
2203sub set_value { 2387sub set_value {
2204 my ($self, $value) = @_; 2388 my ($self, $value) = @_;
2205 2389
… …
2216 if $unit; 2400 if $unit;
2217 2401
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2403
2220 if ($value != $old_value) { 2404 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2222 $self->update; 2406 $self->update;
2223 } 2407 }
2224} 2408}
2225 2409
2226sub size_request { 2410sub size_request {
2227 my ($self) = @_; 2411 my ($self) = @_;
2228 2412
2229 ($self->{req_w}, $self->{req_h}) 2413 ($self->{req_w}, $self->{req_h})
2230} 2414}
2231 2415
2232sub button_down { 2416sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2234 2418
2235 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2420
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2422
2239 $self->mouse_motion ($ev, $x, $y); 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2240} 2424}
2241 2425
2242sub mouse_motion { 2426sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2244 2428
2245 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2431
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2432 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2433
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2434 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2435
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2436 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437 } else {
2438 return 0;
2439 }
2440
2253 } 2441 1
2254} 2442}
2255 2443
2256sub update { 2444sub update {
2257 my ($self) = @_; 2445 my ($self) = @_;
2258 2446
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2447 delete $self->{knob_w};
2448 $self->SUPER::update;
2449}
2450
2451sub _draw {
2452 my ($self) = @_;
2453
2454 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2455 $self->set_value ($self->{range}[0]);
2261 2456
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2458 my $range = ($hi - $page - $lo) || 1e-100;
2264 2459
… …
2270 $value = ($value - $lo) / $range; 2465 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2466 $value = $value * $self->{scale} + $self->{offset};
2272 2467
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2469 $self->{knob_w} = $knob_w;
2275 }); 2470 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2471
2283 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2284 2473
2285 glScale $self->{w}, $self->{h}; 2474 glScale $self->{w}, $self->{h};
2286 2475
… …
2347sub set_range { shift->{slider}->set_range (@_) } 2536sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 2537sub set_value { shift->{slider}->set_value (@_) }
2349 2538
2350############################################################################# 2539#############################################################################
2351 2540
2352package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2353 2542
2354our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2355 2544
2356use CFClient::OpenGL; 2545use CFClient::OpenGL;
2357 2546
… …
2359 my $class = shift; 2548 my $class = shift;
2360 2549
2361 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2362 fontsize => 1, 2551 fontsize => 1,
2363 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2364 #font => default_font 2554 #font => default_font
2365 @_, 2555 @_,
2366 2556
2367 layout => (new CFClient::Layout 1), 2557 layout => (new CFClient::Layout 1),
2368 par => [], 2558 par => [],
… …
2383 2573
2384 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2385 $self->reflow; 2575 $self->reflow;
2386} 2576}
2387 2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2388sub size_allocate { 2587sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2390 2589
2391 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392 2592
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2595 $self->{layout}->set_width ($empty->{w});
2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2597
2397 $self->reflow; 2598 $self->reflow;
2398}
2399 2599
2400sub text_size { 2600 local $self->{children} = [$empty, $slider];
2401 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2402 2606
2403 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2404 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2408 2620 );
2621
2409 $layout->size 2622 $layout
2410} 2623}
2411 2624
2412sub reflow { 2625sub reflow {
2413 my ($self) = @_; 2626 my ($self) = @_;
2414 2627
… …
2423 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2424} 2637}
2425 2638
2426sub clear { 2639sub clear {
2427 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2428 2644
2429 $self->{par} = []; 2645 $self->{par} = [];
2430 $self->{height} = 0; 2646 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2648}
2433 2649
2434sub add_paragraph { 2650sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2436 2652
2437 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2438 my ($w, $h) = $self->text_size ($line); 2654
2439 $self->{height} += $h; 2655 $para = {
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2441 } 2662 };
2442 2663
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2666
2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2670
2671sub scroll_to_bottom {
2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2444} 2676}
2445 2677
2446sub update { 2678sub update {
2447 my ($self) = @_; 2679 my ($self) = @_;
2448 2680
… …
2450 2682
2451 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2452 2684
2453 delete $self->{texture}; 2685 delete $self->{texture};
2454 2686
2455 $ROOT->on_post_alloc ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2689
2458 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2691 my $height = 0;
2460 2692
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2695 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2696 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2697
2471 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2472 } 2701 }
2473 2702
2474 $height += $_->[1]; 2703 $height += $para->{h};
2475 } 2704 }
2476 2705
2477 $self->{height} = $height; 2706 $self->{height} = $height;
2478 2707
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2709
2481 delete $self->{texture}; 2710 delete $self->{texture};
2482 } 2711 }
2483 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2718 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2487 2720
2488 my $top = int $self->{children}[1]{range}[0]; 2721 my $top = int $self->{children}[1]{range}[0];
2489 2722
2490 my $y0 = $top; 2723 my $y0 = $top;
2491 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2492 2725
2493 my $y = 0; 2726 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498 2727
2499 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502 2731
2503 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2733 my $h = $para->{h};
2505 2734
2506 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 2736
2508 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2509 $layout->set_markup ($par->[4]);
2510 2738
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2512 2740
2513 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 for (@w) {
2748 my ($dx, $dy) = splice @s, 0, 2, ();
2749
2750 $_->{x} = $dx + $para->{indent};
2751 $_->{y} = $dy + $y - $y0;
2752
2753 $_->draw;
2754 }
2755 }
2515 } 2756 }
2516 2757
2517 $y += $h; 2758 $y += $h;
2518 } 2759 }
2519 2760
2520 glDisable GL_BLEND; 2761 glDisable GL_BLEND;
2521 }; 2762 };
2522 }); 2763 });
2523} 2764}
2524 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2525sub _draw { 2775sub _draw {
2526 my ($self) = @_; 2776 my ($self) = @_;
2527 2777
2528 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2533 2783
2534 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2535
2536} 2785}
2537 2786
2538############################################################################# 2787#############################################################################
2539 2788
2540package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 2878 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 2879 . "visible $widget->{visible}";
2631 } 2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2632 2884
2633 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2634 markup => $tooltip, 2886 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 2888 fontsize => 0.8,
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 2899
2648 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2649} 2901}
2650 2902
2651sub size_allocate { 2903sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2653 2905
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 2907}
2656 2908
2657sub visibility_change { 2909sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2659 2911
2660 return unless $visible; 2912 return unless $visible;
2661 2913
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2664 or return; 2916 or return;
2665 2917
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 2919
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 2921 if $x + $self->{w} > $self->{root}{w};
2670 2922
2671 $self->move_abs ($x, $y); 2923 $self->move_abs ($x, $y);
2672 }); 2924 });
2673} 2925}
2674 2926
… …
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764 3016
2765 if ($tex) { 3017 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2771 } 3023 }
2772} 3024}
2773 3025
2774sub DESTROY { 3026sub destroy {
2775 my ($self) = @_; 3027 my ($self) = @_;
2776 3028
2777 $self->{timer}->cancel 3029 $self->{timer}->cancel
2778 if $self->{timer}; 3030 if $self->{timer};
2779 3031
2780 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2781} 3033}
2782 3034
2783############################################################################# 3035#############################################################################
2784 3036
2785package CFClient::UI::Inventory; 3037package CFClient::UI::Buttonbar;
2786 3038
2787our @ISA = CFClient::UI::ScrolledWindow::; 3039our @ISA = CFClient::UI::HBox::;
2788 3040
2789sub new { 3041# TODO: should actualyl wrap buttons and other goodies.
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 3042
2825############################################################################# 3043#############################################################################
2826 3044
2827package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2828 3046
… …
2840 ); 3058 );
2841 3059
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843 3061
2844 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2846 3064
2847 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2848 if (!ref $widget) { 3066 if (!ref $widget) {
2849 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2850 can_hover => 1, 3068 can_hover => 1,
2851 can_events => 1, 3069 can_events => 1,
2852 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2853 } 3072 }
2854 3073
2855 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2856 3075
2857 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2862 3081
2863# popup given the event (must be a mouse button down event currently) 3082# popup given the event (must be a mouse button down event currently)
2864sub popup { 3083sub popup {
2865 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
2866 3085
2867 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
2868 3087
2869 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self; 3089 $GRAB = $self;
2871 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2872 3091
2873 $self->show; 3092 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875} 3094}
2876 3095
2877sub mouse_motion { 3096sub invoke_mouse_motion {
2878 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2879 3098
2880 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2883}
2884 3102
3103 0
3104}
3105
2885sub button_up { 3106sub invoke_button_up {
2886 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2887 3108
2888 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB; 3110 undef $GRAB;
2890 $self->hide; 3111 $self->hide;
2891 3112
2892 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
3115 } else {
3116 return 0
3117 }
3118
2894 } 3119 1
2895} 3120}
2896 3121
2897############################################################################# 3122#############################################################################
2898 3123
2899package CFClient::UI::Statusbox; 3124package CFClient::UI::Multiplexer;
2900 3125
2901our @ISA = CFClient::UI::VBox::; 3126our @ISA = CFClient::UI::Container::;
2902 3127
2903sub new { 3128sub new {
2904 my $class = shift; 3129 my $class = shift;
2905 3130
2906 $class->SUPER::new ( 3131 my $self = $class->SUPER::new (
3132 @_,
3133 );
3134
3135 $self->{current} = $self->{children}[0]
3136 if @{ $self->{children} };
3137
3138 $self
3139}
3140
3141sub add {
3142 my ($self, @widgets) = @_;
3143
3144 $self->SUPER::add (@widgets);
3145
3146 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} };
3148}
3149
3150sub set_current_page {
3151 my ($self, $page_or_widget) = @_;
3152
3153 my $widget = ref $page_or_widget
3154 ? $page_or_widget
3155 : $self->{children}[$page_or_widget];
3156
3157 $self->{current} = $widget;
3158 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3159
3160 $self->emit (page_changed => $self->{current});
3161
3162 $self->realloc;
3163}
3164
3165sub visible_children {
3166 $_[0]{current}
3167}
3168
3169sub size_request {
3170 my ($self) = @_;
3171
3172 $self->{current}->size_request
3173}
3174
3175sub invoke_size_allocate {
3176 my ($self, $w, $h) = @_;
3177
3178 $self->{current}->configure (0, 0, $w, $h);
3179
3180 1
3181}
3182
3183sub _draw {
3184 my ($self) = @_;
3185
3186 $self->{current}->draw;
3187}
3188
3189#############################################################################
3190
3191package CFClient::UI::Notebook;
3192
3193our @ISA = CFClient::UI::VBox::;
3194
3195sub new {
3196 my $class = shift;
3197
3198 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self
3202 @_,
3203 );
3204
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3206 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3207
3208 $self
3209}
3210
3211sub add {
3212 my ($self, $title, $widget, $tooltip) = @_;
3213
3214 Scalar::Util::weaken $self;
3215
3216 $self->{buttonbar}->add (new CFClient::UI::Button
3217 markup => $title,
3218 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) },
3220 );
3221
3222 $self->{multiplexer}->add ($widget);
3223}
3224
3225sub set_current_page {
3226 my ($self, $page) = @_;
3227
3228 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current});
3230}
3231
3232#############################################################################
3233
3234package CFClient::UI::Combobox;
3235
3236use utf8;
3237
3238our @ISA = CFClient::UI::Button::;
3239
3240sub new {
3241 my $class = shift;
3242
3243 my $self = $class->SUPER::new (
3244 options => [], # [value, title, longdesc], ...
3245 value => undef,
3246 @_,
3247 );
3248
3249 $self->_set_value ($self->{value});
3250
3251 $self
3252}
3253
3254sub invoke_button_down {
3255 my ($self, $ev) = @_;
3256
3257 my @menu_items;
3258
3259 for (@{ $self->{options} }) {
3260 my ($value, $title, $tooltip) = @$_;
3261
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 }
3264
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266}
3267
3268sub _set_value {
3269 my ($self, $value) = @_;
3270
3271 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3272 or return;
3273
3274 $self->{value} = $item->[0];
3275 $self->set_markup ("$item->[1] ⇓");
3276 $self->set_tooltip ($item->[2]);
3277}
3278
3279sub set_value {
3280 my ($self, $value) = @_;
3281
3282 return unless $self->{value} ne $value;
3283
3284 $self->_set_value ($value);
3285 $self->emit (changed => $value);
3286}
3287
3288#############################################################################
3289
3290package CFClient::UI::Statusbox;
3291
3292our @ISA = CFClient::UI::VBox::;
3293
3294sub new {
3295 my $class = shift;
3296
3297 my $self = $class->SUPER::new (
2907 fontsize => 0.8, 3298 fontsize => 0.8,
2908 @_, 3299 @_,
2909 ) 3300 );
3301
3302 Scalar::Util::weaken (my $this = $self);
3303
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305
3306 $self
2910} 3307}
2911 3308
2912sub reorder { 3309sub reorder {
2913 my ($self) = @_; 3310 my ($self) = @_;
2914 my $NOW = time; 3311 my $NOW = Time::HiRes::time;
3312
3313 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} };
2915 3317
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3318 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3319 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3320 }
2919 3321
… …
2922 my @items = sort { 3324 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3325 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3326 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3327 } values %{ $self->{item} };
2926 3328
3329 $self->{timer}->interval (1);
3330
2927 my $count = 10 + 1; 3331 my $count = 10 + 1;
2928 for my $item (@items) { 3332 for my $item (@items) {
2929 last unless --$count; 3333 last unless --$count;
2930 3334
2931 push @widgets, $item->{label} ||= do { 3335 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3336 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3337 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3338 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3339 : $item->{text};
2936 3340
… …
2944 tooltip => $item->{tooltip}, 3348 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3349 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3350 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3351 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3352 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3353 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3354 can_events => 1,
2951 can_hover => 1 3355 can_hover => 1
2952 }; 3356 };
3357
3358 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3359 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3360 $label->update;
3361 $label->set_max_size (undef, $label->{req_h} * $diff)
3362 if $diff < 1;
3363 $self->{timer}->interval (1/30);
3364 } else {
3365 $label->{fg}[3] = $item->{fg}[3] || 1;
3366 }
3367
3368 push @widgets, $label;
2953 } 3369 }
2954 3370
2955 $self->clear; 3371 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3372 $self->SUPER::add (reverse @widgets);
2957} 3373}
… …
2962 $text =~ s/^\s+//; 3378 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3379 $text =~ s/\s+$//;
2964 3380
2965 return unless $text; 3381 return unless $text;
2966 3382
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3383 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3384
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3385 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3386
2971 if (my $item = $self->{item}{$group}) { 3387 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3388 if ($item->{text} eq $text) {
2973 $item->{count}++; 3389 $item->{count}++;
2974 } else { 3390 } else {
2975 $item->{count} = 1; 3391 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text; 3392 $item->{text} = $item->{tooltip} = $text;
2977 } 3393 }
2978 $item->{id} = ++$self->{id}; 3394 $item->{id} += 0.2;#d#
2979 $item->{timeout} = $timeout; 3395 $item->{timeout} = $timeout;
2980 delete $item->{label}; 3396 delete $item->{label};
2981 } else { 3397 } else {
2982 $self->{item}{$group} = { 3398 $self->{item}{$group} = {
2983 id => ++$self->{id}, 3399 id => ++$self->{id},
… …
3002 3418
3003 $self->reorder; 3419 $self->reorder;
3004 $self->SUPER::reconfigure; 3420 $self->SUPER::reconfigure;
3005} 3421}
3006 3422
3423sub destroy {
3424 my ($self) = @_;
3425
3426 $self->{timer}->cancel;
3427
3428 $self->SUPER::destroy;
3429}
3430
3007############################################################################# 3431#############################################################################
3008 3432
3433package CFClient::UI::Inventory;
3434
3435our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437sub new {
3438 my $class = shift;
3439
3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3693 @_,
3694 )
3695}
3696
3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3783 my ($self, $spell) = @_;
3784
3785 $self->{spell}->{$spell->{name}} = $spell;
3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3009package CFClient::UI::Root; 3805package CFClient::UI::Root;
3010 3806
3011our @ISA = CFClient::UI::Container::; 3807our @ISA = CFClient::UI::Container::;
3808
3809use List::Util qw(min max);
3012 3810
3013use CFClient::OpenGL; 3811use CFClient::OpenGL;
3014 3812
3015sub new { 3813sub new {
3016 my $class = shift; 3814 my $class = shift;
… …
3043 $coord = $max - $size if $coord > $max - $size; 3841 $coord = $max - $size if $coord > $max - $size;
3044 3842
3045 int $coord + 0.5 3843 int $coord + 0.5
3046} 3844}
3047 3845
3048sub size_allocate { 3846sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3847 my ($self, $w, $h) = @_;
3050 3848
3051 for my $child ($self->children) { 3849 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3850 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053 3851
… …
3057 $X = _to_pixel $X, $W, $self->{w}; 3855 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h}; 3856 $Y = _to_pixel $Y, $H, $self->{h};
3059 3857
3060 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
3061 } 3859 }
3860
3861 1
3062} 3862}
3063 3863
3064sub coord2local { 3864sub coord2local {
3065 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
3066 3866
… …
3122 $_->() 3922 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3923 for values %{delete $self->{refresh_hook}};
3124 } 3924 }
3125 3925
3126 if ($self->{realloc}) { 3926 if ($self->{realloc}) {
3927 my %queue;
3127 my @queue; 3928 my @queue;
3929 my $widget;
3128 3930
3931 outer:
3129 while () { 3932 while () {
3130 if ($self->{realloc}) { 3933 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 3934 for $widget (values %$realloc) {
3935 $widget->{visible} or next; # do not resize invisible widgets
3132 3936
3133 use sort 'stable'; 3937 $queue{$widget+0}++ and next; # duplicates are common
3134 3938
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 3939 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 3940 }
3137 } 3941 }
3138 3942
3943 while () {
3944 @queue or last outer;
3945
3139 my $widget = pop @queue || last; 3946 $widget = pop @{ $queue[-1] || [] }
3947 and last;
3948
3949 pop @queue;
3950 }
3140 3951
3141 $widget->{visible} or last; # do not resize invisible widgets 3952 delete $queue{$widget+0};
3142 3953
3143 my ($w, $h) = $widget->size_request; 3954 my ($w, $h) = $widget->size_request;
3144 3955
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3956 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3957 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147 3961
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 3962 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 3963 $h = $widget->{force_h} if exists $widget->{force_h};
3150 3964
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3965 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3154 $widget->{req_h} = $h; 3968 $widget->{req_h} = $h;
3155 3969
3156 $self->{size_alloc}{$widget+0} = $widget; 3970 $self->{size_alloc}{$widget+0} = $widget;
3157 3971
3158 if (my $parent = $widget->{parent}) { 3972 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 3973 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 3974 unless $queue{$parent+0};
3975
3161 $parent->{force_size_alloc} = 1; 3976 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 3977 $self->{size_alloc}{$parent+0} = $parent;
3163 } 3978 }
3164 } 3979 }
3165 3980
… …
3181 3996
3182 $w = int $w + 0.5; 3997 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 3998 $h = int $h + 0.5;
3184 3999
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w};
4002 $widget->{old_h} = $widget->{h};
4003
3186 $widget->{w} = $w; 4004 $widget->{w} = $w;
3187 $widget->{h} = $h; 4005 $widget->{h} = $h;
3188 4006
3189 $widget->emit (size_allocate => $w, $h); 4007 $widget->emit (size_allocate => $w, $h);
3190 } 4008 }
… …
3205 glLoadIdentity; 4023 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 4025 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 4026 glLoadIdentity;
3209 4027
4028 {
4029 package CFClient::UI::Base;
4030
4031 ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h});
4033 }
4034
3210 $self->_draw; 4035 $self->_draw;
3211} 4036}
3212 4037
3213############################################################################# 4038#############################################################################
3214 4039

Diff Legend

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