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.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.329 by root, Sun Jul 23 02:44:06 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 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $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;
320 $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;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
383} 390}
384 391
385sub set_tooltip { 392sub set_tooltip {
386 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
387 394
… …
392 399
393 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
394 401
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 405 }
399} 406}
400 407
401# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
402sub coord2local { 409sub coord2local {
… …
410 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
411 418
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 420}
414 421
415sub focus_in { 422sub invoke_focus_in {
416 my ($self) = @_; 423 my ($self) = @_;
417 424
418 return if $FOCUS == $self; 425 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
420 427
421 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
422 429
423 $self->_emit (focus_in => $focus); 430 $self->update;
424 431
425 $focus->update if $focus; 432 0
426 $FOCUS->update;
427} 433}
428 434
429sub focus_out { 435sub invoke_focus_out {
430 my ($self) = @_; 436 my ($self) = @_;
431 437
432 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
433 439
434 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
435 441
436 $self->_emit (focus_out => $focus); 442 $self->update;
437 443
438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 445 unless $FOCUS;
442}
443 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
444sub mouse_motion { 0 } 457sub invoke_mouse_motion { 0 }
445sub button_up { 0 } 458sub invoke_button_up { 0 }
446sub key_down { 0 } 459sub invoke_key_down { 0 }
447sub key_up { 0 } 460sub invoke_key_up { 0 }
448 461
449sub button_down { 462sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
451 464
452 $self->focus_in; 465 $self->grab_focus;
453 466
454 0 467 0
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480
481 #d##TODO# stop propagating at first true, do not use sum
482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
455} 485}
456 486
457sub find_widget { 487sub find_widget {
458 my ($self, $x, $y) = @_; 488 my ($self, $x, $y) = @_;
459 489
… …
469sub set_parent { 499sub set_parent {
470 my ($self, $parent) = @_; 500 my ($self, $parent) = @_;
471 501
472 Scalar::Util::weaken ($self->{parent} = $parent); 502 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible}; 503 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497} 504}
498 505
499sub realloc { 506sub realloc {
500 my ($self) = @_; 507 my ($self) = @_;
501 508
… …
534 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
535 542
536 # update screen rectangle 543 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x}; 544 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y}; 545 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541 546
542 # skip widgets that are entirely outside the drawing area 547 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 550
546 glPushMatrix; 551 glPushMatrix;
547 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
548 $self->_draw;
549 glPopMatrix;
550 553
551 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
552 my ($x, $y) = @$self{qw(x y)};
553
554 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
555 glEnable GL_BLEND; 556 glEnable GL_BLEND;
556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
557 glBegin GL_QUADS; 558 glBegin GL_QUADS;
558 glVertex $x , $y; 559 glVertex 0 , 0;
559 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
560 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
561 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
562 glEnd; 563 glEnd;
563 glDisable GL_BLEND; 564 glDisable GL_BLEND;
564 } 565 }
565 566
566 if ($ENV{CFPLUS_DEBUG} & 1) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
567 glPushMatrix; 568 glPushMatrix;
568 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
570 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
571 glVertex 0 , 0; 572 glVertex 0 , 0;
572 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
573 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
574 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
575 glEnd; 576 glEnd;
576 glPopMatrix; 577 glPopMatrix;
577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
578 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
579} 583}
580 584
581sub _draw { 585sub _draw {
582 my ($self) = @_; 586 my ($self) = @_;
583 587
… …
585} 589}
586 590
587sub DESTROY { 591sub DESTROY {
588 my ($self) = @_; 592 my ($self) = @_;
589 593
594 return if CFClient::in_destruct;
595
590 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
591 #$self->deactivate; 597
598 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
592} 600}
593 601
594############################################################################# 602#############################################################################
595 603
596package CFClient::UI::DrawBG; 604package CFClient::UI::DrawBG;
… …
621 629
622 if ($color && (@$color < 4 || $color->[3])) { 630 if ($color && (@$color < 4 || $color->[3])) {
623 my ($w, $h) = @$self{qw(w h)}; 631 my ($w, $h) = @$self{qw(w h)};
624 632
625 glEnable GL_BLEND; 633 glEnable GL_BLEND;
626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 634 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
627 glColor @$color; 635 glColor_premultiply @$color;
628 636
629 glBegin GL_QUADS; 637 glBegin GL_QUADS;
630 glVertex 0 , 0; 638 glVertex 0 , 0;
631 glVertex 0 , $h; 639 glVertex 0 , $h;
632 glVertex $w, $h; 640 glVertex $w, $h;
… …
663our @ISA = CFClient::UI::Base::; 671our @ISA = CFClient::UI::Base::;
664 672
665sub new { 673sub new {
666 my ($class, %arg) = @_; 674 my ($class, %arg) = @_;
667 675
668 my $children = delete $arg{children} || []; 676 my $children = delete $arg{children};
669 677
670 my $self = $class->SUPER::new ( 678 my $self = $class->SUPER::new (
671 children => [], 679 children => [],
672 can_events => 0, 680 can_events => 0,
673 %arg, 681 %arg,
674 ); 682 );
683
675 $self->add ($_) for @$children; 684 $self->add (@$children)
685 if $children;
676 686
677 $self 687 $self
678} 688}
679 689
680sub add { 690sub add {
… …
728 $x -= $self->{x}; 738 $x -= $self->{x};
729 $y -= $self->{y}; 739 $y -= $self->{y};
730 740
731 my $res; 741 my $res;
732 742
733 for (reverse @{ $self->{children} }) { 743 for (reverse $self->visible_children) {
734 $res = $_->find_widget ($x, $y) 744 $res = $_->find_widget ($x, $y)
735 and return $res; 745 and return $res;
736 } 746 }
737 747
738 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 748 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
759} 769}
760 770
761sub add { 771sub add {
762 my ($self, $child) = @_; 772 my ($self, $child) = @_;
763 773
764 $self->{children} = []; 774 $self->SUPER::remove ($_) for @{ $self->{children} };
765
766 $self->SUPER::add ($child); 775 $self->SUPER::add ($child);
767} 776}
768 777
769sub remove { 778sub remove {
770 my ($self, $widget) = @_; 779 my ($self, $widget) = @_;
… …
779 788
780sub size_request { 789sub size_request {
781 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
782} 791}
783 792
784sub size_allocate { 793sub invoke_size_allocate {
785 my ($self, $w, $h) = @_; 794 my ($self, $w, $h) = @_;
786 795
787 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
797
798 1
788} 799}
789 800
790############################################################################# 801#############################################################################
802
803# back-buffered drawing area
791 804
792package CFClient::UI::Window; 805package CFClient::UI::Window;
793 806
794our @ISA = CFClient::UI::Bin::; 807our @ISA = CFClient::UI::Bin::;
795 808
… …
806 819
807 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 820 $ROOT->on_post_alloc ($self => sub { $self->render_child });
808 $self->SUPER::update; 821 $self->SUPER::update;
809} 822}
810 823
811sub size_allocate { 824sub invoke_size_allocate {
812 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
813 826
814 $self->SUPER::size_allocate ($w, $h);
815 $self->update; 827 $self->update;
828
829 $self->SUPER::invoke_size_allocate ($w, $h)
816} 830}
817 831
818sub _render { 832sub _render {
819 my ($self) = @_; 833 my ($self) = @_;
820 834
… …
847 my $tex = $self->{texture} 861 my $tex = $self->{texture}
848 or return; 862 or return;
849 863
850 glEnable GL_TEXTURE_2D; 864 glEnable GL_TEXTURE_2D;
851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
852 glColor 1, 1, 1, 1; 866 glColor 0, 0, 0, 1;
853 867
854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
855 869
856 glDisable GL_TEXTURE_2D; 870 glDisable GL_TEXTURE_2D;
857} 871}
… …
881 $h = 10 if $self->{scroll_y}; 895 $h = 10 if $self->{scroll_y};
882 896
883 ($w, $h) 897 ($w, $h)
884} 898}
885 899
886sub size_allocate { 900sub invoke_size_allocate {
887 my ($self, $w, $h) = @_; 901 my ($self, $w, $h) = @_;
888 902
889 my $child = $self->child; 903 my $child = $self->child;
890 904
891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 905 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 906 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
893 907
894 $self->child->configure (0, 0, $w, $h); 908 $self->child->configure (0, 0, $w, $h);
895 $self->update; 909 $self->update;
910
911 1
896} 912}
897 913
898sub set_offset { 914sub set_offset {
899 my ($self, $x, $y) = @_; 915 my ($self, $x, $y) = @_;
900 916
… …
948package CFClient::UI::ScrolledWindow; 964package CFClient::UI::ScrolledWindow;
949 965
950our @ISA = CFClient::UI::HBox::; 966our @ISA = CFClient::UI::HBox::;
951 967
952sub new { 968sub new {
953 my $class = shift; 969 my ($class, %arg) = @_;
970
971 my $child = delete $arg{child};
954 972
955 my $self; 973 my $self;
956 974
957 my $slider = new CFClient::UI::Slider 975 my $slider = new CFClient::UI::Slider
958 vertical => 1, 976 vertical => 1,
… …
963 ; 981 ;
964 982
965 $self = $class->SUPER::new ( 983 $self = $class->SUPER::new (
966 vp => (new CFClient::UI::ViewPort expand => 1), 984 vp => (new CFClient::UI::ViewPort expand => 1),
967 slider => $slider, 985 slider => $slider,
968 @_, 986 %arg,
969 ); 987 );
970 988
971 $self->{vp}->add ($self->{scrolled});
972 $self->add ($self->{vp});
973 $self->add ($self->{slider}); 989 $self->SUPER::add ($self->{vp}, $self->{slider});
990 $self->add ($child) if $child;
974 991
975 $self 992 $self
976} 993}
977 994
995#TODO# update range on size_allocate depending on child
996
997sub add {
998 my ($self, $widget) = @_;
999
1000 $self->{vp}->add ($self->{child} = $widget);
1001}
1002
1003sub invoke_button_up {
1004 my ($self, $ev) = @_;
1005
1006 warn "button up $ev->{button}\n";#d#
1007
1008 0
1009}
1010
1011sub update_slider {
1012 my ($self) = @_;
1013
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1015}
1016
978sub update { 1017sub update {
979 my ($self) = @_; 1018 my ($self) = @_;
980 1019
981 $self->SUPER::update; 1020 $self->SUPER::update;
982 1021
983 # todo: overwrite size_allocate of child 1022 $self->update_slider;
984 my $child = $self->{vp}->child;
985 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
986} 1023}
987 1024
988sub size_allocate { 1025sub invoke_size_allocate {
989 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
990 1027
1028 $self->update_slider;
1029
991 $self->SUPER::size_allocate ($w, $h); 1030 $self->SUPER::invoke_size_allocate ($w, $h)
992
993 my $child = $self->{vp}->child;
994 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
995} 1031}
996
997#TODO# update range on size_allocate depending on child
998# update viewport offset on scroll
999 1032
1000############################################################################# 1033#############################################################################
1001 1034
1002package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
1003 1036
… …
1019 1052
1020 if ($self->{bg}) { 1053 if ($self->{bg}) {
1021 my ($w, $h) = @$self{qw(w h)}; 1054 my ($w, $h) = @$self{qw(w h)};
1022 1055
1023 glEnable GL_BLEND; 1056 glEnable GL_BLEND;
1024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1057 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1025 glColor @{ $self->{bg} }; 1058 glColor_premultiply @{ $self->{bg} };
1026 1059
1027 glBegin GL_QUADS; 1060 glBegin GL_QUADS;
1028 glVertex 0 , 0; 1061 glVertex 0 , 0;
1029 glVertex 0 , $h; 1062 glVertex 0 , $h;
1030 glVertex $w, $h; 1063 glVertex $w, $h;
… …
1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1087 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1055 1088
1056sub new { 1089sub new {
1057 my ($class, %arg) = @_; 1090 my ($class, %arg) = @_;
1058 1091
1059 my $title = delete $arg{title};
1060
1061 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
1062 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
1063 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
1064 border => 0.6, 1095 border => 0.6,
1065 can_events => 1, 1096 can_events => 1,
1066 min_w => 16, 1097 min_w => 64,
1067 min_h => 16, 1098 min_h => 32,
1068 %arg, 1099 %arg,
1069 ); 1100 );
1070 1101
1071 $self->{title} = new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
1072 align => 0, 1103 align => 0,
1073 valign => 1, 1104 valign => 1,
1074 text => $title, 1105 text => $self->{title},
1075 fontsize => $self->{border} 1106 fontsize => $self->{border},
1076 if defined $title; 1107 if exists $self->{title};
1108
1109 if ($self->{has_close_button}) {
1110 $self->{close_button} =
1111 new CFClient::UI::ImageButton
1112 path => 'x1_close.png',
1113 on_activate => sub { $self->emit ("delete") };
1114
1115 $self->CFClient::UI::Container::add ($self->{close_button});
1116 }
1077 1117
1078 $self 1118 $self
1079} 1119}
1080 1120
1081sub add { 1121sub add {
1082 my ($self, @widgets) = @_; 1122 my ($self, @widgets) = @_;
1083 1123
1084 $self->SUPER::add (@widgets); 1124 $self->SUPER::add (@widgets);
1125 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1126 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1086} 1127}
1087 1128
1088sub border { 1129sub border {
1089 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
1090} 1131}
1091 1132
1092sub size_request { 1133sub size_request {
1093 my ($self) = @_; 1134 my ($self) = @_;
1094 1135
1095 $self->{title}->size_request 1136 $self->{title_widget}->size_request
1096 if $self->{title}; 1137 if $self->{title_widget};
1138
1139 $self->{close_button}->size_request
1140 if $self->{close_button};
1097 1141
1098 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
1099 1143
1100 ( 1144 (
1101 $w + $self->border * 2, 1145 $w + $self->border * 2,
1102 $h + $self->border * 2, 1146 $h + $self->border * 2,
1103 ) 1147 )
1104} 1148}
1105 1149
1106sub size_allocate { 1150sub invoke_size_allocate {
1107 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1108 1152
1109 if ($self->{title}) { 1153 if ($self->{title_widget}) {
1110 $self->{title}{w} = $w; 1154 $self->{title_widget}{w} = $w;
1111 $self->{title}{h} = $h; 1155 $self->{title_widget}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h); 1156 $self->{title_widget}->invoke_size_allocate ($w, $h);
1113 } 1157 }
1114 1158
1115 my $border = $self->border; 1159 my $border = $self->border;
1116 1160
1117 $h -= List::Util::max 0, $border * 2; 1161 $h -= List::Util::max 0, $border * 2;
1118 $w -= List::Util::max 0, $border * 2; 1162 $w -= List::Util::max 0, $border * 2;
1163
1164 $self->child->configure ($border, $border, $w, $h);
1165
1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1167 if $self->{close_button};
1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1119 1176
1120 $self->child->configure ($border, $border, $w, $h); 1177 1
1121} 1178}
1122 1179
1123sub button_down { 1180sub invoke_button_down {
1124 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1125 1182
1126 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
1127 my $border = $self->border; 1184 my $border = $self->border;
1128 1185
… …
1144 my $dy = $ev->{y} - $oy; 1201 my $dy = $ev->{y} - $oy;
1145 1202
1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1203 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1204 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148 1205
1206 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 $self->realloc; 1207 $self->realloc;
1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1151 }; 1208 };
1152 1209
1153 } elsif ($lr ^ $td) { 1210 } elsif ($lr ^ $td) {
1154 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1211 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1155 my ($bx, $by) = ($self->{x}, $self->{y}); 1212 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1158 my ($ev, $x, $y) = @_; 1215 my ($ev, $x, $y) = @_;
1159 1216
1160 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
1161 1218
1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1220 # HACK: the next line is required to enforce placement
1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1163 }; 1222 };
1164 } else { 1223 } else {
1165 return 0; 1224 return 0;
1166 } 1225 }
1167 1226
1168 1 1227 1
1169} 1228}
1170 1229
1171sub button_up { 1230sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1173 1232
1174 !!delete $self->{motion} 1233 ! ! delete $self->{motion}
1175} 1234}
1176 1235
1177sub mouse_motion { 1236sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1179 1238
1180 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181 1240
1182 !!$self->{motion} 1241 ! ! $self->{motion}
1183} 1242}
1184 1243
1185sub _draw { 1244sub _draw {
1186 my ($self) = @_; 1245 my ($self) = @_;
1187 1246
… …
1213 1272
1214 glDisable GL_TEXTURE_2D; 1273 glDisable GL_TEXTURE_2D;
1215 1274
1216 $child->draw; 1275 $child->draw;
1217 1276
1218 if ($self->{title}) { 1277 if ($self->{title_widget}) {
1219 glTranslate 0, $border - $self->{h}; 1278 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw; 1279 $self->{title_widget}->_draw;
1280
1281 glTranslate 0, - ($border - $self->{h});
1221 } 1282 }
1283
1284 $self->{close_button}->draw
1285 if $self->{close_button};
1222} 1286}
1223 1287
1224############################################################################# 1288#############################################################################
1225 1289
1226package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1249 1313
1250 $child->set_parent ($self); 1314 $child->set_parent ($self);
1251 $self->{children}[$y][$x] = $child; 1315 $self->{children}[$y][$x] = $child;
1252 1316
1253 $self->realloc; 1317 $self->realloc;
1318}
1319
1320sub remove {
1321 my ($self, $child) = @_;
1322
1323 # TODO: not yet implemented
1254} 1324}
1255 1325
1256# TODO: move to container class maybe? send children a signal on removal? 1326# TODO: move to container class maybe? send children a signal on removal?
1257sub clear { 1327sub clear {
1258 my ($self) = @_; 1328 my ($self) = @_;
… …
1299 (sum @$ws), 1369 (sum @$ws),
1300 (sum @$hs), 1370 (sum @$hs),
1301 ) 1371 )
1302} 1372}
1303 1373
1304sub size_allocate { 1374sub invoke_size_allocate {
1305 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1306 1376
1307 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1308 1378
1309 my $req_w = (sum @$ws) || 1; 1379 my $req_w = (sum @$ws) || 1;
… …
1341 } 1411 }
1342 1412
1343 $y += $row_h; 1413 $y += $row_h;
1344 } 1414 }
1345 1415
1416 1
1346} 1417}
1347 1418
1348sub find_widget { 1419sub find_widget {
1349 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1350 1421
… …
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1459 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 ) 1460 )
1390} 1461}
1391 1462
1392sub size_allocate { 1463sub invoke_size_allocate {
1393 my ($self, $w, $h) = @_; 1464 my ($self, $w, $h) = @_;
1394 1465
1395 my $space = $self->{vertical} ? $h : $w; 1466 my $space = $self->{vertical} ? $h : $w;
1396 my $children = $self->{children}; 1467 my @children = $self->visible_children;
1397 1468
1398 my @req; 1469 my @req;
1399 1470
1400 if ($self->{homogeneous}) { 1471 if ($self->{homogeneous}) {
1401 @req = ($space / (@$children || 1)) x @$children; 1472 @req = ($space / (@children || 1)) x @children;
1402 } else { 1473 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1474 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1404 my $req = List::Util::sum @req; 1475 my $req = List::Util::sum @req;
1405 1476
1406 if ($req > $space) { 1477 if ($req > $space) {
1407 # ah well, not enough space 1478 # ah well, not enough space
1408 $_ *= $space / $req for @req; 1479 $_ *= $space / $req for @req;
1409 } else { 1480 } else {
1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1481 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1411 1482
1412 $space = ($space - $req) / $expand; # remaining space to give away 1483 $space = ($space - $req) / $expand; # remaining space to give away
1413 1484
1414 $req[$_] += $space * $children->[$_]{expand} 1485 $req[$_] += $space * $children[$_]{expand}
1415 for 0 .. $#$children; 1486 for 0 .. $#children;
1416 } 1487 }
1417 } 1488 }
1418 1489
1419 CFClient::UI::harmonize \@req; 1490 CFClient::UI::harmonize \@req;
1420 1491
1421 my $pos = 0; 1492 my $pos = 0;
1422 for (0 .. $#$children) { 1493 for (0 .. $#children) {
1423 my $alloc = $req[$_]; 1494 my $alloc = $req[$_];
1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1495 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1425 1496
1426 $pos += $alloc; 1497 $pos += $alloc;
1427 } 1498 }
1428 1499
1429 1 1500 1
… …
1519 1590
1520 delete $self->{texture}; 1591 delete $self->{texture};
1521 $self->SUPER::update; 1592 $self->SUPER::update;
1522} 1593}
1523 1594
1595sub realloc {
1596 my ($self) = @_;
1597
1598 delete $self->{ox};
1599 $self->SUPER::realloc;
1600}
1601
1524sub set_text { 1602sub set_text {
1525 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1526 1604
1527 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1528 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1529 1607
1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1531 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1532 1609
1610 delete $self->{size_req};
1533 $self->realloc; 1611 $self->realloc;
1534 $self->update; 1612 $self->update;
1535} 1613}
1536 1614
1537sub set_markup { 1615sub set_markup {
… …
1540 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1541 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1542 1620
1543 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1544 1622
1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1546 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1547 1624
1625 delete $self->{size_req};
1548 $self->realloc; 1626 $self->realloc;
1549 $self->update; 1627 $self->update;
1550} 1628}
1551 1629
1552sub size_request { 1630sub size_request {
1553 my ($self) = @_; 1631 my ($self) = @_;
1554 1632
1633 $self->{size_req} ||= do {
1555 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1556 $self->{layout}->set_width ($self->{max_w} || -1); 1635 $self->{layout}->set_width ($self->{max_w} || -1);
1557 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1558 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1560 1639
1561 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1562 1641
1563 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1564 $self->{template}->set_font ($self->{font}) if $self->{font}; 1643 $self->{template}->set_font ($self->{font}) if $self->{font};
1644 $self->{template}->set_width ($self->{max_w} || -1);
1565 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1646
1567 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1568 1648
1569 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
1570 $h = List::Util::max $h, $h2; 1650 $h = List::Util::max $h, $h2;
1651 }
1652
1653 [$w, $h]
1571 } 1654 };
1572 1655
1573 ($w, $h) 1656 @{ $self->{size_req} }
1574} 1657}
1575 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1576sub size_allocate { 1663sub invoke_size_allocate {
1577 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1578 1665
1579 delete $self->{ox}; 1666 delete $self->{ox};
1580 1667
1581 delete $self->{texture} 1668 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1669 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1670
1671 1
1583} 1672}
1584 1673
1585sub set_fontsize { 1674sub set_fontsize {
1586 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1587 1676
1588 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1589 delete $self->{texture}; 1679 delete $self->{texture};
1590 1680
1591 $self->realloc; 1681 $self->realloc;
1592} 1682}
1593 1683
1684sub reconfigure {
1685 my ($self) = @_;
1686
1687 delete $self->{size_req};
1688 delete $self->{texture};
1689
1690 $self->SUPER::reconfigure;
1691}
1692
1594sub _draw { 1693sub _draw {
1595 my ($self) = @_; 1694 my ($self) = @_;
1596 1695
1597 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1598 1697
1599 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1600 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1601 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1602 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1603 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1606 1705
1607 new_from_layout CFClient::Texture $self->{layout} 1706 [$self->{layout}->size]
1608 }; 1707 };
1609 1708
1610 unless (exists $self->{ox}) { 1709 unless (exists $self->{ox}) {
1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1613 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1614 1713
1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1617 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1618 }; 1717 };
1619 1718
1620 glEnable GL_TEXTURE_2D; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1622 1721
1623 if ($tex->{format} == GL_ALPHA) { 1722 $self->{layout}->render ($self->{ox}, $self->{oy});
1624 glColor @{$self->{fg}};
1625 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1626 } else {
1627 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1628 }
1629
1630 glDisable GL_TEXTURE_2D;
1631} 1723}
1632 1724
1633############################################################################# 1725#############################################################################
1634 1726
1635package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1649 can_hover => 1, 1741 can_hover => 1,
1650 can_focus => 1, 1742 can_focus => 1,
1651 valign => 0, 1743 valign => 0,
1652 can_events => 1, 1744 can_events => 1,
1653 #text => ... 1745 #text => ...
1746 #hidden => "*",
1654 @_ 1747 @_
1655 ) 1748 )
1656} 1749}
1657 1750
1658sub _set_text { 1751sub _set_text {
… …
1660 1753
1661 delete $self->{cur_h}; 1754 delete $self->{cur_h};
1662 1755
1663 return if $self->{text} eq $text; 1756 return if $self->{text} eq $text;
1664 1757
1665 delete $self->{texture};
1666
1667 $self->{last_activity} = $::NOW; 1758 $self->{last_activity} = $::NOW;
1668 $self->{text} = $text; 1759 $self->{text} = $text;
1669 1760
1670 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1671 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1763 delete $self->{size_req};
1672 1764
1673 $self->_emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1766
1767 $self->realloc;
1768 $self->update;
1674} 1769}
1675 1770
1676sub set_text { 1771sub set_text {
1677 my ($self, $text) = @_; 1772 my ($self, $text) = @_;
1678 1773
1679 $self->{cursor} = length $text; 1774 $self->{cursor} = length $text;
1680 $self->_set_text ($text); 1775 $self->_set_text ($text);
1681
1682 $self->realloc;
1683} 1776}
1684 1777
1685sub get_text { 1778sub get_text {
1686 $_[0]{text} 1779 $_[0]{text}
1687} 1780}
… …
1692 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1693 1786
1694 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1695} 1788}
1696 1789
1697sub key_down { 1790sub invoke_key_down {
1698 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1699 1792
1700 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1701 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1702 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1714 } elsif ($sym == CFClient::SDLK_HOME) { 1807 } elsif ($sym == CFClient::SDLK_HOME) {
1715 $self->{cursor} = 0; 1808 $self->{cursor} = 0;
1716 } elsif ($sym == CFClient::SDLK_END) { 1809 } elsif ($sym == CFClient::SDLK_END) {
1717 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1718 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1719 $self->_emit ('escape'); 1812 $self->emit ('escape');
1720 } elsif ($uni) { 1813 } elsif ($uni) {
1721 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else { 1815 } else {
1723 return 0; 1816 return 0;
1724 } 1817 }
… …
1728 $self->realloc; 1821 $self->realloc;
1729 1822
1730 1 1823 1
1731} 1824}
1732 1825
1733sub focus_in { 1826sub invoke_focus_in {
1734 my ($self) = @_; 1827 my ($self) = @_;
1735 1828
1736 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1737 1830
1738 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1739} 1832}
1740 1833
1741sub button_down { 1834sub invoke_button_down {
1742 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1743 1836
1744 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1745 1838
1746 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1747 1840
1748 # byte-index to char-index 1841 # byte-index to char-index
1749 my $text = $self->{text}; 1842 my $text = $self->{text};
1750 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1751 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1752 1845
1753 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1754 $self->update; 1847 $self->update;
1755 1848
1756 1 1849 1
1757} 1850}
1758 1851
1759sub mouse_motion { 1852sub invoke_mouse_motion {
1760 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1854# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762 1855
1763 0 1856 1
1764} 1857}
1765 1858
1766sub _draw { 1859sub _draw {
1767 my ($self) = @_; 1860 my ($self) = @_;
1768 1861
1769 local $self->{fg} = $self->{fg}; 1862 local $self->{fg} = $self->{fg};
1770 1863
1771 if ($FOCUS == $self) { 1864 if ($FOCUS == $self) {
1772 glColor @{$self->{active_bg}}; 1865 glColor_premultiply @{$self->{active_bg}};
1773 $self->{fg} = $self->{active_fg}; 1866 $self->{fg} = $self->{active_fg};
1774 } else { 1867 } else {
1775 glColor @{$self->{bg}}; 1868 glColor_premultiply @{$self->{bg}};
1776 } 1869 }
1777 1870
1778 glEnable GL_BLEND; 1871 glEnable GL_BLEND;
1779 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1872 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1780 glBegin GL_QUADS; 1873 glBegin GL_QUADS;
1781 glVertex 0 , 0; 1874 glVertex 0 , 0;
1782 glVertex 0 , $self->{h}; 1875 glVertex 0 , $self->{h};
1783 glVertex $self->{w}, $self->{h}; 1876 glVertex $self->{w}, $self->{h};
1784 glVertex $self->{w}, 0; 1877 glVertex $self->{w}, 0;
… …
1809 1902
1810our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1811 1904
1812use CFClient::OpenGL; 1905use CFClient::OpenGL;
1813 1906
1814sub key_down { 1907sub invoke_key_down {
1815 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1816 1909
1817 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1818 1911
1819 if ($sym == 13) { 1912 if ($sym == 13) {
1820 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1821 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1822 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1823 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1824 $self->_emit (activate => $txt); 1918 $self->emit (activate => $txt);
1825 $self->update; 1919 $self->update;
1826 1920
1827 } elsif ($sym == CFClient::SDLK_UP) { 1921 } elsif ($sym == CFClient::SDLK_UP) {
1828 if ($self->{history_pointer} < 0) { 1922 if ($self->{history_pointer} < 0) {
1829 $self->{history_saveback} = $self->get_text; 1923 $self->{history_saveback} = $self->get_text;
… …
1845 } else { 1939 } else {
1846 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1847 } 1941 }
1848 1942
1849 } else { 1943 } else {
1850 return $self->SUPER::key_down ($ev) 1944 return $self->SUPER::invoke_key_down ($ev)
1851 } 1945 }
1852 1946
1853 1 1947 1
1854} 1948}
1855 1949
… …
1879 can_events => 1, 1973 can_events => 1,
1880 @_ 1974 @_
1881 ) 1975 )
1882} 1976}
1883 1977
1884sub activate { }
1885
1886sub button_up { 1978sub invoke_button_up {
1887 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1888 1980
1889 $self->emit ("activate") 1981 $self->emit ("activate")
1890 if $x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1891 && $y >= 0 && $y < $self->{h}; 1983 && $y >= 0 && $y < $self->{h};
… …
1894} 1986}
1895 1987
1896sub _draw { 1988sub _draw {
1897 my ($self) = @_; 1989 my ($self) = @_;
1898 1990
1899 local $self->{fg} = $self->{fg}; 1991 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1900
1901 if ($GRAB == $self) {
1902 $self->{fg} = $self->{active_fg};
1903 }
1904 1992
1905 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 glColor 0, 0, 0, 1; 1995 glColor 0, 0, 0, 1;
1908 1996
1909 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1997 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1910 1998
1911 glDisable GL_TEXTURE_2D; 1999 glDisable GL_TEXTURE_2D;
1912 2000
1913 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
2002}
2003
2004#############################################################################
2005
2006package CFClient::UI::ImageButton;
2007
2008our @ISA = CFClient::UI::Image::;
2009
2010use CFClient::OpenGL;
2011
2012my %textures;
2013
2014sub new {
2015 my $class = shift;
2016
2017 my $self = $class->SUPER::new (
2018 padding_x => 4,
2019 padding_y => 4,
2020 fg => [1, 1, 1],
2021 active_fg => [0, 0, 1],
2022 can_hover => 1,
2023 align => 0,
2024 valign => 0,
2025 can_events => 1,
2026 @_
2027 );
2028}
2029
2030sub invoke_button_up {
2031 my ($self, $ev, $x, $y) = @_;
2032
2033 $self->emit ("activate")
2034 if $x >= 0 && $x < $self->{w}
2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
1914} 2038}
1915 2039
1916############################################################################# 2040#############################################################################
1917 2041
1918package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
… …
1945 my ($self) = @_; 2069 my ($self) = @_;
1946 2070
1947 (6) x 2 2071 (6) x 2
1948} 2072}
1949 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1950sub button_down { 2082sub invoke_button_down {
1951 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1952 2084
1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1955 $self->{state} = !$self->{state}; 2087 $self->toggle;
1956 $self->_emit (changed => $self->{state});
1957 } else { 2088 } else {
1958 return 0 2089 return 0
1959 } 2090 }
1960 2091
1961 1 2092 1
… …
1986package CFClient::UI::Image; 2117package CFClient::UI::Image;
1987 2118
1988our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
1989 2120
1990use CFClient::OpenGL; 2121use CFClient::OpenGL;
1991use Carp qw/confess/;
1992 2122
1993our %loaded_images; 2123our %texture_cache;
1994 2124
1995sub new { 2125sub new {
1996 my $class = shift; 2126 my $class = shift;
1997 2127
1998 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
1999 2132
2000 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2133 $self->{path} || $self->{tex}
2134 or Carp::croak "'path' or 'tex' attributes required";
2001 2135
2002 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2003 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2004 2138
2005 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2006 2140
2007 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2008
2009 $self->{aspect} = $tex->{w} / $tex->{h};
2010 2142
2011 $self 2143 $self
2012} 2144}
2013 2145
2014sub size_request { 2146sub size_request {
2015 my ($self) = @_; 2147 my ($self) = @_;
2016 2148
2017 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
2018} 2150}
2019 2151
2020sub _draw { 2152sub _draw {
2021 my ($self) = @_; 2153 my ($self) = @_;
2022 2154
… …
2131 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2132 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2133 2265
2134 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2135 my $h2 = $self->{h} * (1 - $ycut2); 2267 my $h2 = $self->{h} * (1 - $ycut2);
2268 my $h3 = $self->{h};
2269
2270 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2136 2271
2137 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2138 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2139 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
2140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2276 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141 2277
2142 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2278 glBindTexture GL_TEXTURE_2D, $t1->{name};
2143 glBegin GL_QUADS; 2279 glBegin GL_QUADS;
… …
2158 2294
2159 if ($t3) { 2295 if ($t3) {
2160 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2161 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2162 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2163 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2164 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2165 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2166 glEnd; 2302 glEnd;
2167 } 2303 }
2168 2304
2169 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2257 $self->update; 2393 $self->update;
2258 2394
2259 $self 2395 $self
2260} 2396}
2261 2397
2262sub changed { }
2263
2264sub set_range { 2398sub set_range {
2265 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2266 2400
2267 ($range, $self->{range}) = ($self->{range}, $range); 2401 ($range, $self->{range}) = ($self->{range}, $range);
2268 2402
2269 $self->update
2270 if "@$range" ne "@{$self->{range}}"; 2403 if ("@$range" ne "@{$self->{range}}") {
2404 $self->update;
2405 $self->set_value ($self->{range}[0]);
2406 }
2271} 2407}
2272 2408
2273sub set_value { 2409sub set_value {
2274 my ($self, $value) = @_; 2410 my ($self, $value) = @_;
2275 2411
… …
2286 if $unit; 2422 if $unit;
2287 2423
2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2289 2425
2290 if ($value != $old_value) { 2426 if ($value != $old_value) {
2291 $self->_emit (changed => $value); 2427 $self->emit (changed => $value);
2292 $self->update; 2428 $self->update;
2293 } 2429 }
2294} 2430}
2295 2431
2296sub size_request { 2432sub size_request {
2297 my ($self) = @_; 2433 my ($self) = @_;
2298 2434
2299 ($self->{req_w}, $self->{req_h}) 2435 ($self->{req_w}, $self->{req_h})
2300} 2436}
2301 2437
2302sub button_down { 2438sub invoke_button_down {
2303 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2304 2440
2305 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2306 2442
2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2308 2444
2309 $self->mouse_motion ($ev, $x, $y) 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2310} 2446}
2311 2447
2312sub mouse_motion { 2448sub invoke_mouse_motion {
2313 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2314 2450
2315 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2316 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2317 2453
… …
2328} 2464}
2329 2465
2330sub update { 2466sub update {
2331 my ($self) = @_; 2467 my ($self) = @_;
2332 2468
2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2469 delete $self->{knob_w};
2470 $self->SUPER::update;
2471}
2472
2473sub _draw {
2474 my ($self) = @_;
2475
2476 unless ($self->{knob_w}) {
2334 $self->set_value ($self->{range}[0]); 2477 $self->set_value ($self->{range}[0]);
2335 2478
2336 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2479 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100; 2480 my $range = ($hi - $page - $lo) || 1e-100;
2338 2481
… …
2344 $value = ($value - $lo) / $range; 2487 $value = ($value - $lo) / $range;
2345 $value = $value * $self->{scale} + $self->{offset}; 2488 $value = $value * $self->{scale} + $self->{offset};
2346 2489
2347 $self->{knob_x} = $value - $knob_w * 0.5; 2490 $self->{knob_x} = $value - $knob_w * 0.5;
2348 $self->{knob_w} = $knob_w; 2491 $self->{knob_w} = $knob_w;
2349 }); 2492 }
2350
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356 2493
2357 $self->SUPER::_draw (); 2494 $self->SUPER::_draw ();
2358 2495
2359 glScale $self->{w}, $self->{h}; 2496 glScale $self->{w}, $self->{h};
2360 2497
… …
2421sub set_range { shift->{slider}->set_range (@_) } 2558sub set_range { shift->{slider}->set_range (@_) }
2422sub set_value { shift->{slider}->set_value (@_) } 2559sub set_value { shift->{slider}->set_value (@_) }
2423 2560
2424############################################################################# 2561#############################################################################
2425 2562
2426package CFClient::UI::TextView; 2563package CFClient::UI::TextScroller;
2427 2564
2428our @ISA = CFClient::UI::HBox::; 2565our @ISA = CFClient::UI::HBox::;
2429 2566
2430use CFClient::OpenGL; 2567use CFClient::OpenGL;
2431 2568
… …
2433 my $class = shift; 2570 my $class = shift;
2434 2571
2435 my $self = $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2436 fontsize => 1, 2573 fontsize => 1,
2437 can_events => 0, 2574 can_events => 0,
2575 indent => 0,
2438 #font => default_font 2576 #font => default_font
2439 @_, 2577 @_,
2440 2578
2441 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2442 par => [], 2580 par => [],
2443 height => 0, 2581 height => 0,
2444 children => [ 2582 children => [
2445 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2446 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2457 2595
2458 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2459 $self->reflow; 2597 $self->reflow;
2460} 2598}
2461 2599
2600sub size_request {
2601 my ($self) = @_;
2602
2603 my ($empty, $slider) = @{ $self->{children} };
2604
2605 local $self->{children} = [$empty, $slider];
2606 $self->SUPER::size_request
2607}
2608
2462sub size_allocate { 2609sub invoke_size_allocate {
2463 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2464 2611
2465 $self->SUPER::size_allocate ($w, $h); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2466 2614
2467 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2468 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2469 $self->{layout}->set_width ($self->{children}[0]{w}); 2617 $self->{layout}->set_width ($empty->{w});
2618 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2470 2619
2471 $self->reflow; 2620 $self->reflow;
2472}
2473 2621
2474sub text_size { 2622 local $self->{children} = [$empty, $slider];
2475 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2476 2628
2477 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2478 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $layout->set_width ($self->{children}[0]{w} - $indent); 2634 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2635 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2481 $layout->set_markup ($text); 2636 $layout->set_markup ($para->{markup});
2637
2638 $layout->set_shapes (
2639 map
2640 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2641 @{$para->{widget}}
2482 2642 );
2643
2483 $layout->size 2644 $layout
2484} 2645}
2485 2646
2486sub reflow { 2647sub reflow {
2487 my ($self) = @_; 2648 my ($self) = @_;
2488 2649
… …
2497 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2498} 2659}
2499 2660
2500sub clear { 2661sub clear {
2501 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2502 2666
2503 $self->{par} = []; 2667 $self->{par} = [];
2504 $self->{height} = 0; 2668 $self->{height} = 0;
2505 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2506} 2670}
2507 2671
2508sub add_paragraph { 2672sub add_paragraph {
2509 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2510 2674
2511 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2512 my ($w, $h) = $self->text_size ($line); 2676
2513 $self->{height} += $h; 2677 $para = {
2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2678 w => 1e10,
2679 wrapped => 1,
2680 fg => $color,
2681 indent => $indent,
2682 markup => $text,
2683 widget => \@w,
2515 } 2684 };
2516 2685
2517 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2686 $self->add (@w) if @w;
2687 push @{$self->{par}}, $para;
2688
2689 $self->{need_reflow}++;
2690 $self->update;
2691}
2692
2693sub scroll_to_bottom {
2694 my ($self) = @_;
2695
2696 $self->{scroll_to_bottom} = 1;
2697 $self->update;
2518} 2698}
2519 2699
2520sub update { 2700sub update {
2521 my ($self) = @_; 2701 my ($self) = @_;
2522 2702
… …
2524 2704
2525 return unless $self->{h} > 0; 2705 return unless $self->{h} > 0;
2526 2706
2527 delete $self->{texture}; 2707 delete $self->{texture};
2528 2708
2529 $ROOT->on_post_alloc ($self, sub { 2709 $ROOT->on_post_alloc ($self => sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531 2711
2532 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2533 my $height = 0; 2713 my $height = 0;
2534 2714
2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2539 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2540 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2541 $layout->set_width ($W - $_->[3]); 2717 my $layout = $self->get_layout ($para);
2542 $layout->set_markup ($_->[4]);
2543 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2544 $_->[0] = $w + $_->[3]; 2719
2545 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2546 } 2723 }
2547 2724
2548 $height += $_->[1]; 2725 $height += $para->{h};
2549 } 2726 }
2550 2727
2551 $self->{height} = $height; 2728 $self->{height} = $height;
2552 2729
2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2730 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2554 2731
2555 delete $self->{texture}; 2732 delete $self->{texture};
2556 } 2733 }
2557 2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2559 glClearColor 0.5, 0.5, 0.5, 0; 2740 glClearColor 0, 0, 0, 0;
2560 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
2561 2742
2562 my $top = int $self->{children}[1]{range}[0]; 2743 my $top = int $self->{children}[1]{range}[0];
2563 2744
2564 my $y0 = $top; 2745 my $y0 = $top;
2565 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2566 2747
2567 my $y = 0; 2748 my $y = 0;
2568 2749
2569 my $layout = $self->{layout};
2570
2571 $layout->set_font ($self->{font}) if $self->{font};
2572
2573 glEnable GL_BLEND;
2574 #TODO# not correct in windows where rgba is forced off
2575 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2576
2577 for my $par (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2578 my $h = $par->[1]; 2751 my $h = $para->{h};
2579 2752
2580 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2581 $layout->set_foreground (@{ $par->[2] });
2582 $layout->set_width ($W - $par->[3]);
2583 $layout->set_markup ($par->[4]);
2584 2754
2585 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2586 2756
2587 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2588 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2758
2759 if (my @w = @{ $para->{widget} }) {
2760 my @s = $layout->get_shapes;
2761
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 }
2589 } 2771 }
2590 2772
2591 $y += $h; 2773 $y += $h;
2592 } 2774 }
2593
2594 glDisable GL_BLEND;
2595 }; 2775 };
2596 }); 2776 });
2597} 2777}
2598 2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2786}
2787
2599sub _draw { 2788sub _draw {
2600 my ($self) = @_; 2789 my ($self) = @_;
2601 2790
2602 glEnable GL_TEXTURE_2D; 2791 glEnable GL_TEXTURE_2D;
2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2604 glColor 1, 1, 1, 1; 2793 glColor 0, 0, 0, 1;
2605 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2794 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2606 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2607 2796
2608 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2609
2610} 2798}
2611 2799
2612############################################################################# 2800#############################################################################
2613 2801
2614package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2701 $tooltip .= "\n\n" . (ref $widget) . "\n" 2889 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2890 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n" 2891 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}"; 2892 . "visible $widget->{visible}";
2705 } 2893 }
2894
2895 $tooltip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//;
2706 2897
2707 $self->add (new CFClient::UI::Label 2898 $self->add (new CFClient::UI::Label
2708 markup => $tooltip, 2899 markup => $tooltip,
2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2710 fontsize => 0.8, 2901 fontsize => 0.8,
… …
2720 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2721 2912
2722 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2723} 2914}
2724 2915
2725sub size_allocate { 2916sub invoke_size_allocate {
2726 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2727 2918
2728 $self->SUPER::size_allocate ($w - 4, $h - 4); 2919 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2729} 2920}
2730 2921
2731sub visibility_change { 2922sub invoke_visibility_change {
2732 my ($self, $visible) = @_; 2923 my ($self, $visible) = @_;
2733 2924
2734 return unless $visible; 2925 return unless $visible;
2735 2926
2736 $self->{root}->on_post_alloc ("move_$self" => sub { 2927 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2738 or return; 2929 or return;
2739 2930
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741 2932
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH; 2934 if $x + $self->{w} > $self->{root}{w};
2744 2935
2745 $self->move_abs ($x, $y); 2936 $self->move_abs ($x, $y);
2746 }); 2937 });
2747} 2938}
2748 2939
… …
2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2838 3029
2839 if ($tex) { 3030 if ($tex) {
2840 glEnable GL_TEXTURE_2D; 3031 glEnable GL_TEXTURE_2D;
2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2842 glColor 1, 1, 1, 1; 3033 glColor 0, 0, 0, 1;
2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2844 glDisable GL_TEXTURE_2D; 3035 glDisable GL_TEXTURE_2D;
2845 } 3036 }
2846} 3037}
2847 3038
2848sub DESTROY { 3039sub destroy {
2849 my ($self) = @_; 3040 my ($self) = @_;
2850 3041
2851 $self->{timer}->cancel 3042 $self->{timer}->cancel
2852 if $self->{timer}; 3043 if $self->{timer};
2853 3044
2854 $self->SUPER::DESTROY; 3045 $self->SUPER::destroy;
2855} 3046}
3047
3048#############################################################################
3049
3050package CFClient::UI::Buttonbar;
3051
3052our @ISA = CFClient::UI::HBox::;
3053
3054# TODO: should actualyl wrap buttons and other goodies.
2856 3055
2857############################################################################# 3056#############################################################################
2858 3057
2859package CFClient::UI::Menu; 3058package CFClient::UI::Menu;
2860 3059
… …
2872 ); 3071 );
2873 3072
2874 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3073 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2875 3074
2876 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2877 my ($widget, $cb) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2878 3077
2879 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2880 if (!ref $widget) { 3079 if (!ref $widget) {
3080 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2;
3082
3083 $widget = new CFClient::UI::HBox
3084 can_hover => 1,
3085 can_events => 1,
3086 tooltip => $tooltip,
3087 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1),
3090 ],
3091 ;
3092
3093 } else {
2881 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2882 can_hover => 1, 3095 can_hover => 1,
2883 can_events => 1, 3096 can_events => 1,
2884 text => $widget; 3097 markup => $widget,
3098 tooltip => $tooltip;
3099 }
2885 } 3100 }
2886 3101
2887 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2888 3103
2889 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2894 3109
2895# popup given the event (must be a mouse button down event currently) 3110# popup given the event (must be a mouse button down event currently)
2896sub popup { 3111sub popup {
2897 my ($self, $ev) = @_; 3112 my ($self, $ev) = @_;
2898 3113
2899 $self->_emit ("popdown"); 3114 $self->emit ("popdown");
2900 3115
2901 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2902 $GRAB = $self; 3117 $GRAB = $self;
2903 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2904 3119
2905 $self->show; 3120 $self->show;
2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3121 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2907} 3122}
2908 3123
2909sub mouse_motion { 3124sub invoke_mouse_motion {
2910 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2911 3126
2912 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2914 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2915 3130
2916 0 3131 0
2917} 3132}
2918 3133
2919sub button_up { 3134sub invoke_button_up {
2920 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2921 3136
2922 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2923 undef $GRAB; 3138 undef $GRAB;
2924 $self->hide; 3139 $self->hide;
2925 3140
2926 $self->_emit ("popdown"); 3141 $self->emit ("popdown");
2927 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
2928 } else { 3143 } else {
2929 return 0 3144 return 0
2930 } 3145 }
2931 3146
2932 1 3147 1
2933} 3148}
2934 3149
2935############################################################################# 3150#############################################################################
2936 3151
2937package CFClient::UI::Statusbox; 3152package CFClient::UI::Multiplexer;
2938 3153
2939our @ISA = CFClient::UI::VBox::; 3154our @ISA = CFClient::UI::Container::;
2940 3155
2941sub new { 3156sub new {
2942 my $class = shift; 3157 my $class = shift;
2943 3158
2944 $class->SUPER::new ( 3159 my $self = $class->SUPER::new (
3160 @_,
3161 );
3162
3163 $self->{current} = $self->{children}[0]
3164 if @{ $self->{children} };
3165
3166 $self
3167}
3168
3169sub add {
3170 my ($self, @widgets) = @_;
3171
3172 $self->SUPER::add (@widgets);
3173
3174 $self->{current} = $self->{children}[0]
3175 if @{ $self->{children} };
3176}
3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3182}
3183
3184sub set_current_page {
3185 my ($self, $page_or_widget) = @_;
3186
3187 my $widget = ref $page_or_widget
3188 ? $page_or_widget
3189 : $self->{children}[$page_or_widget];
3190
3191 $self->{current} = $widget;
3192 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3193
3194 $self->emit (page_changed => $self->{current});
3195
3196 $self->realloc;
3197}
3198
3199sub visible_children {
3200 $_[0]{current}
3201}
3202
3203sub size_request {
3204 my ($self) = @_;
3205
3206 $self->{current}->size_request
3207}
3208
3209sub invoke_size_allocate {
3210 my ($self, $w, $h) = @_;
3211
3212 $self->{current}->configure (0, 0, $w, $h);
3213
3214 1
3215}
3216
3217sub _draw {
3218 my ($self) = @_;
3219
3220 $self->{current}->draw;
3221}
3222
3223#############################################################################
3224
3225package CFClient::UI::Notebook;
3226
3227our @ISA = CFClient::UI::VBox::;
3228
3229sub new {
3230 my $class = shift;
3231
3232 my $self = $class->SUPER::new (
3233 buttonbar => (new CFClient::UI::Buttonbar),
3234 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3235 # filter => # will be put between multiplexer and $self
3236 @_,
3237 );
3238
3239 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3240 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3241
3242 $self
3243}
3244
3245sub add {
3246 my ($self, $title, $widget, $tooltip) = @_;
3247
3248 Scalar::Util::weaken $self;
3249
3250 $self->{buttonbar}->add (new CFClient::UI::Button
3251 markup => $title,
3252 tooltip => $tooltip,
3253 on_activate => sub { $self->set_current_page ($widget) },
3254 );
3255
3256 $self->{multiplexer}->add ($widget);
3257}
3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3263}
3264
3265sub set_current_page {
3266 my ($self, $page) = @_;
3267
3268 $self->{multiplexer}->set_current_page ($page);
3269 $self->emit (page_changed => $self->{multiplexer}{current});
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::Combobox;
3275
3276use utf8;
3277
3278our @ISA = CFClient::UI::Button::;
3279
3280sub new {
3281 my $class = shift;
3282
3283 my $self = $class->SUPER::new (
3284 options => [], # [value, title, longdesc], ...
3285 value => undef,
3286 @_,
3287 );
3288
3289 $self->_set_value ($self->{value});
3290
3291 $self
3292}
3293
3294sub invoke_button_down {
3295 my ($self, $ev) = @_;
3296
3297 my @menu_items;
3298
3299 for (@{ $self->{options} }) {
3300 my ($value, $title, $tooltip) = @$_;
3301
3302 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303 }
3304
3305 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306}
3307
3308sub _set_value {
3309 my ($self, $value) = @_;
3310
3311 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3312 or return;
3313
3314 $self->{value} = $item->[0];
3315 $self->set_markup ("$item->[1] ⇓");
3316 $self->set_tooltip ($item->[2]);
3317}
3318
3319sub set_value {
3320 my ($self, $value) = @_;
3321
3322 return unless $self->{value} ne $value;
3323
3324 $self->_set_value ($value);
3325 $self->emit (changed => $value);
3326}
3327
3328#############################################################################
3329
3330package CFClient::UI::Statusbox;
3331
3332our @ISA = CFClient::UI::VBox::;
3333
3334sub new {
3335 my $class = shift;
3336
3337 my $self = $class->SUPER::new (
2945 fontsize => 0.8, 3338 fontsize => 0.8,
2946 @_, 3339 @_,
2947 ) 3340 );
3341
3342 Scalar::Util::weaken (my $this = $self);
3343
3344 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345
3346 $self
2948} 3347}
2949 3348
2950sub reorder { 3349sub reorder {
2951 my ($self) = @_; 3350 my ($self) = @_;
2952 my $NOW = time; 3351 my $NOW = Time::HiRes::time;
3352
3353 # freeze display when hovering over any label
3354 return if $CFClient::UI::TOOLTIP->{owner}
3355 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3356 values %{ $self->{item} };
2953 3357
2954 while (my ($k, $v) = each %{ $self->{item} }) { 3358 while (my ($k, $v) = each %{ $self->{item} }) {
2955 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3359 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2956 } 3360 }
2957 3361
… …
2960 my @items = sort { 3364 my @items = sort {
2961 $a->{pri} <=> $b->{pri} 3365 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id} 3366 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} }; 3367 } values %{ $self->{item} };
2964 3368
3369 $self->{timer}->interval (1);
3370
2965 my $count = 10 + 1; 3371 my $count = 10 + 1;
2966 for my $item (@items) { 3372 for my $item (@items) {
2967 last unless --$count; 3373 last unless --$count;
2968 3374
2969 push @widgets, $item->{label} ||= do { 3375 my $label = $item->{label} ||= do {
2970 # TODO: doesn't handle markup well (read as: at all) 3376 # TODO: doesn't handle markup well (read as: at all)
2971 my $short = $item->{count} > 1 3377 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}" 3378 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text}; 3379 : $item->{text};
2974 3380
… …
2982 tooltip => $item->{tooltip}, 3388 tooltip => $item->{tooltip},
2983 tooltip_font => $::FONT_PROP, 3389 tooltip_font => $::FONT_PROP,
2984 tooltip_width => 0.67, 3390 tooltip_width => 0.67,
2985 fontsize => $item->{fontsize} || $self->{fontsize}, 3391 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44, 3392 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg}, 3393 fg => [@{ $item->{fg} }],
2988 can_events => 1, 3394 can_events => 1,
2989 can_hover => 1 3395 can_hover => 1
2990 }; 3396 };
3397
3398 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3399 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3400 $label->update;
3401 $label->set_max_size (undef, $label->{req_h} * $diff)
3402 if $diff < 1;
3403 $self->{timer}->interval (1/30);
3404 } else {
3405 $label->{fg}[3] = $item->{fg}[3] || 1;
3406 }
3407
3408 push @widgets, $label;
2991 } 3409 }
2992 3410
2993 $self->clear; 3411 $self->clear;
2994 $self->SUPER::add (reverse @widgets); 3412 $self->SUPER::add (reverse @widgets);
2995} 3413}
… …
3000 $text =~ s/^\s+//; 3418 $text =~ s/^\s+//;
3001 $text =~ s/\s+$//; 3419 $text =~ s/\s+$//;
3002 3420
3003 return unless $text; 3421 return unless $text;
3004 3422
3005 my $timeout = time + ((delete $arg{timeout}) || 60); 3423 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3006 3424
3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3425 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008 3426
3009 if (my $item = $self->{item}{$group}) { 3427 if (my $item = $self->{item}{$group}) {
3010 if ($item->{text} eq $text) { 3428 if ($item->{text} eq $text) {
3011 $item->{count}++; 3429 $item->{count}++;
3012 } else { 3430 } else {
3013 $item->{count} = 1; 3431 $item->{count} = 1;
3014 $item->{text} = $item->{tooltip} = $text; 3432 $item->{text} = $item->{tooltip} = $text;
3015 } 3433 }
3016 $item->{id} = ++$self->{id}; 3434 $item->{id} += 0.2;#d#
3017 $item->{timeout} = $timeout; 3435 $item->{timeout} = $timeout;
3018 delete $item->{label}; 3436 delete $item->{label};
3019 } else { 3437 } else {
3020 $self->{item}{$group} = { 3438 $self->{item}{$group} = {
3021 id => ++$self->{id}, 3439 id => ++$self->{id},
… …
3027 count => 1, 3445 count => 1,
3028 %arg, 3446 %arg,
3029 }; 3447 };
3030 } 3448 }
3031 3449
3450 $ROOT->on_refresh (reorder => sub {
3032 $self->reorder; 3451 $self->reorder;
3452 });
3033} 3453}
3034 3454
3035sub reconfigure { 3455sub reconfigure {
3036 my ($self) = @_; 3456 my ($self) = @_;
3037 3457
… …
3040 3460
3041 $self->reorder; 3461 $self->reorder;
3042 $self->SUPER::reconfigure; 3462 $self->SUPER::reconfigure;
3043} 3463}
3044 3464
3465sub destroy {
3466 my ($self) = @_;
3467
3468 $self->{timer}->cancel;
3469
3470 $self->SUPER::destroy;
3471}
3472
3045############################################################################# 3473#############################################################################
3046 3474
3047package CFClient::UI::Inventory; 3475package CFClient::UI::Inventory;
3048 3476
3049our @ISA = CFClient::UI::ScrolledWindow::; 3477our @ISA = CFClient::UI::Table::;
3050 3478
3051sub new { 3479sub new {
3052 my $class = shift; 3480 my $class = shift;
3053 3481
3054 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3483 col_expand => [0, 1, 0],
3056 @_, 3484 @_,
3057 ); 3485 );
3058 3486
3059 $self 3487 $self
3060} 3488}
3061 3489
3062sub set_items { 3490sub set_items {
3063 my ($self, $items) = @_; 3491 my ($self, $items) = @_;
3064 3492
3065 $self->{scrolled}->clear; 3493 $self->clear;
3066 return unless $items; 3494 return unless $items;
3067 3495
3068 my @items = sort { 3496 my @items = sort {
3069 ($a->{type} <=> $b->{type}) 3497 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name}) 3498 or ($a->{name} cmp $b->{name})
3071 } @$items; 3499 } values %$items;
3072 3500
3073 $self->{real_items} = \@items; 3501 $self->{real_items} = \@items;
3074 3502
3075 my $row = 0; 3503 my $row = 0;
3076 for my $item (@items) { 3504 for my $item (@items) {
3077 CFClient::Item::update_widgets $item; 3505 CFClient::Item::update_widgets $item;
3078 3506
3079 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3507 $self->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3508 $self->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3509 $self->add (2, $row, $item->{weight_widget});
3082 3510
3083 $row++; 3511 $row++;
3084 } 3512 }
3085} 3513}
3086 3514
3087############################################################################# 3515#############################################################################
3088 3516
3089package CFClient::UI::BindEditor; 3517package CFClient::UI::SpellList;
3090 3518
3091our @ISA = CFClient::UI::FancyFrame::; 3519our @ISA = CFClient::UI::Table::;
3092 3520
3093sub new { 3521sub new {
3094 my $class = shift; 3522 my $class = shift;
3095 3523
3096 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3524 my $self = $class->SUPER::new (
3525 binding => [],
3526 commands => [],
3527 @_,
3528 )
3529}
3097 3530
3098 $self->add (my $vb = new CFClient::UI::VBox); 3531my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3099 3532
3533my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3100 3543
3101 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3544sub rebuild_spell_list {
3102 text => "start recording", 3545 my ($self) = @_;
3103 tooltip => "Start/Stops recording of actions." 3546
3104 ."All subsequent actions after the recording started will be captured." 3547 $CFClient::UI::ROOT->on_refresh ($self => sub {
3105 ."The actions are displayed after the record was stopped." 3548 $self->clear;
3106 ."To bind the action you have to click on the 'Bind' button", 3549
3107 on_activate => sub { 3550 return unless $::CONN;
3108 unless ($self->{recording}) { 3551
3109 $self->start; 3552 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558 my $row = 0;
3559
3560 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561 my $spell = $self->{spell}{$_};
3562
3563 $row++;
3564
3565 my $spell_cb = sub {
3566 my ($widget, $ev) = @_;
3567
3568 if ($ev->{button} == 1) {
3569 $::CONN->user_send ("cast $spell->{name}");
3570 } elsif ($ev->{button} == 2) {
3571 $::CONN->user_send ("invoke $spell->{name}");
3572 } elsif ($ev->{button} == 3) {
3573 (new CFClient::UI::Menu
3574 items => [
3575 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577 ],
3578 )->popup ($ev);
3110 } else { 3579 } else {
3111 $self->stop; 3580 return 0;
3581 }
3582
3583 1
3112 } 3584 };
3585
3586 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588 #TODO: add path info to tooltip
3589 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591 $self->add (0, $row, new CFClient::UI::Face
3592 face => $spell->{face},
3593 can_hover => 1,
3594 can_events => 1,
3595 tooltip => $tooltip,
3596 on_button_down => $spell_cb,
3597 );
3598
3599 $self->add (1, $row, new CFClient::UI::Label
3600 expand => 1,
3601 text => $spell->{name},
3602 can_hover => 1,
3603 can_events => 1,
3604 tooltip => $tooltip,
3605 on_button_down => $spell_cb,
3606 );
3607
3608 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3113 }); 3612 }
3114
3115 $vb->add (new CFClient::UI::Label text => "Actions:");
3116 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3117
3118 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3119 $vb->add (my $hb = new CFClient::UI::HBox);
3120 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3121 $hb->add (new CFClient::UI::Button
3122 text => "bind",
3123 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3124 on_activate => sub {
3125 $self->ask_for_bind;
3126 });
3127
3128 $vb->add (my $hb = new CFClient::UI::HBox);
3129 $hb->add (new CFClient::UI::Button
3130 text => "ok",
3131 expand => 1,
3132 tooltip => "This closes the binding editor and saves the binding",
3133 on_activate => sub {
3134 $self->hide;
3135 $self->commit;
3136 });
3137
3138 $hb->add (new CFClient::UI::Button
3139 text => "cancel",
3140 expand => 1,
3141 tooltip => "This closes the binding editor without saving",
3142 on_activate => sub {
3143 $self->hide;
3144 $self->{binding_cancel}->()
3145 if $self->{binding_cancel};
3146 });
3147
3148 $self->update_binding_widgets;
3149
3150 $self
3151}
3152
3153sub commit {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 if ($sym != 0 && @$cmds > 0) {
3157 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3158 ."'. Don't forget 'Save Config'!");
3159 $self->{binding_change}->($mod, $sym, $cmds)
3160 if $self->{binding_change};
3161 } else {
3162 $::STATUSBOX->add ("No action bound, no key or action specified!");
3163 $self->{binding_cancel}->()
3164 if $self->{binding_cancel};
3165 }
3166}
3167
3168sub start {
3169 my ($self) = @_;
3170
3171 $self->{rec_btn}->set_text ("stop recording");
3172 $self->{recording} = 1;
3173 $self->clear_command_list;
3174 $::CONN->start_record if $::CONN;
3175}
3176
3177sub stop {
3178 my ($self) = @_;
3179
3180 $self->{rec_btn}->set_text ("start recording");
3181 $self->{recording} = 0;
3182
3183 my $rec;
3184 $rec = $::CONN->stop_record if $::CONN;
3185 return unless ref $rec eq 'ARRAY';
3186 $self->set_command_list ($rec);
3187}
3188
3189
3190sub ask_for_bind_and_commit {
3191 my ($self) = @_;
3192 $self->ask_for_bind (1);
3193}
3194
3195sub ask_for_bind {
3196 my ($self, $commit) = @_;
3197
3198 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets;
3202 $self->commit if $commit;
3203 }); 3613 });
3204} 3614}
3205 3615
3206# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands)
3208# $cb is the callback that is executed on OK
3209# $ccb is the callback that is executed on CANCEL and
3210# when the binding was unsuccessful on OK
3211sub set_binding {
3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3213
3214 $self->clear_command_list;
3215 $self->{recording} = 0;
3216 $self->{rec_btn}->set_text ("start recording");
3217
3218 $self->{binding} = [$mod, $sym];
3219 $self->{commands} = $cmds;
3220
3221 $self->{binding_change} = $cb;
3222 $self->{binding_cancel} = $ccb;
3223
3224 $self->update_binding_widgets;
3225}
3226
3227# this is a shortcut method that asks for a binding
3228# and then just binds it.
3229sub do_quick_binding {
3230 my ($self, $cmds) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub {
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 });
3234 $self->ask_for_bind (1);
3235}
3236
3237sub update_binding_widgets {
3238 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding;
3240 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3241 $self->set_command_list ($cmds);
3242}
3243
3244sub get_binding {
3245 my ($self) = @_;
3246 return (
3247 $self->{binding}->[0],
3248 $self->{binding}->[1],
3249 [ grep { defined $_ } @{$self->{commands}} ]
3250 );
3251}
3252
3253sub clear_command_list {
3254 my ($self) = @_;
3255 $self->{cmdbox}->clear ();
3256}
3257
3258sub set_command_list {
3259 my ($self, $cmds) = @_;
3260
3261 $self->{cmdbox}->clear ();
3262 $self->{commands} = $cmds;
3263
3264 my $idx = 0;
3265
3266 for (@$cmds) {
3267 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3268
3269 my $i = $idx;
3270 $hb->add (new CFClient::UI::Label text => $_);
3271 $hb->add (new CFClient::UI::Button
3272 text => "delete",
3273 tooltip => "Deletes the action from the record",
3274 on_activate => sub {
3275 $self->{cmdbox}->remove ($hb);
3276 $cmds->[$i] = undef;
3277 });
3278
3279
3280 $idx++
3281 }
3282}
3283
3284#############################################################################
3285
3286package CFClient::UI::SpellList;
3287
3288our @ISA = CFClient::UI::FancyFrame::;
3289
3290sub new {
3291 my $class = shift;
3292
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3294
3295 $self->add (new CFClient::UI::ScrolledWindow
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3297
3298 $self;
3299}
3300
3301# XXX: Do sorting? Argl...
3302sub add_spell { 3616sub add_spell {
3303 my ($self, $spell) = @_; 3617 my ($self, $spell) = @_;
3618
3304 $self->{spells}->{$spell->{name}} = $spell; 3619 $self->{spell}->{$spell->{name}} = $spell;
3305 3620 $self->rebuild_spell_list;
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333} 3621}
3334 3622
3335sub remove_spell { 3623sub remove_spell {
3336 my ($self, $spell) = @_; 3624 my ($self, $spell) = @_;
3625
3337 delete $self->{spells}->{$spell->{name}}; 3626 delete $self->{spell}->{$spell->{name}};
3338 $self->rebuild_spell_list; 3627 $self->rebuild_spell_list;
3339} 3628}
3340 3629
3630sub clear_spells {
3631 my ($self) = @_;
3632
3633 $self->{spell} = {};
3634 $self->rebuild_spell_list;
3635}
3636
3341############################################################################# 3637#############################################################################
3342 3638
3343package CFClient::UI::Root; 3639package CFClient::UI::Root;
3344 3640
3345our @ISA = CFClient::UI::Container::; 3641our @ISA = CFClient::UI::Container::;
3642
3643use List::Util qw(min max);
3346 3644
3347use CFClient::OpenGL; 3645use CFClient::OpenGL;
3348 3646
3349sub new { 3647sub new {
3350 my $class = shift; 3648 my $class = shift;
… …
3377 $coord = $max - $size if $coord > $max - $size; 3675 $coord = $max - $size if $coord > $max - $size;
3378 3676
3379 int $coord + 0.5 3677 int $coord + 0.5
3380} 3678}
3381 3679
3382sub size_allocate { 3680sub invoke_size_allocate {
3383 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
3384 3682
3385 for my $child ($self->children) { 3683 for my $child ($self->children) {
3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3684 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3387 3685
… …
3391 $X = _to_pixel $X, $W, $self->{w}; 3689 $X = _to_pixel $X, $W, $self->{w};
3392 $Y = _to_pixel $Y, $H, $self->{h}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3393 3691
3394 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3395 } 3693 }
3694
3695 1
3396} 3696}
3397 3697
3398sub coord2local { 3698sub coord2local {
3399 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3400 3700
… …
3485 3785
3486 delete $queue{$widget+0}; 3786 delete $queue{$widget+0};
3487 3787
3488 my ($w, $h) = $widget->size_request; 3788 my ($w, $h) = $widget->size_request;
3489 3789
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3790 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3791 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3792
3793 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3794 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3492 3795
3493 $w = $widget->{force_w} if exists $widget->{force_w}; 3796 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h}; 3797 $h = $widget->{force_h} if exists $widget->{force_h};
3495 3798
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3799 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3522 3825
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3524 3827
3525 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3526 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3830
3831 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h;
3833
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3527 3836
3528 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
3529 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
3530 3839
3531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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