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.329 by root, Sun Jul 23 02:44:06 2006 UTC

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

Diff Legend

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