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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.322 by root, Wed Jul 5 01:53:24 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 376 # nop
377} 377}
378 378
379sub visible_children { 379sub visible_children {
… …
381} 381}
382 382
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
388} 390}
389 391
390sub set_tooltip { 392sub set_tooltip {
391 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
392 394
… …
397 399
398 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
399 401
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 405 }
404} 406}
405 407
406# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
407sub coord2local { 409sub coord2local {
… …
415 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
416 418
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 420}
419 421
420sub focus_in { 422sub invoke_focus_in {
421 my ($self) = @_; 423 my ($self) = @_;
422 424
423 return if $FOCUS == $self; 425 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
425 427
426 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
427 429
428 $self->_emit (focus_in => $focus); 430 $self->update;
429 431
430 $focus->update if $focus; 432 0
431 $FOCUS->update;
432} 433}
433 434
434sub focus_out { 435sub invoke_focus_out {
435 my ($self) = @_; 436 my ($self) = @_;
436 437
437 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
438 439
439 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
440 441
441 $self->_emit (focus_out => $focus); 442 $self->update;
442 443
443 $focus->update if $focus; #?
444
445 $::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
446 unless $FOCUS; 445 unless $FOCUS;
447}
448 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
449sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
450sub button_up { 0 } 458sub invoke_button_up { 1 }
451sub key_down { 0 } 459sub invoke_key_down { 1 }
452sub key_up { 0 } 460sub invoke_key_up { 1 }
453 461
454sub button_down { 462sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
456 464
457 $self->focus_in; 465 $self->grab_focus;
458 466
459 0 467 1
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 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 483}
461 484
462sub find_widget { 485sub find_widget {
463 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
464 487
… …
474sub set_parent { 497sub set_parent {
475 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
476 499
477 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 502}
503 503
504sub realloc { 504sub realloc {
505 my ($self) = @_; 505 my ($self) = @_;
506 506
… …
539 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540 540
541 # update screen rectangle 541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 544
547 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 548
551 glPushMatrix; 549 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 551
556 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 554 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 556 glBegin GL_QUADS;
563 glVertex $x , $y; 557 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
567 glEnd; 561 glEnd;
568 glDisable GL_BLEND; 562 glDisable GL_BLEND;
569 } 563 }
570 564
571 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 566 glPushMatrix;
573 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 570 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
580 glEnd; 574 glEnd;
581 glPopMatrix; 575 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
584} 581}
585 582
586sub _draw { 583sub _draw {
587 my ($self) = @_; 584 my ($self) = @_;
588 585
… …
591 588
592sub DESTROY { 589sub DESTROY {
593 my ($self) = @_; 590 my ($self) = @_;
594 591
595 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
596 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 596}
598 597
599############################################################################# 598#############################################################################
600 599
601package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
626 625
627 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
629 628
630 glEnable GL_BLEND; 629 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 631 glColor_premultiply @$color;
633 632
634 glBegin GL_QUADS; 633 glBegin GL_QUADS;
635 glVertex 0 , 0; 634 glVertex 0 , 0;
636 glVertex 0 , $h; 635 glVertex 0 , $h;
637 glVertex $w, $h; 636 glVertex $w, $h;
… …
766} 765}
767 766
768sub add { 767sub add {
769 my ($self, $child) = @_; 768 my ($self, $child) = @_;
770 769
771 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
774} 772}
775 773
776sub remove { 774sub remove {
777 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
786 784
787sub size_request { 785sub size_request {
788 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
789} 787}
790 788
791sub size_allocate { 789sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
793 791
794 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
795} 795}
796 796
797############################################################################# 797#############################################################################
798
799# back-buffered drawing area
798 800
799package CFClient::UI::Window; 801package CFClient::UI::Window;
800 802
801our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
802 804
… …
813 815
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 817 $self->SUPER::update;
816} 818}
817 819
818sub size_allocate { 820sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
820 822
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
823} 826}
824 827
825sub _render { 828sub _render {
826 my ($self) = @_; 829 my ($self) = @_;
827 830
… …
854 my $tex = $self->{texture} 857 my $tex = $self->{texture}
855 or return; 858 or return;
856 859
857 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
860 863
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 865
863 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
864} 867}
… …
888 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
889 892
890 ($w, $h) 893 ($w, $h)
891} 894}
892 895
893sub size_allocate { 896sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
895 898
896 my $child = $self->child; 899 my $child = $self->child;
897 900
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 903
901 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
902 $self->update; 905 $self->update;
906
907 1
903} 908}
904 909
905sub set_offset { 910sub set_offset {
906 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
907 912
… …
955package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
956 961
957our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
958 963
959sub new { 964sub new {
960 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
961 968
962 my $self; 969 my $self;
963 970
964 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
965 vertical => 1, 972 vertical => 1,
… …
970 ; 977 ;
971 978
972 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider, 981 slider => $slider,
975 @_, 982 %arg,
976 ); 983 );
977 984
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
981 987
982 $self 988 $self
983} 989}
984 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
985sub update { 1005sub update {
986 my ($self) = @_; 1006 my ($self) = @_;
987 1007
988 $self->SUPER::update; 1008 $self->SUPER::update;
989 1009
990 # todo: overwrite size_allocate of child 1010 $self->update_slider;
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1011}
994 1012
995sub size_allocate { 1013sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
997 1015
1016 $self->update_slider;
1017
998 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1019}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006 1020
1007############################################################################# 1021#############################################################################
1008 1022
1009package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1010 1024
… …
1026 1040
1027 if ($self->{bg}) { 1041 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
1029 1043
1030 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
1033 1047
1034 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1049 glVertex 0 , 0;
1036 glVertex 0 , $h; 1050 glVertex 0 , $h;
1037 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062 1076
1063sub new { 1077sub new {
1064 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1065
1066 my $title = delete $arg{title};
1067 1079
1068 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1083 border => 0.6,
… …
1073 min_w => 16, 1085 min_w => 16,
1074 min_h => 16, 1086 min_h => 16,
1075 %arg, 1087 %arg,
1076 ); 1088 );
1077 1089
1078 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1079 align => 0, 1091 align => 0,
1080 valign => 1, 1092 valign => 1,
1081 text => $title, 1093 text => $self->{title},
1082 fontsize => $self->{border} 1094 fontsize => $self->{border},
1083 if defined $title; 1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1084 1105
1085 $self 1106 $self
1086} 1107}
1087 1108
1088sub add { 1109sub add {
1089 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1090 1111
1091 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1115}
1094 1116
1095sub border { 1117sub border {
1096 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1097} 1119}
1098 1120
1099sub size_request { 1121sub size_request {
1100 my ($self) = @_; 1122 my ($self) = @_;
1101 1123
1102 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1103 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1104 1129
1105 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1106 1131
1107 ( 1132 (
1108 $w + $self->border * 2, 1133 $w + $self->border * 2,
1109 $h + $self->border * 2, 1134 $h + $self->border * 2,
1110 ) 1135 )
1111} 1136}
1112 1137
1113sub size_allocate { 1138sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1115 1140
1116 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1145 }
1121 1146
1122 my $border = $self->border; 1147 my $border = $self->border;
1123 1148
1124 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1125 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1151
1152 $self->child->configure ($border, $border, $w, $h);
1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1126 1164
1127 $self->child->configure ($border, $border, $w, $h); 1165 1
1128} 1166}
1129 1167
1130sub button_down { 1168sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1132 1170
1133 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1172 my $border = $self->border;
1135 1173
… …
1151 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1152 1190
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1193
1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1195 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1196 };
1159 1197
1160 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1166 1204
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1206
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1208 # HACK: the next line is required to enforce placement
1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1210 };
1171 } else { 1211 } else {
1172 return 0; 1212 return 0;
1173 } 1213 }
1174 1214
1175 1 1215 1
1176} 1216}
1177 1217
1178sub button_up { 1218sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1180 1220
1181 !!delete $self->{motion} 1221 ! ! delete $self->{motion}
1182} 1222}
1183 1223
1184sub mouse_motion { 1224sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1186 1226
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1228
1189 !!$self->{motion} 1229 ! ! $self->{motion}
1190} 1230}
1191 1231
1192sub _draw { 1232sub _draw {
1193 my ($self) = @_; 1233 my ($self) = @_;
1194 1234
… …
1220 1260
1221 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1222 1262
1223 $child->draw; 1263 $child->draw;
1224 1264
1225 if ($self->{title}) { 1265 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1266 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1228 } 1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1229} 1274}
1230 1275
1231############################################################################# 1276#############################################################################
1232 1277
1233package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1256 1301
1257 $child->set_parent ($self); 1302 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1259 1304
1260 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1261} 1312}
1262 1313
1263# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1264sub clear { 1315sub clear {
1265 my ($self) = @_; 1316 my ($self) = @_;
… …
1306 (sum @$ws), 1357 (sum @$ws),
1307 (sum @$hs), 1358 (sum @$hs),
1308 ) 1359 )
1309} 1360}
1310 1361
1311sub size_allocate { 1362sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1313 1364
1314 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1315 1366
1316 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1348 } 1399 }
1349 1400
1350 $y += $row_h; 1401 $y += $row_h;
1351 } 1402 }
1352 1403
1404 1
1353} 1405}
1354 1406
1355sub find_widget { 1407sub find_widget {
1356 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1357 1409
… …
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 ) 1448 )
1397} 1449}
1398 1450
1399sub size_allocate { 1451sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1401 1453
1402 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1404 1456
1405 my @req; 1457 my @req;
1406 1458
1407 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1409 } else { 1461 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1412 1464
1413 if ($req > $space) { 1465 if ($req > $space) {
1414 # ah well, not enough space 1466 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1416 } else { 1468 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1470
1419 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1420 1472
1421 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1474 for 0 .. $#children;
1423 } 1475 }
1424 } 1476 }
1425 1477
1426 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1427 1479
1428 my $pos = 0; 1480 my $pos = 0;
1429 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1432 1484
1433 $pos += $alloc; 1485 $pos += $alloc;
1434 } 1486 }
1435 1487
1436 1 1488 1
… …
1484 #font => default_font 1536 #font => default_font
1485 #text => initial text 1537 #text => initial text
1486 #markup => initial narkup 1538 #markup => initial narkup
1487 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1488 ellipsise => 3, # end 1540 ellipsise => 3, # end
1489 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1490 fontsize => 1, 1542 fontsize => 1,
1491 align => -1, 1543 align => -1,
1492 valign => -1, 1544 valign => -1,
1493 padding_x => 2, 1545 padding_x => 2,
1494 padding_y => 2, 1546 padding_y => 2,
1495 can_events => 0, 1547 can_events => 0,
1496 %arg 1548 %arg
1497 ); 1549 );
1498 1550
1499 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1500 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1501 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1502 $self->{template} = $layout; 1554 $self->{template} = $layout;
1503 } 1555 }
1504 1556
1505 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
1526 1578
1527 delete $self->{texture}; 1579 delete $self->{texture};
1528 $self->SUPER::update; 1580 $self->SUPER::update;
1529} 1581}
1530 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1531sub set_text { 1590sub set_text {
1532 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1533 1592
1534 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1536 1595
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1539 1597
1598 delete $self->{size_req};
1540 $self->realloc; 1599 $self->realloc;
1541 $self->update; 1600 $self->update;
1542} 1601}
1543 1602
1544sub set_markup { 1603sub set_markup {
… …
1547 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1549 1608
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1610
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1554 1612
1613 delete $self->{size_req};
1555 $self->realloc; 1614 $self->realloc;
1556 $self->update; 1615 $self->update;
1557} 1616}
1558 1617
1559sub size_request { 1618sub size_request {
1560 my ($self) = @_; 1619 my ($self) = @_;
1561 1620
1621 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1622 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1623 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1624 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1625 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1627
1568 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1569 1629
1570 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1632 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1633
1574 my ($w2, $h2) = $self->{template}->size; 1634 my ($w2, $h2) = $self->{template}->size;
1575 1635
1576 $w = List::Util::max $w, $w2; 1636 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1637 $h = List::Util::max $h, $h2;
1638 }
1639
1640 [$w, $h]
1578 } 1641 };
1579 1642
1580 ($w, $h) 1643 @{ $self->{size_req} }
1581} 1644}
1582 1645
1646sub baseline_shift {
1647 $_[0]{layout}->descent
1648}
1649
1583sub size_allocate { 1650sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1585 1652
1586 delete $self->{ox}; 1653 delete $self->{ox};
1587 1654
1588 delete $self->{texture} 1655 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1656 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1657
1658 1
1590} 1659}
1591 1660
1592sub set_fontsize { 1661sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1594 1663
1595 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1596 delete $self->{texture}; 1666 delete $self->{texture};
1597 1667
1598 $self->realloc; 1668 $self->realloc;
1599} 1669}
1600 1670
1671sub reconfigure {
1672 my ($self) = @_;
1673
1674 delete $self->{size_req};
1675 delete $self->{texture};
1676
1677 $self->SUPER::reconfigure;
1678}
1679
1601sub _draw { 1680sub _draw {
1602 my ($self) = @_; 1681 my ($self) = @_;
1603 1682
1604 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1605 1684
1606 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1609 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613 1692
1614 new_from_layout CFClient::Texture $self->{layout} 1693 $self->{size_req}
1615 }; 1694 };
1616 1695
1617 unless (exists $self->{ox}) { 1696 unless (exists $self->{ox}) {
1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5); 1699 : ($self->{w} - $size->[0]) * 0.5);
1621 1700
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1703 : ($self->{h} - $size->[1]) * 0.5);
1625 }; 1704 };
1626 1705
1627 glEnable GL_TEXTURE_2D; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1629 1708
1630 if ($tex->{format} == GL_ALPHA) { 1709 $self->{layout}->render ($self->{ox}, $self->{oy});
1631 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else {
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 }
1636
1637 glDisable GL_TEXTURE_2D;
1638} 1710}
1639 1711
1640############################################################################# 1712#############################################################################
1641 1713
1642package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
1656 can_hover => 1, 1728 can_hover => 1,
1657 can_focus => 1, 1729 can_focus => 1,
1658 valign => 0, 1730 valign => 0,
1659 can_events => 1, 1731 can_events => 1,
1660 #text => ... 1732 #text => ...
1733 #hidden => "*",
1661 @_ 1734 @_
1662 ) 1735 )
1663} 1736}
1664 1737
1665sub _set_text { 1738sub _set_text {
… …
1667 1740
1668 delete $self->{cur_h}; 1741 delete $self->{cur_h};
1669 1742
1670 return if $self->{text} eq $text; 1743 return if $self->{text} eq $text;
1671 1744
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1745 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1746 $self->{text} = $text;
1676 1747
1677 $text =~ s/./*/g if $self->{hidden}; 1748 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1749 $self->{layout}->set_text ("$text ");
1750 delete $self->{size_req};
1679 1751
1680 $self->_emit (changed => $self->{text}); 1752 $self->emit (changed => $self->{text});
1753
1754 $self->realloc;
1755 $self->update;
1681} 1756}
1682 1757
1683sub set_text { 1758sub set_text {
1684 my ($self, $text) = @_; 1759 my ($self, $text) = @_;
1685 1760
1686 $self->{cursor} = length $text; 1761 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1762 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1763}
1691 1764
1692sub get_text { 1765sub get_text {
1693 $_[0]{text} 1766 $_[0]{text}
1694} 1767}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1772 my ($w, $h) = $self->SUPER::size_request;
1700 1773
1701 ($w + 1, $h) # add 1 for cursor 1774 ($w + 1, $h) # add 1 for cursor
1702} 1775}
1703 1776
1704sub key_down { 1777sub invoke_key_down {
1705 my ($self, $ev) = @_; 1778 my ($self, $ev) = @_;
1706 1779
1707 my $mod = $ev->{mod}; 1780 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 1781 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 1782 my $uni = $ev->{unicode};
… …
1721 } elsif ($sym == CFClient::SDLK_HOME) { 1794 } elsif ($sym == CFClient::SDLK_HOME) {
1722 $self->{cursor} = 0; 1795 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) { 1796 } elsif ($sym == CFClient::SDLK_END) {
1724 $self->{cursor} = length $text; 1797 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 1798 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 1799 $self->emit ('escape');
1727 } elsif ($uni) { 1800 } elsif ($uni) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 1801 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 1802 } else {
1730 return 0; 1803 return 0;
1731 } 1804 }
… …
1735 $self->realloc; 1808 $self->realloc;
1736 1809
1737 1 1810 1
1738} 1811}
1739 1812
1740sub focus_in { 1813sub invoke_focus_in {
1741 my ($self) = @_; 1814 my ($self) = @_;
1742 1815
1743 $self->{last_activity} = $::NOW; 1816 $self->{last_activity} = $::NOW;
1744 1817
1745 $self->SUPER::focus_in; 1818 $self->SUPER::invoke_focus_in
1746} 1819}
1747 1820
1748sub button_down { 1821sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 1822 my ($self, $ev, $x, $y) = @_;
1750 1823
1751 $self->SUPER::button_down ($ev, $x, $y); 1824 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 1825
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 1826 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 1827
1755 # byte-index to char-index 1828 # byte-index to char-index
1756 my $text = $self->{text}; 1829 my $text = $self->{text};
… …
1761 $self->update; 1834 $self->update;
1762 1835
1763 1 1836 1
1764} 1837}
1765 1838
1766sub mouse_motion { 1839sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 1840 my ($self, $ev, $x, $y) = @_;
1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1841# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769 1842
1770 0 1843 1
1771} 1844}
1772 1845
1773sub _draw { 1846sub _draw {
1774 my ($self) = @_; 1847 my ($self) = @_;
1775 1848
1776 local $self->{fg} = $self->{fg}; 1849 local $self->{fg} = $self->{fg};
1777 1850
1778 if ($FOCUS == $self) { 1851 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1852 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1853 $self->{fg} = $self->{active_fg};
1781 } else { 1854 } else {
1782 glColor @{$self->{bg}}; 1855 glColor_premultiply @{$self->{bg}};
1783 } 1856 }
1784 1857
1785 glEnable GL_BLEND; 1858 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1860 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1861 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1862 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1863 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1864 glVertex $self->{w}, 0;
… …
1816 1889
1817our @ISA = CFClient::UI::EntryBase::; 1890our @ISA = CFClient::UI::EntryBase::;
1818 1891
1819use CFClient::OpenGL; 1892use CFClient::OpenGL;
1820 1893
1821sub key_down { 1894sub invoke_key_down {
1822 my ($self, $ev) = @_; 1895 my ($self, $ev) = @_;
1823 1896
1824 my $sym = $ev->{sym}; 1897 my $sym = $ev->{sym};
1825 1898
1826 if ($sym == 13) { 1899 if ($sym == 13) {
1827 unshift @{$self->{history}}, 1900 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 1901 my $txt = $self->get_text;
1902
1829 $self->{history_pointer} = -1; 1903 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 1904 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 1905 $self->emit (activate => $txt);
1832 $self->update; 1906 $self->update;
1833 1907
1834 } elsif ($sym == CFClient::SDLK_UP) { 1908 } elsif ($sym == CFClient::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 1909 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 1910 $self->{history_saveback} = $self->get_text;
… …
1852 } else { 1926 } else {
1853 $self->set_text ($self->{history_saveback}); 1927 $self->set_text ($self->{history_saveback});
1854 } 1928 }
1855 1929
1856 } else { 1930 } else {
1857 return $self->SUPER::key_down ($ev) 1931 return $self->SUPER::invoke_key_down ($ev)
1858 } 1932 }
1859 1933
1860 1 1934 1
1861} 1935}
1862 1936
… …
1886 can_events => 1, 1960 can_events => 1,
1887 @_ 1961 @_
1888 ) 1962 )
1889} 1963}
1890 1964
1891sub activate { }
1892
1893sub button_up { 1965sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1895 1967
1896 $self->emit ("activate") 1968 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 1969 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 1970 && $y >= 0 && $y < $self->{h};
… …
1901} 1973}
1902 1974
1903sub _draw { 1975sub _draw {
1904 my ($self) = @_; 1976 my ($self) = @_;
1905 1977
1906 local $self->{fg} = $self->{fg}; 1978 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 1979
1912 glEnable GL_TEXTURE_2D; 1980 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1981 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 1982 glColor 0, 0, 0, 1;
1915 1983
1916 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1984 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1917 1985
1918 glDisable GL_TEXTURE_2D; 1986 glDisable GL_TEXTURE_2D;
1919 1987
1920 $self->SUPER::_draw; 1988 $self->SUPER::_draw;
1989}
1990
1991#############################################################################
1992
1993package CFClient::UI::ImageButton;
1994
1995our @ISA = CFClient::UI::Image::;
1996
1997use CFClient::OpenGL;
1998
1999my %textures;
2000
2001sub new {
2002 my $class = shift;
2003
2004 my $self = $class->SUPER::new (
2005 padding_x => 4,
2006 padding_y => 4,
2007 fg => [1, 1, 1],
2008 active_fg => [0, 0, 1],
2009 can_hover => 1,
2010 align => 0,
2011 valign => 0,
2012 can_events => 1,
2013 @_
2014 );
2015}
2016
2017sub invoke_button_up {
2018 my ($self, $ev, $x, $y) = @_;
2019
2020 $self->emit ("activate")
2021 if $x >= 0 && $x < $self->{w}
2022 && $y >= 0 && $y < $self->{h};
2023
2024 1
1921} 2025}
1922 2026
1923############################################################################# 2027#############################################################################
1924 2028
1925package CFClient::UI::CheckBox; 2029package CFClient::UI::CheckBox;
… …
1952 my ($self) = @_; 2056 my ($self) = @_;
1953 2057
1954 (6) x 2 2058 (6) x 2
1955} 2059}
1956 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
1957sub button_down { 2069sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
1959 2071
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2074 $self->toggle;
1963 $self->_emit (changed => $self->{state});
1964 } else { 2075 } else {
1965 return 0 2076 return 0
1966 } 2077 }
1967 2078
1968 1 2079 1
… …
1993package CFClient::UI::Image; 2104package CFClient::UI::Image;
1994 2105
1995our @ISA = CFClient::UI::Base::; 2106our @ISA = CFClient::UI::Base::;
1996 2107
1997use CFClient::OpenGL; 2108use CFClient::OpenGL;
1998use Carp qw/confess/;
1999 2109
2000our %loaded_images; 2110our %texture_cache;
2001 2111
2002sub new { 2112sub new {
2003 my $class = shift; 2113 my $class = shift;
2004 2114
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
2006 2119
2007 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2120 $self->{path}
2121 or Carp::croak "required attribute 'path' not set";
2008 2122
2009 $loaded_images{$self->{image}} ||= 2123 $self->{tex} = $texture_cache{$self->{path}} ||=
2010 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2011 2125
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2126 Scalar::Util::weaken $texture_cache{$self->{path}};
2013 2127
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2129
2018 $self 2130 $self
2019} 2131}
2020 2132
2021sub size_request { 2133sub size_request {
2022 my ($self) = @_; 2134 my ($self) = @_;
2023 2135
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2136 ($self->{tex}{w}, $self->{tex}{h})
2025} 2137}
2026 2138
2027sub _draw { 2139sub _draw {
2028 my ($self) = @_; 2140 my ($self) = @_;
2029 2141
… …
2138 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2139 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2140 2252
2141 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2143 2258
2144 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2264
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2265 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2266 glBegin GL_QUADS;
… …
2165 2281
2166 if ($t3) { 2282 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd; 2289 glEnd;
2174 } 2290 }
2175 2291
2176 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2264 $self->update; 2380 $self->update;
2265 2381
2266 $self 2382 $self
2267} 2383}
2268 2384
2269sub changed { }
2270
2271sub set_range { 2385sub set_range {
2272 my ($self, $range) = @_; 2386 my ($self, $range) = @_;
2273 2387
2274 ($range, $self->{range}) = ($self->{range}, $range); 2388 ($range, $self->{range}) = ($self->{range}, $range);
2275 2389
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2390 if ("@$range" ne "@{$self->{range}}") {
2391 $self->update;
2392 $self->set_value ($self->{range}[0]);
2393 }
2278} 2394}
2279 2395
2280sub set_value { 2396sub set_value {
2281 my ($self, $value) = @_; 2397 my ($self, $value) = @_;
2282 2398
… …
2293 if $unit; 2409 if $unit;
2294 2410
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2411 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2412
2297 if ($value != $old_value) { 2413 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2414 $self->emit (changed => $value);
2299 $self->update; 2415 $self->update;
2300 } 2416 }
2301} 2417}
2302 2418
2303sub size_request { 2419sub size_request {
2304 my ($self) = @_; 2420 my ($self) = @_;
2305 2421
2306 ($self->{req_w}, $self->{req_h}) 2422 ($self->{req_w}, $self->{req_h})
2307} 2423}
2308 2424
2309sub button_down { 2425sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2426 my ($self, $ev, $x, $y) = @_;
2311 2427
2312 $self->SUPER::button_down ($ev, $x, $y); 2428 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2429
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2430 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2431
2316 $self->mouse_motion ($ev, $x, $y) 2432 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2433}
2318 2434
2319sub mouse_motion { 2435sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2436 my ($self, $ev, $x, $y) = @_;
2321 2437
2322 if ($GRAB == $self) { 2438 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2439 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2440
… …
2335} 2451}
2336 2452
2337sub update { 2453sub update {
2338 my ($self) = @_; 2454 my ($self) = @_;
2339 2455
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2456 delete $self->{knob_w};
2457 $self->SUPER::update;
2458}
2459
2460sub _draw {
2461 my ($self) = @_;
2462
2463 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2464 $self->set_value ($self->{range}[0]);
2342 2465
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2466 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2467 my $range = ($hi - $page - $lo) || 1e-100;
2345 2468
… …
2351 $value = ($value - $lo) / $range; 2474 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2475 $value = $value * $self->{scale} + $self->{offset};
2353 2476
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2477 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2478 $self->{knob_w} = $knob_w;
2356 }); 2479 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2480
2364 $self->SUPER::_draw (); 2481 $self->SUPER::_draw ();
2365 2482
2366 glScale $self->{w}, $self->{h}; 2483 glScale $self->{w}, $self->{h};
2367 2484
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2545sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2546sub set_value { shift->{slider}->set_value (@_) }
2430 2547
2431############################################################################# 2548#############################################################################
2432 2549
2433package CFClient::UI::TextView; 2550package CFClient::UI::TextScroller;
2434 2551
2435our @ISA = CFClient::UI::HBox::; 2552our @ISA = CFClient::UI::HBox::;
2436 2553
2437use CFClient::OpenGL; 2554use CFClient::OpenGL;
2438 2555
… …
2440 my $class = shift; 2557 my $class = shift;
2441 2558
2442 my $self = $class->SUPER::new ( 2559 my $self = $class->SUPER::new (
2443 fontsize => 1, 2560 fontsize => 1,
2444 can_events => 0, 2561 can_events => 0,
2562 indent => 0,
2445 #font => default_font 2563 #font => default_font
2446 @_, 2564 @_,
2447 2565
2448 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2449 par => [], 2567 par => [],
2450 height => 0, 2568 height => 0,
2451 children => [ 2569 children => [
2452 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2453 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2464 2582
2465 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2584 $self->reflow;
2467} 2585}
2468 2586
2587sub size_request {
2588 my ($self) = @_;
2589
2590 my ($empty, $slider) = @{ $self->{children} };
2591
2592 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request
2594}
2595
2469sub size_allocate { 2596sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2597 my ($self, $w, $h) = @_;
2471 2598
2472 $self->SUPER::size_allocate ($w, $h); 2599 my ($empty, $slider, @other) = @{ $self->{children} };
2600 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2601
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2602 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2603 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2604 $self->{layout}->set_width ($empty->{w});
2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2606
2478 $self->reflow; 2607 $self->reflow;
2479}
2480 2608
2481sub text_size { 2609 local $self->{children} = [$empty, $slider];
2482 my ($self, $text, $indent) = @_; 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2611}
2612
2613sub get_layout {
2614 my ($self, $para) = @_;
2483 2615
2484 my $layout = $self->{layout}; 2616 my $layout = $self->{layout};
2485 2617
2618 $layout->set_font ($self->{font}) if $self->{font};
2619 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2620 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2621 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2622 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2623 $layout->set_markup ($para->{markup});
2624
2625 $layout->set_shapes (
2626 map
2627 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2628 @{$para->{widget}}
2489 2629 );
2630
2490 $layout->size 2631 $layout
2491} 2632}
2492 2633
2493sub reflow { 2634sub reflow {
2494 my ($self) = @_; 2635 my ($self) = @_;
2495 2636
… …
2504 $self->{children}[1]->set_value ($offset); 2645 $self->{children}[1]->set_value ($offset);
2505} 2646}
2506 2647
2507sub clear { 2648sub clear {
2508 my ($self) = @_; 2649 my ($self) = @_;
2650
2651 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other;
2509 2653
2510 $self->{par} = []; 2654 $self->{par} = [];
2511 $self->{height} = 0; 2655 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2657}
2514 2658
2515sub add_paragraph { 2659sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2660 my ($self, $color, $para, $indent) = @_;
2517 2661
2518 for my $line (split /\n/, $text) { 2662 my ($text, @w) = ref $para ? @$para : $para;
2519 my ($w, $h) = $self->text_size ($line); 2663
2520 $self->{height} += $h; 2664 $para = {
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2665 w => 1e10,
2666 wrapped => 1,
2667 fg => $color,
2668 indent => $indent,
2669 markup => $text,
2670 widget => \@w,
2522 } 2671 };
2523 2672
2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2673 $self->add (@w) if @w;
2674 push @{$self->{par}}, $para;
2675
2676 $self->{need_reflow}++;
2677 $self->update;
2678}
2679
2680sub scroll_to_bottom {
2681 my ($self) = @_;
2682
2683 $self->{scroll_to_bottom} = 1;
2684 $self->update;
2525} 2685}
2526 2686
2527sub update { 2687sub update {
2528 my ($self) = @_; 2688 my ($self) = @_;
2529 2689
… …
2531 2691
2532 return unless $self->{h} > 0; 2692 return unless $self->{h} > 0;
2533 2693
2534 delete $self->{texture}; 2694 delete $self->{texture};
2535 2695
2536 $ROOT->on_post_alloc ($self, sub { 2696 $ROOT->on_post_alloc ($self => sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2698
2539 if (delete $self->{need_reflow}) { 2699 if (delete $self->{need_reflow}) {
2540 my $height = 0; 2700 my $height = 0;
2541 2701
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) { 2702 for my $para (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2548 $layout->set_width ($W - $_->[3]); 2704 my $layout = $self->get_layout ($para);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2705 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2706
2552 $_->[1] = $h; 2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2553 } 2710 }
2554 2711
2555 $height += $_->[1]; 2712 $height += $para->{h};
2556 } 2713 }
2557 2714
2558 $self->{height} = $height; 2715 $self->{height} = $height;
2559 2716
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2717 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2561 2718
2562 delete $self->{texture}; 2719 delete $self->{texture};
2563 } 2720 }
2564 2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2724 }
2725
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2727 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2728 glClear GL_COLOR_BUFFER_BIT;
2568 2729
2569 my $top = int $self->{children}[1]{range}[0]; 2730 my $top = int $self->{children}[1]{range}[0];
2570 2731
2571 my $y0 = $top; 2732 my $y0 = $top;
2572 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2573 2734
2574 my $y = 0; 2735 my $y = 0;
2575 2736
2576 my $layout = $self->{layout};
2577
2578 $layout->set_font ($self->{font}) if $self->{font};
2579
2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583
2584 for my $par (@{$self->{par}}) { 2737 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 2738 my $h = $para->{h};
2586 2739
2587 if ($y0 < $y + $h && $y < $y1) { 2740 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] });
2589 $layout->set_width ($W - $par->[3]);
2590 $layout->set_markup ($par->[4]);
2591 2741
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my $layout = $self->get_layout ($para);
2593 2743
2594 glRasterPos $par->[3], $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 for (@w) {
2750 my ($dx, $dy) = splice @s, 0, 2, ();
2751
2752 $_->{x} = $dx + $para->{indent};
2753 $_->{y} = $dy + $y - $y0;
2754
2755 $_->draw;
2756 }
2757 }
2596 } 2758 }
2597 2759
2598 $y += $h; 2760 $y += $h;
2599 } 2761 }
2600
2601 glDisable GL_BLEND;
2602 }; 2762 };
2603 }); 2763 });
2604} 2764}
2605 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2606sub _draw { 2775sub _draw {
2607 my ($self) = @_; 2776 my ($self) = @_;
2608 2777
2609 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2614 2783
2615 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2616
2617} 2785}
2618 2786
2619############################################################################# 2787#############################################################################
2620 2788
2621package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 2878 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 2879 . "visible $widget->{visible}";
2712 } 2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2713 2884
2714 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2715 markup => $tooltip, 2886 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 2888 fontsize => 0.8,
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 2899
2729 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2730} 2901}
2731 2902
2732sub size_allocate { 2903sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2734 2905
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 2907}
2737 2908
2738sub visibility_change { 2909sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2740 2911
2741 return unless $visible; 2912 return unless $visible;
2742 2913
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2745 or return; 2916 or return;
2746 2917
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 2919
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 2921 if $x + $self->{w} > $self->{root}{w};
2751 2922
2752 $self->move_abs ($x, $y); 2923 $self->move_abs ($x, $y);
2753 }); 2924 });
2754} 2925}
2755 2926
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 3016
2846 if ($tex) { 3017 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2852 } 3023 }
2853} 3024}
2854 3025
2855sub DESTROY { 3026sub destroy {
2856 my ($self) = @_; 3027 my ($self) = @_;
2857 3028
2858 $self->{timer}->cancel 3029 $self->{timer}->cancel
2859 if $self->{timer}; 3030 if $self->{timer};
2860 3031
2861 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2862} 3033}
2863 3034
2864############################################################################# 3035#############################################################################
2865 3036
2866package CFClient::UI::Buttonbar; 3037package CFClient::UI::Buttonbar;
… …
2887 ); 3058 );
2888 3059
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2890 3061
2891 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2893 3064
2894 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2895 if (!ref $widget) { 3066 if (!ref $widget) {
3067 if ($widget =~ /\t/) {
3068 my ($left, $right) = split /\t/, $widget, 2;
3069
3070 $widget = new CFClient::UI::HBox
3071 can_hover => 1,
3072 can_events => 1,
3073 tooltip => $tooltip,
3074 children => [
3075 (new CFClient::UI::Label markup => $left, expand => 1),
3076 (new CFClient::UI::Label markup => $right, align => +1),
3077 ],
3078 ;
3079
3080 } else {
2896 $widget = new CFClient::UI::Label 3081 $widget = new CFClient::UI::Label
2897 can_hover => 1, 3082 can_hover => 1,
2898 can_events => 1, 3083 can_events => 1,
2899 text => $widget; 3084 markup => $widget,
3085 tooltip => $tooltip;
3086 }
2900 } 3087 }
2901 3088
2902 $self->{item}{$widget} = $item; 3089 $self->{item}{$widget} = $item;
2903 3090
2904 $self->{vbox}->add ($widget); 3091 $self->{vbox}->add ($widget);
… …
2909 3096
2910# popup given the event (must be a mouse button down event currently) 3097# popup given the event (must be a mouse button down event currently)
2911sub popup { 3098sub popup {
2912 my ($self, $ev) = @_; 3099 my ($self, $ev) = @_;
2913 3100
2914 $self->_emit ("popdown"); 3101 $self->emit ("popdown");
2915 3102
2916 # maybe save $GRAB? must be careful about events... 3103 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3104 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3105 $self->{button} = $ev->{button};
2919 3106
2920 $self->show; 3107 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3108 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3109}
2923 3110
2924sub mouse_motion { 3111sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2926 3113
2927 # TODO: should use vbox->find_widget or so 3114 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3115 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3116 $self->{hover} = $self->{item}{$HOVER};
2930 3117
2931 0 3118 0
2932} 3119}
2933 3120
2934sub button_up { 3121sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3122 my ($self, $ev, $x, $y) = @_;
2936 3123
2937 if ($ev->{button} == $self->{button}) { 3124 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3125 undef $GRAB;
2939 $self->hide; 3126 $self->hide;
2940 3127
2941 $self->_emit ("popdown"); 3128 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3129 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3130 } else {
2944 return 0 3131 return 0
2945 } 3132 }
2946 3133
… …
2973 3160
2974 $self->{current} = $self->{children}[0] 3161 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} }; 3162 if @{ $self->{children} };
2976} 3163}
2977 3164
3165sub get_current_page {
3166 my ($self) = @_;
3167
3168 $self->{current}
3169}
3170
2978sub set_current_page { 3171sub set_current_page {
2979 my ($self, $page_or_widget) = @_; 3172 my ($self, $page_or_widget) = @_;
2980 3173
2981 my $widget = ref $page_or_widget 3174 my $widget = ref $page_or_widget
2982 ? $page_or_widget 3175 ? $page_or_widget
2983 : $self->{children}[$page_or_widget]; 3176 : $self->{children}[$page_or_widget];
2984 3177
2985 $self->{current} = $widget; 3178 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3179 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3180
2988 $self->_emit (page_changed => $self->{current}); 3181 $self->emit (page_changed => $self->{current});
2989 3182
2990 $self->realloc; 3183 $self->realloc;
2991} 3184}
2992 3185
2993sub visible_children { 3186sub visible_children {
… …
2998 my ($self) = @_; 3191 my ($self) = @_;
2999 3192
3000 $self->{current}->size_request 3193 $self->{current}->size_request
3001} 3194}
3002 3195
3003sub size_allocate { 3196sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3197 my ($self, $w, $h) = @_;
3005 3198
3006 $self->{current}->configure (0, 0, $w, $h); 3199 $self->{current}->configure (0, 0, $w, $h);
3200
3201 1
3007} 3202}
3008 3203
3009sub _draw { 3204sub _draw {
3010 my ($self) = @_; 3205 my ($self) = @_;
3011 3206
… …
3022 my $class = shift; 3217 my $class = shift;
3023 3218
3024 my $self = $class->SUPER::new ( 3219 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3220 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3221 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3222 # filter => # will be put between multiplexer and $self
3027 @_, 3223 @_,
3028 ); 3224 );
3029 3225
3226 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3227 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3228
3032 $self 3229 $self
3033} 3230}
3034 3231
3035sub add { 3232sub add {
… …
3044 ); 3241 );
3045 3242
3046 $self->{multiplexer}->add ($widget); 3243 $self->{multiplexer}->add ($widget);
3047} 3244}
3048 3245
3246sub get_current_page {
3247 my ($self) = @_;
3248
3249 $self->{multiplexer}->get_current_page
3250}
3251
3049sub set_current_page { 3252sub set_current_page {
3050 my ($self, $page) = @_; 3253 my ($self, $page) = @_;
3051 3254
3052 $self->{multiplexer}->set_current_page ($page); 3255 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3256 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3257}
3055 3258
3056############################################################################# 3259#############################################################################
3057 3260
3058package CFClient::UI::Statusbox; 3261package CFClient::UI::Combobox;
3059 3262
3263use utf8;
3264
3060our @ISA = CFClient::UI::VBox::; 3265our @ISA = CFClient::UI::Button::;
3061 3266
3062sub new { 3267sub new {
3063 my $class = shift; 3268 my $class = shift;
3064 3269
3065 $class->SUPER::new ( 3270 my $self = $class->SUPER::new (
3271 options => [], # [value, title, longdesc], ...
3272 value => undef,
3273 @_,
3274 );
3275
3276 $self->_set_value ($self->{value});
3277
3278 $self
3279}
3280
3281sub invoke_button_down {
3282 my ($self, $ev) = @_;
3283
3284 my @menu_items;
3285
3286 for (@{ $self->{options} }) {
3287 my ($value, $title, $tooltip) = @$_;
3288
3289 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3290 }
3291
3292 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3293}
3294
3295sub _set_value {
3296 my ($self, $value) = @_;
3297
3298 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3299 or return;
3300
3301 $self->{value} = $item->[0];
3302 $self->set_markup ("$item->[1] ⇓");
3303 $self->set_tooltip ($item->[2]);
3304}
3305
3306sub set_value {
3307 my ($self, $value) = @_;
3308
3309 return unless $self->{value} ne $value;
3310
3311 $self->_set_value ($value);
3312 $self->emit (changed => $value);
3313}
3314
3315#############################################################################
3316
3317package CFClient::UI::Statusbox;
3318
3319our @ISA = CFClient::UI::VBox::;
3320
3321sub new {
3322 my $class = shift;
3323
3324 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3325 fontsize => 0.8,
3067 @_, 3326 @_,
3068 ) 3327 );
3328
3329 Scalar::Util::weaken (my $this = $self);
3330
3331 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3332
3333 $self
3069} 3334}
3070 3335
3071sub reorder { 3336sub reorder {
3072 my ($self) = @_; 3337 my ($self) = @_;
3073 my $NOW = time; 3338 my $NOW = Time::HiRes::time;
3339
3340 # freeze display when hovering over any label
3341 return if $CFClient::UI::TOOLTIP->{owner}
3342 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3343 values %{ $self->{item} };
3074 3344
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3345 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3346 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3347 }
3078 3348
… …
3081 my @items = sort { 3351 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3352 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3353 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3354 } values %{ $self->{item} };
3085 3355
3356 $self->{timer}->interval (1);
3357
3086 my $count = 10 + 1; 3358 my $count = 10 + 1;
3087 for my $item (@items) { 3359 for my $item (@items) {
3088 last unless --$count; 3360 last unless --$count;
3089 3361
3090 push @widgets, $item->{label} ||= do { 3362 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3363 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3364 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3365 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3366 : $item->{text};
3095 3367
… …
3103 tooltip => $item->{tooltip}, 3375 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3376 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3377 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3378 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3379 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3380 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3381 can_events => 1,
3110 can_hover => 1 3382 can_hover => 1
3111 }; 3383 };
3384
3385 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3386 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3387 $label->update;
3388 $label->set_max_size (undef, $label->{req_h} * $diff)
3389 if $diff < 1;
3390 $self->{timer}->interval (1/30);
3391 } else {
3392 $label->{fg}[3] = $item->{fg}[3] || 1;
3393 }
3394
3395 push @widgets, $label;
3112 } 3396 }
3113 3397
3114 $self->clear; 3398 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3399 $self->SUPER::add (reverse @widgets);
3116} 3400}
… …
3121 $text =~ s/^\s+//; 3405 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3406 $text =~ s/\s+$//;
3123 3407
3124 return unless $text; 3408 return unless $text;
3125 3409
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3410 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3411
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3412 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3413
3130 if (my $item = $self->{item}{$group}) { 3414 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3415 if ($item->{text} eq $text) {
3132 $item->{count}++; 3416 $item->{count}++;
3133 } else { 3417 } else {
3134 $item->{count} = 1; 3418 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3419 $item->{text} = $item->{tooltip} = $text;
3136 } 3420 }
3137 $item->{id} = ++$self->{id}; 3421 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3422 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3423 delete $item->{label};
3140 } else { 3424 } else {
3141 $self->{item}{$group} = { 3425 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3426 id => ++$self->{id},
… …
3148 count => 1, 3432 count => 1,
3149 %arg, 3433 %arg,
3150 }; 3434 };
3151 } 3435 }
3152 3436
3437 $ROOT->on_refresh (reorder => sub {
3153 $self->reorder; 3438 $self->reorder;
3439 });
3154} 3440}
3155 3441
3156sub reconfigure { 3442sub reconfigure {
3157 my ($self) = @_; 3443 my ($self) = @_;
3158 3444
… …
3161 3447
3162 $self->reorder; 3448 $self->reorder;
3163 $self->SUPER::reconfigure; 3449 $self->SUPER::reconfigure;
3164} 3450}
3165 3451
3452sub destroy {
3453 my ($self) = @_;
3454
3455 $self->{timer}->cancel;
3456
3457 $self->SUPER::destroy;
3458}
3459
3166############################################################################# 3460#############################################################################
3167 3461
3168package CFClient::UI::Inventory; 3462package CFClient::UI::Inventory;
3169 3463
3170our @ISA = CFClient::UI::ScrolledWindow::; 3464our @ISA = CFClient::UI::Table::;
3171 3465
3172sub new { 3466sub new {
3173 my $class = shift; 3467 my $class = shift;
3174 3468
3175 my $self = $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3470 col_expand => [0, 1, 0],
3177 @_, 3471 @_,
3178 ); 3472 );
3179 3473
3180 $self 3474 $self
3181} 3475}
3182 3476
3183sub set_items { 3477sub set_items {
3184 my ($self, $items) = @_; 3478 my ($self, $items) = @_;
3185 3479
3186 $self->{scrolled}->clear; 3480 $self->clear;
3187 return unless $items; 3481 return unless $items;
3188 3482
3189 my @items = sort { 3483 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3484 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3485 or ($a->{name} cmp $b->{name})
3192 } @$items; 3486 } values %$items;
3193 3487
3194 $self->{real_items} = \@items; 3488 $self->{real_items} = \@items;
3195 3489
3196 my $row = 0; 3490 my $row = 0;
3197 for my $item (@items) { 3491 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3492 CFClient::Item::update_widgets $item;
3199 3493
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3494 $self->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3495 $self->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3496 $self->add (2, $row, $item->{weight_widget});
3203 3497
3204 $row++; 3498 $row++;
3205 } 3499 }
3206} 3500}
3207 3501
3208############################################################################# 3502#############################################################################
3209 3503
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList; 3504package CFClient::UI::SpellList;
3408 3505
3409our @ISA = CFClient::UI::ScrolledWindow::; 3506our @ISA = CFClient::UI::Table::;
3410 3507
3411sub new { 3508sub new {
3412 my $class = shift; 3509 my $class = shift;
3413 3510
3414 my $self = $class->SUPER::new ( 3511 my $self = $class->SUPER::new (
3415 binding => [], 3512 binding => [],
3416 commands => [], 3513 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3514 @_,
3419 ) 3515 )
3420} 3516}
3421 3517
3422# XXX: Do sorting? Argl... 3518my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3519
3520my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3521 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3522my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3523 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3524my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3525 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3526my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3527 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3528my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3529 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3530
3531sub rebuild_spell_list {
3532 my ($self) = @_;
3533
3534 $CFClient::UI::ROOT->on_refresh ($self => sub {
3535 $self->clear;
3536
3537 return unless $::CONN;
3538
3539 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3540 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3541 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3542 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3543 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3544
3545 my $row = 0;
3546
3547 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3548 my $spell = $self->{spell}{$_};
3549
3550 $row++;
3551
3552 my $spell_cb = sub {
3553 my ($widget, $ev) = @_;
3554
3555 if ($ev->{button} == 1) {
3556 $::CONN->user_send ("cast $spell->{name}");
3557 } elsif ($ev->{button} == 2) {
3558 $::CONN->user_send ("invoke $spell->{name}");
3559 } elsif ($ev->{button} == 3) {
3560 (new CFClient::UI::Menu
3561 items => [
3562 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3563 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3564 ],
3565 )->popup ($ev);
3566 } else {
3567 return 0;
3568 }
3569
3570 1
3571 };
3572
3573 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3574
3575 #TODO: add path info to tooltip
3576 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3577
3578 $self->add (0, $row, new CFClient::UI::Face
3579 face => $spell->{face},
3580 can_hover => 1,
3581 can_events => 1,
3582 tooltip => $tooltip,
3583 on_button_down => $spell_cb,
3584 );
3585
3586 $self->add (1, $row, new CFClient::UI::Label
3587 expand => 1,
3588 text => $spell->{name},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3598 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3599 }
3600 });
3601}
3602
3423sub add_spell { 3603sub add_spell {
3424 my ($self, $spell) = @_; 3604 my ($self, $spell) = @_;
3605
3425 $self->{spells}->{$spell->{name}} = $spell; 3606 $self->{spell}->{$spell->{name}} = $spell;
3426 3607 $self->rebuild_spell_list;
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454} 3608}
3455 3609
3456sub remove_spell { 3610sub remove_spell {
3457 my ($self, $spell) = @_; 3611 my ($self, $spell) = @_;
3612
3458 delete $self->{spells}->{$spell->{name}}; 3613 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3614 $self->rebuild_spell_list;
3460} 3615}
3461 3616
3617sub clear_spells {
3618 my ($self) = @_;
3619
3620 $self->{spell} = {};
3621 $self->rebuild_spell_list;
3622}
3623
3462############################################################################# 3624#############################################################################
3463 3625
3464package CFClient::UI::Root; 3626package CFClient::UI::Root;
3465 3627
3466our @ISA = CFClient::UI::Container::; 3628our @ISA = CFClient::UI::Container::;
3629
3630use List::Util qw(min max);
3467 3631
3468use CFClient::OpenGL; 3632use CFClient::OpenGL;
3469 3633
3470sub new { 3634sub new {
3471 my $class = shift; 3635 my $class = shift;
… …
3498 $coord = $max - $size if $coord > $max - $size; 3662 $coord = $max - $size if $coord > $max - $size;
3499 3663
3500 int $coord + 0.5 3664 int $coord + 0.5
3501} 3665}
3502 3666
3503sub size_allocate { 3667sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3668 my ($self, $w, $h) = @_;
3505 3669
3506 for my $child ($self->children) { 3670 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3671 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3672
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3676 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3677 $Y = _to_pixel $Y, $H, $self->{h};
3514 3678
3515 $child->configure ($X, $Y, $W, $H); 3679 $child->configure ($X, $Y, $W, $H);
3516 } 3680 }
3681
3682 1
3517} 3683}
3518 3684
3519sub coord2local { 3685sub coord2local {
3520 my ($self, $x, $y) = @_; 3686 my ($self, $x, $y) = @_;
3521 3687
… …
3606 3772
3607 delete $queue{$widget+0}; 3773 delete $queue{$widget+0};
3608 3774
3609 my ($w, $h) = $widget->size_request; 3775 my ($w, $h) = $widget->size_request;
3610 3776
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3777 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3778 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3779
3780 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3781 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3782
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3783 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3784 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3785
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3786 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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