ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.312 by root, Fri Jun 23 23:54:30 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
383} 390}
384 391
385sub set_tooltip { 392sub set_tooltip {
386 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
387 394
… …
392 399
393 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
394 401
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 405 }
399} 406}
400 407
401# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
402sub coord2local { 409sub coord2local {
… …
410 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
411 418
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 420}
414 421
415sub focus_in { 422sub invoke_focus_in {
416 my ($self) = @_; 423 my ($self) = @_;
417 424
418 return if $FOCUS == $self; 425 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
420 427
421 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
422 429
423 $self->_emit (focus_in => $focus);
424
425 $focus->update if $focus; 430 $focus->update if $focus;
426 $FOCUS->update; 431 $FOCUS->update;
427}
428 432
433 0
434}
435
429sub focus_out { 436sub invoke_focus_out {
430 my ($self) = @_; 437 my ($self) = @_;
431 438
432 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
433 440
434 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
435 442
436 $self->_emit (focus_out => $focus);
437
438 $focus->update if $focus; #? 443 $focus->update if $focus; #?
439 444
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 446 unless $FOCUS;
442}
443 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
444sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
445sub button_up { 0 } 458sub invoke_button_up { 1 }
446sub key_down { 0 } 459sub invoke_key_down { 1 }
447sub key_up { 0 } 460sub invoke_key_up { 1 }
448 461
449sub button_down { 462sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
451 464
452 $self->focus_in; 465 $self->grab_focus;
453 466
454 0 467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
455} 483}
456 484
457sub find_widget { 485sub find_widget {
458 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
459 487
… …
469sub set_parent { 497sub set_parent {
470 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
471 499
472 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497} 502}
498 503
499sub realloc { 504sub realloc {
500 my ($self) = @_; 505 my ($self) = @_;
501 506
… …
534 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
535 540
536 # update screen rectangle 541 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541 544
542 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 548
546 glPushMatrix; 549 glPushMatrix;
547 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
548 $self->_draw;
549 glPopMatrix;
550 551
551 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
552 my ($x, $y) = @$self{qw(x y)};
553
554 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
555 glEnable GL_BLEND; 554 glEnable GL_BLEND;
556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
557 glBegin GL_QUADS; 556 glBegin GL_QUADS;
558 glVertex $x , $y; 557 glVertex 0 , 0;
559 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
560 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
561 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
562 glEnd; 561 glEnd;
563 glDisable GL_BLEND; 562 glDisable GL_BLEND;
564 } 563 }
565 564
566 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
567 glPushMatrix; 566 glPushMatrix;
568 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
570 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
571 glVertex 0 , 0; 570 glVertex 0 , 0;
572 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
573 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
574 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
575 glEnd; 574 glEnd;
576 glPopMatrix; 575 glPopMatrix;
577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
578 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
579} 581}
580 582
581sub _draw { 583sub _draw {
582 my ($self) = @_; 584 my ($self) = @_;
583 585
… …
586 588
587sub DESTROY { 589sub DESTROY {
588 my ($self) = @_; 590 my ($self) = @_;
589 591
590 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
591 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
592} 596}
593 597
594############################################################################# 598#############################################################################
595 599
596package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
621 625
622 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
623 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
624 628
625 glEnable GL_BLEND; 629 glEnable GL_BLEND;
626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
627 glColor @$color; 631 glColor_premultiply @$color;
628 632
629 glBegin GL_QUADS; 633 glBegin GL_QUADS;
630 glVertex 0 , 0; 634 glVertex 0 , 0;
631 glVertex 0 , $h; 635 glVertex 0 , $h;
632 glVertex $w, $h; 636 glVertex $w, $h;
… …
663our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
664 668
665sub new { 669sub new {
666 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
667 671
668 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
669 673
670 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
671 children => [], 675 children => [],
672 can_events => 0, 676 can_events => 0,
673 %arg, 677 %arg,
674 ); 678 );
679
675 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
676 682
677 $self 683 $self
678} 684}
679 685
680sub add { 686sub add {
… …
728 $x -= $self->{x}; 734 $x -= $self->{x};
729 $y -= $self->{y}; 735 $y -= $self->{y};
730 736
731 my $res; 737 my $res;
732 738
733 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
734 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
735 and return $res; 741 and return $res;
736 } 742 }
737 743
738 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
759} 765}
760 766
761sub add { 767sub add {
762 my ($self, $child) = @_; 768 my ($self, $child) = @_;
763 769
764 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
765
766 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
767} 772}
768 773
769sub remove { 774sub remove {
770 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
779 784
780sub size_request { 785sub size_request {
781 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
782} 787}
783 788
784sub size_allocate { 789sub invoke_size_allocate {
785 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
786 791
787 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
788} 795}
789 796
790############################################################################# 797#############################################################################
798
799# back-buffered drawing area
791 800
792package CFClient::UI::Window; 801package CFClient::UI::Window;
793 802
794our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
795 804
… …
806 815
807 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
808 $self->SUPER::update; 817 $self->SUPER::update;
809} 818}
810 819
811sub size_allocate { 820sub invoke_size_allocate {
812 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
813 822
814 $self->SUPER::size_allocate ($w, $h);
815 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
816} 826}
817 827
818sub _render { 828sub _render {
819 my ($self) = @_; 829 my ($self) = @_;
820 830
… …
847 my $tex = $self->{texture} 857 my $tex = $self->{texture}
848 or return; 858 or return;
849 859
850 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
852 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
853 863
854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
855 865
856 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
857} 867}
… …
881 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
882 892
883 ($w, $h) 893 ($w, $h)
884} 894}
885 895
886sub size_allocate { 896sub invoke_size_allocate {
887 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
888 898
889 my $child = $self->child; 899 my $child = $self->child;
890 900
891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
893 903
894 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
895 $self->update; 905 $self->update;
906
907 1
896} 908}
897 909
898sub set_offset { 910sub set_offset {
899 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
900 912
… …
948package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
949 961
950our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
951 963
952sub new { 964sub new {
953 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
954 968
955 my $self; 969 my $self;
956 970
957 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
958 vertical => 1, 972 vertical => 1,
… …
963 ; 977 ;
964 978
965 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
966 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
967 slider => $slider, 981 slider => $slider,
968 @_, 982 %arg,
969 ); 983 );
970 984
971 $self->{vp}->add ($self->{scrolled});
972 $self->add ($self->{vp});
973 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
974 987
975 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
976} 995}
977 996
978sub update { 997sub update {
979 my ($self) = @_; 998 my ($self) = @_;
980 999
… …
983 # todo: overwrite size_allocate of child 1002 # todo: overwrite size_allocate of child
984 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
985 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
986} 1005}
987 1006
988sub size_allocate { 1007sub invoke_size_allocate {
989 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
990
991 $self->SUPER::size_allocate ($w, $h);
992 1009
993 my $child = $self->{vp}->child; 1010 my $child = $self->{vp}->child;
994 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
995} 1014}
996 1015
997#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
998# update viewport offset on scroll 1017# update viewport offset on scroll
999 1018
… …
1019 1038
1020 if ($self->{bg}) { 1039 if ($self->{bg}) {
1021 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
1022 1041
1023 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
1024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1025 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
1026 1045
1027 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1028 glVertex 0 , 0; 1047 glVertex 0 , 0;
1029 glVertex 0 , $h; 1048 glVertex 0 , $h;
1030 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1053 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1055 1074
1056sub new { 1075sub new {
1057 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1058
1059 my $title = delete $arg{title};
1060 1077
1061 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1062 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1063 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1064 border => 0.6, 1081 border => 0.6,
… …
1066 min_w => 16, 1083 min_w => 16,
1067 min_h => 16, 1084 min_h => 16,
1068 %arg, 1085 %arg,
1069 ); 1086 );
1070 1087
1071 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1072 align => 0, 1089 align => 0,
1073 valign => 1, 1090 valign => 1,
1074 text => $title, 1091 text => $self->{title},
1075 fontsize => $self->{border} 1092 fontsize => $self->{border},
1076 if defined $title; 1093 if exists $self->{title};
1094
1095 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
1077 1103
1078 $self 1104 $self
1079} 1105}
1080 1106
1081sub add { 1107sub add {
1082 my ($self, @widgets) = @_; 1108 my ($self, @widgets) = @_;
1083 1109
1084 $self->SUPER::add (@widgets); 1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1086} 1113}
1087 1114
1088sub border { 1115sub border {
1089 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1090} 1117}
1091 1118
1092sub size_request { 1119sub size_request {
1093 my ($self) = @_; 1120 my ($self) = @_;
1094 1121
1095 $self->{title}->size_request 1122 $self->{title_widget}->size_request
1096 if $self->{title}; 1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
1097 1127
1098 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1099 1129
1100 ( 1130 (
1101 $w + $self->border * 2, 1131 $w + $self->border * 2,
1102 $h + $self->border * 2, 1132 $h + $self->border * 2,
1103 ) 1133 )
1104} 1134}
1105 1135
1106sub size_allocate { 1136sub invoke_size_allocate {
1107 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1108 1138
1109 if ($self->{title}) { 1139 if ($self->{title_widget}) {
1110 $self->{title}{w} = $w; 1140 $self->{title_widget}{w} = $w;
1111 $self->{title}{h} = $h; 1141 $self->{title_widget}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h); 1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1113 } 1143 }
1114 1144
1115 my $border = $self->border; 1145 my $border = $self->border;
1116 1146
1117 $h -= List::Util::max 0, $border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1118 $w -= List::Util::max 0, $border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1119 1149
1120 $self->child->configure ($border, $border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1121}
1122 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
1123sub button_down { 1158sub invoke_button_down {
1124 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1125 1160
1126 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
1127 my $border = $self->border; 1162 my $border = $self->border;
1128 1163
… …
1144 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
1145 1180
1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148 1183
1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 $self->realloc; 1185 $self->realloc;
1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1151 }; 1186 };
1152 1187
1153 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
1154 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1155 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1158 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
1159 1194
1160 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1161 1196
1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1198 # HACK: the next line is required to enforce placement
1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1163 }; 1200 };
1164 } else { 1201 } else {
1165 return 0; 1202 return 0;
1166 } 1203 }
1167 1204
1168 1 1205 1
1169} 1206}
1170 1207
1171sub button_up { 1208sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1173 1210
1174 !!delete $self->{motion} 1211 ! ! delete $self->{motion}
1175} 1212}
1176 1213
1177sub mouse_motion { 1214sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1179 1216
1180 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181 1218
1182 !!$self->{motion} 1219 ! ! $self->{motion}
1183} 1220}
1184 1221
1185sub _draw { 1222sub _draw {
1186 my ($self) = @_; 1223 my ($self) = @_;
1187 1224
… …
1213 1250
1214 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1215 1252
1216 $child->draw; 1253 $child->draw;
1217 1254
1218 if ($self->{title}) { 1255 if ($self->{title_widget}) {
1219 glTranslate 0, $border - $self->{h}; 1256 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw; 1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1221 } 1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
1222} 1264}
1223 1265
1224############################################################################# 1266#############################################################################
1225 1267
1226package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1249 1291
1250 $child->set_parent ($self); 1292 $child->set_parent ($self);
1251 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1252 1294
1253 $self->realloc; 1295 $self->realloc;
1296}
1297
1298sub remove {
1299 my ($self, $child) = @_;
1300
1301 # TODO: not yet implemented
1254} 1302}
1255 1303
1256# TODO: move to container class maybe? send children a signal on removal? 1304# TODO: move to container class maybe? send children a signal on removal?
1257sub clear { 1305sub clear {
1258 my ($self) = @_; 1306 my ($self) = @_;
… …
1299 (sum @$ws), 1347 (sum @$ws),
1300 (sum @$hs), 1348 (sum @$hs),
1301 ) 1349 )
1302} 1350}
1303 1351
1304sub size_allocate { 1352sub invoke_size_allocate {
1305 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1306 1354
1307 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1308 1356
1309 my $req_w = (sum @$ws) || 1; 1357 my $req_w = (sum @$ws) || 1;
… …
1341 } 1389 }
1342 1390
1343 $y += $row_h; 1391 $y += $row_h;
1344 } 1392 }
1345 1393
1394 1
1346} 1395}
1347 1396
1348sub find_widget { 1397sub find_widget {
1349 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1350 1399
… …
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 ) 1438 )
1390} 1439}
1391 1440
1392sub size_allocate { 1441sub invoke_size_allocate {
1393 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1394 1443
1395 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1396 my $children = $self->{children}; 1445 my @children = $self->visible_children;
1397 1446
1398 my @req; 1447 my @req;
1399 1448
1400 if ($self->{homogeneous}) { 1449 if ($self->{homogeneous}) {
1401 @req = ($space / (@$children || 1)) x @$children; 1450 @req = ($space / (@children || 1)) x @children;
1402 } else { 1451 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1404 my $req = List::Util::sum @req; 1453 my $req = List::Util::sum @req;
1405 1454
1406 if ($req > $space) { 1455 if ($req > $space) {
1407 # ah well, not enough space 1456 # ah well, not enough space
1408 $_ *= $space / $req for @req; 1457 $_ *= $space / $req for @req;
1409 } else { 1458 } else {
1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1411 1460
1412 $space = ($space - $req) / $expand; # remaining space to give away 1461 $space = ($space - $req) / $expand; # remaining space to give away
1413 1462
1414 $req[$_] += $space * $children->[$_]{expand} 1463 $req[$_] += $space * $children[$_]{expand}
1415 for 0 .. $#$children; 1464 for 0 .. $#children;
1416 } 1465 }
1417 } 1466 }
1418 1467
1419 CFClient::UI::harmonize \@req; 1468 CFClient::UI::harmonize \@req;
1420 1469
1421 my $pos = 0; 1470 my $pos = 0;
1422 for (0 .. $#$children) { 1471 for (0 .. $#children) {
1423 my $alloc = $req[$_]; 1472 my $alloc = $req[$_];
1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1425 1474
1426 $pos += $alloc; 1475 $pos += $alloc;
1427 } 1476 }
1428 1477
1429 1 1478 1
… …
1519 1568
1520 delete $self->{texture}; 1569 delete $self->{texture};
1521 $self->SUPER::update; 1570 $self->SUPER::update;
1522} 1571}
1523 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1524sub set_text { 1580sub set_text {
1525 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1526 1582
1527 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1528 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1529 1585
1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1531 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1532 1588
1589 delete $self->{size_req};
1533 $self->realloc; 1590 $self->realloc;
1534 $self->update; 1591 $self->update;
1535} 1592}
1536 1593
1537sub set_markup { 1594sub set_markup {
… …
1543 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1544 1601
1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1546 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1547 1604
1605 delete $self->{size_req};
1548 $self->realloc; 1606 $self->realloc;
1549 $self->update; 1607 $self->update;
1550} 1608}
1551 1609
1552sub size_request { 1610sub size_request {
1553 my ($self) = @_; 1611 my ($self) = @_;
1554 1612
1613 $self->{size_req} ||= do {
1555 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1556 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1557 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1558 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1560 1619
1561 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1562 1621
1563 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1564 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1565 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1625
1567 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1568 1627
1569 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1570 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1571 } 1633 };
1572 1634
1573 ($w, $h) 1635 @{ $self->{size_req} }
1574} 1636}
1575 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1576sub size_allocate { 1642sub invoke_size_allocate {
1577 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1578 1644
1579 delete $self->{ox}; 1645 delete $self->{ox};
1580 1646
1581 delete $self->{texture} 1647 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1583} 1651}
1584 1652
1585sub set_fontsize { 1653sub set_fontsize {
1586 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1587 1655
1588 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1589 delete $self->{texture}; 1657 delete $self->{texture};
1590 1658
1591 $self->realloc; 1659 $self->realloc;
1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1592} 1668}
1593 1669
1594sub _draw { 1670sub _draw {
1595 my ($self) = @_; 1671 my ($self) = @_;
1596 1672
… …
1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1617 : ($self->{h} - $tex->{h}) * 0.5); 1693 : ($self->{h} - $tex->{h}) * 0.5);
1618 }; 1694 };
1619 1695
1620 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1622 1700
1623 if ($tex->{format} == GL_ALPHA) { 1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1624 glColor @{$self->{fg}}; 1703 glColor @{$self->{fg}};
1625 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1626 } else { 1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1627 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1628 } 1708 }
1629 1709
1630 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1631} 1711}
1632 1712
… …
1649 can_hover => 1, 1729 can_hover => 1,
1650 can_focus => 1, 1730 can_focus => 1,
1651 valign => 0, 1731 valign => 0,
1652 can_events => 1, 1732 can_events => 1,
1653 #text => ... 1733 #text => ...
1734 #hidden => "*",
1654 @_ 1735 @_
1655 ) 1736 )
1656} 1737}
1657 1738
1658sub _set_text { 1739sub _set_text {
… …
1660 1741
1661 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1662 1743
1663 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1664 1745
1665 delete $self->{texture};
1666
1667 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1668 $self->{text} = $text; 1747 $self->{text} = $text;
1669 1748
1670 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1671 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1672 1752
1673 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1674} 1757}
1675 1758
1676sub set_text { 1759sub set_text {
1677 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1678 1761
1679 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1680 $self->_set_text ($text); 1763 $self->_set_text ($text);
1681
1682 $self->realloc;
1683} 1764}
1684 1765
1685sub get_text { 1766sub get_text {
1686 $_[0]{text} 1767 $_[0]{text}
1687} 1768}
… …
1692 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1693 1774
1694 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1695} 1776}
1696 1777
1697sub key_down { 1778sub invoke_key_down {
1698 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1699 1780
1700 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1701 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1702 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1714 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1715 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1716 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1717 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1718 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1719 $self->_emit ('escape'); 1800 $self->emit ('escape');
1720 } elsif ($uni) { 1801 } elsif ($uni) {
1721 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else { 1803 } else {
1723 return 0; 1804 return 0;
1724 } 1805 }
… …
1728 $self->realloc; 1809 $self->realloc;
1729 1810
1730 1 1811 1
1731} 1812}
1732 1813
1733sub focus_in { 1814sub invoke_focus_in {
1734 my ($self) = @_; 1815 my ($self) = @_;
1735 1816
1736 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1737 1818
1738 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1739} 1820}
1740 1821
1741sub button_down { 1822sub invoke_button_down {
1742 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1743 1824
1744 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1745 1826
1746 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1747 1828
1748 # byte-index to char-index 1829 # byte-index to char-index
1749 my $text = $self->{text}; 1830 my $text = $self->{text};
… …
1754 $self->update; 1835 $self->update;
1755 1836
1756 1 1837 1
1757} 1838}
1758 1839
1759sub mouse_motion { 1840sub invoke_mouse_motion {
1760 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762 1843
1763 0 1844 1
1764} 1845}
1765 1846
1766sub _draw { 1847sub _draw {
1767 my ($self) = @_; 1848 my ($self) = @_;
1768 1849
1769 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1770 1851
1771 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1772 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1773 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1774 } else { 1855 } else {
1775 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1776 } 1857 }
1777 1858
1778 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1779 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1780 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1781 glVertex 0 , 0; 1862 glVertex 0 , 0;
1782 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1783 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1784 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1809 1890
1810our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1811 1892
1812use CFClient::OpenGL; 1893use CFClient::OpenGL;
1813 1894
1814sub key_down { 1895sub invoke_key_down {
1815 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1816 1897
1817 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1818 1899
1819 if ($sym == 13) { 1900 if ($sym == 13) {
1820 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1821 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1822 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1823 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1824 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1825 $self->update; 1907 $self->update;
1826 1908
1827 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1828 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1829 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1845 } else { 1927 } else {
1846 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1847 } 1929 }
1848 1930
1849 } else { 1931 } else {
1850 return $self->SUPER::key_down ($ev) 1932 return $self->SUPER::invoke_key_down ($ev)
1851 } 1933 }
1852 1934
1853 1 1935 1
1854} 1936}
1855 1937
… …
1879 can_events => 1, 1961 can_events => 1,
1880 @_ 1962 @_
1881 ) 1963 )
1882} 1964}
1883 1965
1884sub activate { }
1885
1886sub button_up { 1966sub invoke_button_up {
1887 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1888 1968
1889 $self->emit ("activate") 1969 $self->emit ("activate")
1890 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1891 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
… …
1894} 1974}
1895 1975
1896sub _draw { 1976sub _draw {
1897 my ($self) = @_; 1977 my ($self) = @_;
1898 1978
1899 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1900
1901 if ($GRAB == $self) {
1902 $self->{fg} = $self->{active_fg};
1903 }
1904 1980
1905 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1908 1984
1909 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1910 1986
1911 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1912 1988
1913 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1914} 2026}
1915 2027
1916############################################################################# 2028#############################################################################
1917 2029
1918package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1945 my ($self) = @_; 2057 my ($self) = @_;
1946 2058
1947 (6) x 2 2059 (6) x 2
1948} 2060}
1949 2061
1950sub button_down { 2062sub invoke_button_down {
1951 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1952 2064
1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1955 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1956 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
1957 } else { 2069 } else {
1958 return 0 2070 return 0
1959 } 2071 }
1960 2072
1961 1 2073 1
… …
1986package CFClient::UI::Image; 2098package CFClient::UI::Image;
1987 2099
1988our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1989 2101
1990use CFClient::OpenGL; 2102use CFClient::OpenGL;
1991use Carp qw/confess/;
1992 2103
1993our %loaded_images; 2104our %texture_cache;
1994 2105
1995sub new { 2106sub new {
1996 my $class = shift; 2107 my $class = shift;
1997 2108
1998 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1999 2113
2000 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2001 2116
2002 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2003 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2004 2119
2005 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2006 2121
2007 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2008
2009 $self->{aspect} = $tex->{w} / $tex->{h};
2010 2123
2011 $self 2124 $self
2012} 2125}
2013 2126
2014sub size_request { 2127sub size_request {
2015 my ($self) = @_; 2128 my ($self) = @_;
2016 2129
2017 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
2018} 2131}
2019 2132
2020sub _draw { 2133sub _draw {
2021 my ($self) = @_; 2134 my ($self) = @_;
2022 2135
… …
2133 2246
2134 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
2135 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
2136 2249
2137 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
2138 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2139 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
2140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141 2255
2142 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
2143 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2257 $self->update; 2371 $self->update;
2258 2372
2259 $self 2373 $self
2260} 2374}
2261 2375
2262sub changed { }
2263
2264sub set_range { 2376sub set_range {
2265 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2266 2378
2267 ($range, $self->{range}) = ($self->{range}, $range); 2379 ($range, $self->{range}) = ($self->{range}, $range);
2268 2380
2269 $self->update
2270 if "@$range" ne "@{$self->{range}}"; 2381 if ("@$range" ne "@{$self->{range}}") {
2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2271} 2385}
2272 2386
2273sub set_value { 2387sub set_value {
2274 my ($self, $value) = @_; 2388 my ($self, $value) = @_;
2275 2389
… …
2286 if $unit; 2400 if $unit;
2287 2401
2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2289 2403
2290 if ($value != $old_value) { 2404 if ($value != $old_value) {
2291 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2292 $self->update; 2406 $self->update;
2293 } 2407 }
2294} 2408}
2295 2409
2296sub size_request { 2410sub size_request {
2297 my ($self) = @_; 2411 my ($self) = @_;
2298 2412
2299 ($self->{req_w}, $self->{req_h}) 2413 ($self->{req_w}, $self->{req_h})
2300} 2414}
2301 2415
2302sub button_down { 2416sub invoke_button_down {
2303 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2304 2418
2305 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2306 2420
2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2308 2422
2309 $self->mouse_motion ($ev, $x, $y) 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2310} 2424}
2311 2425
2312sub mouse_motion { 2426sub invoke_mouse_motion {
2313 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2314 2428
2315 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2316 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2317 2431
… …
2328} 2442}
2329 2443
2330sub update { 2444sub update {
2331 my ($self) = @_; 2445 my ($self) = @_;
2332 2446
2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2447 delete $self->{knob_w};
2448 $self->SUPER::update;
2449}
2450
2451sub _draw {
2452 my ($self) = @_;
2453
2454 unless ($self->{knob_w}) {
2334 $self->set_value ($self->{range}[0]); 2455 $self->set_value ($self->{range}[0]);
2335 2456
2336 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100; 2458 my $range = ($hi - $page - $lo) || 1e-100;
2338 2459
… …
2344 $value = ($value - $lo) / $range; 2465 $value = ($value - $lo) / $range;
2345 $value = $value * $self->{scale} + $self->{offset}; 2466 $value = $value * $self->{scale} + $self->{offset};
2346 2467
2347 $self->{knob_x} = $value - $knob_w * 0.5; 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2348 $self->{knob_w} = $knob_w; 2469 $self->{knob_w} = $knob_w;
2349 }); 2470 }
2350
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356 2471
2357 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2358 2473
2359 glScale $self->{w}, $self->{h}; 2474 glScale $self->{w}, $self->{h};
2360 2475
… …
2421sub set_range { shift->{slider}->set_range (@_) } 2536sub set_range { shift->{slider}->set_range (@_) }
2422sub set_value { shift->{slider}->set_value (@_) } 2537sub set_value { shift->{slider}->set_value (@_) }
2423 2538
2424############################################################################# 2539#############################################################################
2425 2540
2426package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2427 2542
2428our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2429 2544
2430use CFClient::OpenGL; 2545use CFClient::OpenGL;
2431 2546
… …
2433 my $class = shift; 2548 my $class = shift;
2434 2549
2435 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2436 fontsize => 1, 2551 fontsize => 1,
2437 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2438 #font => default_font 2554 #font => default_font
2439 @_, 2555 @_,
2440 2556
2441 layout => (new CFClient::Layout 1), 2557 layout => (new CFClient::Layout 1),
2442 par => [], 2558 par => [],
… …
2457 2573
2458 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2459 $self->reflow; 2575 $self->reflow;
2460} 2576}
2461 2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2462sub size_allocate { 2587sub invoke_size_allocate {
2463 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2464 2589
2465 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2466 2592
2467 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2468 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2469 $self->{layout}->set_width ($self->{children}[0]{w}); 2595 $self->{layout}->set_width ($empty->{w});
2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2470 2597
2471 $self->reflow; 2598 $self->reflow;
2472}
2473 2599
2474sub text_size { 2600 local $self->{children} = [$empty, $slider];
2475 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2476 2606
2477 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2478 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $layout->set_width ($self->{children}[0]{w} - $indent); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2481 $layout->set_markup ($text); 2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2482 2620 );
2621
2483 $layout->size 2622 $layout
2484} 2623}
2485 2624
2486sub reflow { 2625sub reflow {
2487 my ($self) = @_; 2626 my ($self) = @_;
2488 2627
… …
2497 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2498} 2637}
2499 2638
2500sub clear { 2639sub clear {
2501 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2502 2644
2503 $self->{par} = []; 2645 $self->{par} = [];
2504 $self->{height} = 0; 2646 $self->{height} = 0;
2505 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2506} 2648}
2507 2649
2508sub add_paragraph { 2650sub add_paragraph {
2509 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2510 2652
2511 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2512 my ($w, $h) = $self->text_size ($line); 2654
2513 $self->{height} += $h; 2655 $para = {
2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2515 } 2662 };
2516 2663
2517 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2666
2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2670
2671sub scroll_to_bottom {
2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2518} 2676}
2519 2677
2520sub update { 2678sub update {
2521 my ($self) = @_; 2679 my ($self) = @_;
2522 2680
… …
2524 2682
2525 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2526 2684
2527 delete $self->{texture}; 2685 delete $self->{texture};
2528 2686
2529 $ROOT->on_post_alloc ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531 2689
2532 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2533 my $height = 0; 2691 my $height = 0;
2534 2692
2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2539 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2540 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2541 $layout->set_width ($W - $_->[3]); 2695 my $layout = $self->get_layout ($para);
2542 $layout->set_markup ($_->[4]);
2543 my ($w, $h) = $layout->size; 2696 my ($w, $h) = $layout->size;
2544 $_->[0] = $w + $_->[3]; 2697
2545 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2546 } 2701 }
2547 2702
2548 $height += $_->[1]; 2703 $height += $para->{h};
2549 } 2704 }
2550 2705
2551 $self->{height} = $height; 2706 $self->{height} = $height;
2552 2707
2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2554 2709
2555 delete $self->{texture}; 2710 delete $self->{texture};
2556 } 2711 }
2557 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2559 glClearColor 0.5, 0.5, 0.5, 0; 2718 glClearColor 0, 0, 0, 0;
2560 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2561 2720
2562 my $top = int $self->{children}[1]{range}[0]; 2721 my $top = int $self->{children}[1]{range}[0];
2563 2722
2564 my $y0 = $top; 2723 my $y0 = $top;
2565 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2566 2725
2567 my $y = 0; 2726 my $y = 0;
2568
2569 my $layout = $self->{layout};
2570
2571 $layout->set_font ($self->{font}) if $self->{font};
2572 2727
2573 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2574 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2575 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2576 2731
2577 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2578 my $h = $par->[1]; 2733 my $h = $para->{h};
2579 2734
2580 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2581 $layout->set_foreground (@{ $par->[2] }); 2736
2582 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2583 $layout->set_markup ($par->[4]);
2584 2738
2585 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2586 2740
2587 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2588 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 for (@w) {
2748 my ($dx, $dy) = splice @s, 0, 2, ();
2749
2750 $_->{x} = $dx + $para->{indent};
2751 $_->{y} = $dy + $y - $y0;
2752
2753 $_->draw;
2754 }
2755 }
2589 } 2756 }
2590 2757
2591 $y += $h; 2758 $y += $h;
2592 } 2759 }
2593 2760
2594 glDisable GL_BLEND; 2761 glDisable GL_BLEND;
2595 }; 2762 };
2596 }); 2763 });
2597} 2764}
2598 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2599sub _draw { 2775sub _draw {
2600 my ($self) = @_; 2776 my ($self) = @_;
2601 2777
2602 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2604 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2605 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2606 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2607 2783
2608 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2609
2610} 2785}
2611 2786
2612############################################################################# 2787#############################################################################
2613 2788
2614package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2701 $tooltip .= "\n\n" . (ref $widget) . "\n" 2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n" 2878 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}"; 2879 . "visible $widget->{visible}";
2705 } 2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2706 2884
2707 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2708 markup => $tooltip, 2886 markup => $tooltip,
2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2710 fontsize => 0.8, 2888 fontsize => 0.8,
… …
2720 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2721 2899
2722 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2723} 2901}
2724 2902
2725sub size_allocate { 2903sub invoke_size_allocate {
2726 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2727 2905
2728 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2729} 2907}
2730 2908
2731sub visibility_change { 2909sub invoke_visibility_change {
2732 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2733 2911
2734 return unless $visible; 2912 return unless $visible;
2735 2913
2736 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2738 or return; 2916 or return;
2739 2917
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741 2919
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH; 2921 if $x + $self->{w} > $self->{root}{w};
2744 2922
2745 $self->move_abs ($x, $y); 2923 $self->move_abs ($x, $y);
2746 }); 2924 });
2747} 2925}
2748 2926
… …
2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2838 3016
2839 if ($tex) { 3017 if ($tex) {
2840 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2842 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2844 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2845 } 3023 }
2846} 3024}
2847 3025
2848sub DESTROY { 3026sub destroy {
2849 my ($self) = @_; 3027 my ($self) = @_;
2850 3028
2851 $self->{timer}->cancel 3029 $self->{timer}->cancel
2852 if $self->{timer}; 3030 if $self->{timer};
2853 3031
2854 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2855} 3033}
3034
3035#############################################################################
3036
3037package CFClient::UI::Buttonbar;
3038
3039our @ISA = CFClient::UI::HBox::;
3040
3041# TODO: should actualyl wrap buttons and other goodies.
2856 3042
2857############################################################################# 3043#############################################################################
2858 3044
2859package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2860 3046
… …
2872 ); 3058 );
2873 3059
2874 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2875 3061
2876 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2877 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2878 3064
2879 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2880 if (!ref $widget) { 3066 if (!ref $widget) {
2881 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2882 can_hover => 1, 3068 can_hover => 1,
2883 can_events => 1, 3069 can_events => 1,
2884 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2885 } 3072 }
2886 3073
2887 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2888 3075
2889 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2894 3081
2895# popup given the event (must be a mouse button down event currently) 3082# popup given the event (must be a mouse button down event currently)
2896sub popup { 3083sub popup {
2897 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
2898 3085
2899 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
2900 3087
2901 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2902 $GRAB = $self; 3089 $GRAB = $self;
2903 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2904 3091
2905 $self->show; 3092 $self->show;
2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2907} 3094}
2908 3095
2909sub mouse_motion { 3096sub invoke_mouse_motion {
2910 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2911 3098
2912 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2914 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2915 3102
2916 0 3103 0
2917} 3104}
2918 3105
2919sub button_up { 3106sub invoke_button_up {
2920 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2921 3108
2922 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2923 undef $GRAB; 3110 undef $GRAB;
2924 $self->hide; 3111 $self->hide;
2925 3112
2926 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
2927 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
2928 } else { 3115 } else {
2929 return 0 3116 return 0
2930 } 3117 }
2931 3118
2932 1 3119 1
2933} 3120}
2934 3121
2935############################################################################# 3122#############################################################################
2936 3123
2937package CFClient::UI::Statusbox; 3124package CFClient::UI::Multiplexer;
2938 3125
2939our @ISA = CFClient::UI::VBox::; 3126our @ISA = CFClient::UI::Container::;
2940 3127
2941sub new { 3128sub new {
2942 my $class = shift; 3129 my $class = shift;
2943 3130
2944 $class->SUPER::new ( 3131 my $self = $class->SUPER::new (
3132 @_,
3133 );
3134
3135 $self->{current} = $self->{children}[0]
3136 if @{ $self->{children} };
3137
3138 $self
3139}
3140
3141sub add {
3142 my ($self, @widgets) = @_;
3143
3144 $self->SUPER::add (@widgets);
3145
3146 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} };
3148}
3149
3150sub set_current_page {
3151 my ($self, $page_or_widget) = @_;
3152
3153 my $widget = ref $page_or_widget
3154 ? $page_or_widget
3155 : $self->{children}[$page_or_widget];
3156
3157 $self->{current} = $widget;
3158 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3159
3160 $self->emit (page_changed => $self->{current});
3161
3162 $self->realloc;
3163}
3164
3165sub visible_children {
3166 $_[0]{current}
3167}
3168
3169sub size_request {
3170 my ($self) = @_;
3171
3172 $self->{current}->size_request
3173}
3174
3175sub invoke_size_allocate {
3176 my ($self, $w, $h) = @_;
3177
3178 $self->{current}->configure (0, 0, $w, $h);
3179
3180 1
3181}
3182
3183sub _draw {
3184 my ($self) = @_;
3185
3186 $self->{current}->draw;
3187}
3188
3189#############################################################################
3190
3191package CFClient::UI::Notebook;
3192
3193our @ISA = CFClient::UI::VBox::;
3194
3195sub new {
3196 my $class = shift;
3197
3198 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self
3202 @_,
3203 );
3204
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3206 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3207
3208 $self
3209}
3210
3211sub add {
3212 my ($self, $title, $widget, $tooltip) = @_;
3213
3214 Scalar::Util::weaken $self;
3215
3216 $self->{buttonbar}->add (new CFClient::UI::Button
3217 markup => $title,
3218 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) },
3220 );
3221
3222 $self->{multiplexer}->add ($widget);
3223}
3224
3225sub set_current_page {
3226 my ($self, $page) = @_;
3227
3228 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current});
3230}
3231
3232#############################################################################
3233
3234package CFClient::UI::Combobox;
3235
3236use utf8;
3237
3238our @ISA = CFClient::UI::Button::;
3239
3240sub new {
3241 my $class = shift;
3242
3243 my $self = $class->SUPER::new (
3244 options => [], # [value, title, longdesc], ...
3245 value => undef,
3246 @_,
3247 );
3248
3249 $self->_set_value ($self->{value});
3250
3251 $self
3252}
3253
3254sub invoke_button_down {
3255 my ($self, $ev) = @_;
3256
3257 my @menu_items;
3258
3259 for (@{ $self->{options} }) {
3260 my ($value, $title, $tooltip) = @$_;
3261
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 }
3264
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266}
3267
3268sub _set_value {
3269 my ($self, $value) = @_;
3270
3271 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3272 or return;
3273
3274 $self->{value} = $item->[0];
3275 $self->set_markup ("$item->[1] ⇓");
3276 $self->set_tooltip ($item->[2]);
3277}
3278
3279sub set_value {
3280 my ($self, $value) = @_;
3281
3282 return unless $self->{value} ne $value;
3283
3284 $self->_set_value ($value);
3285 $self->emit (changed => $value);
3286}
3287
3288#############################################################################
3289
3290package CFClient::UI::Statusbox;
3291
3292our @ISA = CFClient::UI::VBox::;
3293
3294sub new {
3295 my $class = shift;
3296
3297 my $self = $class->SUPER::new (
2945 fontsize => 0.8, 3298 fontsize => 0.8,
2946 @_, 3299 @_,
2947 ) 3300 );
3301
3302 Scalar::Util::weaken (my $this = $self);
3303
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305
3306 $self
2948} 3307}
2949 3308
2950sub reorder { 3309sub reorder {
2951 my ($self) = @_; 3310 my ($self) = @_;
2952 my $NOW = time; 3311 my $NOW = Time::HiRes::time;
3312
3313 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} };
2953 3317
2954 while (my ($k, $v) = each %{ $self->{item} }) { 3318 while (my ($k, $v) = each %{ $self->{item} }) {
2955 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3319 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2956 } 3320 }
2957 3321
… …
2960 my @items = sort { 3324 my @items = sort {
2961 $a->{pri} <=> $b->{pri} 3325 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id} 3326 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} }; 3327 } values %{ $self->{item} };
2964 3328
3329 $self->{timer}->interval (1);
3330
2965 my $count = 10 + 1; 3331 my $count = 10 + 1;
2966 for my $item (@items) { 3332 for my $item (@items) {
2967 last unless --$count; 3333 last unless --$count;
2968 3334
2969 push @widgets, $item->{label} ||= do { 3335 my $label = $item->{label} ||= do {
2970 # TODO: doesn't handle markup well (read as: at all) 3336 # TODO: doesn't handle markup well (read as: at all)
2971 my $short = $item->{count} > 1 3337 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}" 3338 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text}; 3339 : $item->{text};
2974 3340
… …
2982 tooltip => $item->{tooltip}, 3348 tooltip => $item->{tooltip},
2983 tooltip_font => $::FONT_PROP, 3349 tooltip_font => $::FONT_PROP,
2984 tooltip_width => 0.67, 3350 tooltip_width => 0.67,
2985 fontsize => $item->{fontsize} || $self->{fontsize}, 3351 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44, 3352 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg}, 3353 fg => [@{ $item->{fg} }],
2988 can_events => 1, 3354 can_events => 1,
2989 can_hover => 1 3355 can_hover => 1
2990 }; 3356 };
3357
3358 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3359 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3360 $label->update;
3361 $label->set_max_size (undef, $label->{req_h} * $diff)
3362 if $diff < 1;
3363 $self->{timer}->interval (1/30);
3364 } else {
3365 $label->{fg}[3] = $item->{fg}[3] || 1;
3366 }
3367
3368 push @widgets, $label;
2991 } 3369 }
2992 3370
2993 $self->clear; 3371 $self->clear;
2994 $self->SUPER::add (reverse @widgets); 3372 $self->SUPER::add (reverse @widgets);
2995} 3373}
… …
3000 $text =~ s/^\s+//; 3378 $text =~ s/^\s+//;
3001 $text =~ s/\s+$//; 3379 $text =~ s/\s+$//;
3002 3380
3003 return unless $text; 3381 return unless $text;
3004 3382
3005 my $timeout = time + ((delete $arg{timeout}) || 60); 3383 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3006 3384
3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3385 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008 3386
3009 if (my $item = $self->{item}{$group}) { 3387 if (my $item = $self->{item}{$group}) {
3010 if ($item->{text} eq $text) { 3388 if ($item->{text} eq $text) {
3011 $item->{count}++; 3389 $item->{count}++;
3012 } else { 3390 } else {
3013 $item->{count} = 1; 3391 $item->{count} = 1;
3014 $item->{text} = $item->{tooltip} = $text; 3392 $item->{text} = $item->{tooltip} = $text;
3015 } 3393 }
3016 $item->{id} = ++$self->{id}; 3394 $item->{id} += 0.2;#d#
3017 $item->{timeout} = $timeout; 3395 $item->{timeout} = $timeout;
3018 delete $item->{label}; 3396 delete $item->{label};
3019 } else { 3397 } else {
3020 $self->{item}{$group} = { 3398 $self->{item}{$group} = {
3021 id => ++$self->{id}, 3399 id => ++$self->{id},
… …
3040 3418
3041 $self->reorder; 3419 $self->reorder;
3042 $self->SUPER::reconfigure; 3420 $self->SUPER::reconfigure;
3043} 3421}
3044 3422
3423sub destroy {
3424 my ($self) = @_;
3425
3426 $self->{timer}->cancel;
3427
3428 $self->SUPER::destroy;
3429}
3430
3045############################################################################# 3431#############################################################################
3046 3432
3047package CFClient::UI::Inventory; 3433package CFClient::UI::Inventory;
3048 3434
3049our @ISA = CFClient::UI::ScrolledWindow::; 3435our @ISA = CFClient::UI::ScrolledWindow::;
3050 3436
3051sub new { 3437sub new {
3052 my $class = shift; 3438 my $class = shift;
3053 3439
3054 my $self = $class->SUPER::new ( 3440 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3056 @_, 3442 @_,
3057 ); 3443 );
3058 3444
3059 $self 3445 $self
3060} 3446}
3061 3447
3062sub set_items { 3448sub set_items {
3063 my ($self, $items) = @_; 3449 my ($self, $items) = @_;
3064 3450
3065 $self->{scrolled}->clear; 3451 $self->{child}->clear;
3066 return unless $items; 3452 return unless $items;
3067 3453
3068 my @items = sort { 3454 my @items = sort {
3069 ($a->{type} <=> $b->{type}) 3455 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name}) 3456 or ($a->{name} cmp $b->{name})
… …
3074 3460
3075 my $row = 0; 3461 my $row = 0;
3076 for my $item (@items) { 3462 for my $item (@items) {
3077 CFClient::Item::update_widgets $item; 3463 CFClient::Item::update_widgets $item;
3078 3464
3079 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3465 $self->{child}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3466 $self->{child}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3467 $self->{child}->add (2, $row, $item->{weight_widget});
3082 3468
3083 $row++; 3469 $row++;
3084 } 3470 }
3085} 3471}
3086 3472
… …
3148 $self->update_binding_widgets; 3534 $self->update_binding_widgets;
3149 3535
3150 $self 3536 $self
3151} 3537}
3152 3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3153sub commit { 3551sub commit {
3154 my ($self) = @_; 3552 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding; 3553 my ($mod, $sym, $cmds) = $self->get_binding;
3156 if ($sym != 0 && @$cmds > 0) { 3554 if ($sym != 0 && @$cmds > 0) {
3157 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3191 my ($self) = @_; 3589 my ($self) = @_;
3192 $self->ask_for_bind (1); 3590 $self->ask_for_bind (1);
3193} 3591}
3194 3592
3195sub ask_for_bind { 3593sub ask_for_bind {
3196 my ($self, $commit) = @_; 3594 my ($self, $commit, $end_cb) = @_;
3197 3595
3198 CFClient::Binder::open_binding_dialog (sub { 3596 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_; 3597 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets; 3599 $self->update_binding_widgets;
3202 $self->commit if $commit; 3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3203 }); 3602 });
3204} 3603}
3205 3604
3206# $mod and $sym are the modifiers and key symbol 3605# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands) 3606# $cmds is a array ref of strings (the commands)
… …
3225} 3624}
3226 3625
3227# this is a shortcut method that asks for a binding 3626# this is a shortcut method that asks for a binding
3228# and then just binds it. 3627# and then just binds it.
3229sub do_quick_binding { 3628sub do_quick_binding {
3230 my ($self, $cmds) = @_; 3629 my ($self, $cmds, $end_cb) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub { 3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 });
3234 $self->ask_for_bind (1); 3631 $self->ask_for_bind (1, $end_cb);
3235} 3632}
3236 3633
3237sub update_binding_widgets { 3634sub update_binding_widgets {
3238 my ($self) = @_; 3635 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding; 3636 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3283 3680
3284############################################################################# 3681#############################################################################
3285 3682
3286package CFClient::UI::SpellList; 3683package CFClient::UI::SpellList;
3287 3684
3288our @ISA = CFClient::UI::FancyFrame::; 3685our @ISA = CFClient::UI::Table::;
3289 3686
3290sub new { 3687sub new {
3291 my $class = shift; 3688 my $class = shift;
3292 3689
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3690 my $self = $class->SUPER::new (
3294 3691 binding => [],
3295 $self->add (new CFClient::UI::ScrolledWindow 3692 commands => [],
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3693 @_,
3297 3694 )
3298 $self;
3299} 3695}
3300 3696
3301# XXX: Do sorting? Argl... 3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3302sub add_spell { 3782sub add_spell {
3303 my ($self, $spell) = @_; 3783 my ($self, $spell) = @_;
3784
3304 $self->{spells}->{$spell->{name}} = $spell; 3785 $self->{spell}->{$spell->{name}} = $spell;
3305 3786 $self->rebuild_spell_list;
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333} 3787}
3334 3788
3335sub remove_spell { 3789sub remove_spell {
3336 my ($self, $spell) = @_; 3790 my ($self, $spell) = @_;
3791
3337 delete $self->{spells}->{$spell->{name}}; 3792 delete $self->{spell}->{$spell->{name}};
3338 $self->rebuild_spell_list; 3793 $self->rebuild_spell_list;
3339} 3794}
3340 3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3341############################################################################# 3803#############################################################################
3342 3804
3343package CFClient::UI::Root; 3805package CFClient::UI::Root;
3344 3806
3345our @ISA = CFClient::UI::Container::; 3807our @ISA = CFClient::UI::Container::;
3808
3809use List::Util qw(min max);
3346 3810
3347use CFClient::OpenGL; 3811use CFClient::OpenGL;
3348 3812
3349sub new { 3813sub new {
3350 my $class = shift; 3814 my $class = shift;
… …
3377 $coord = $max - $size if $coord > $max - $size; 3841 $coord = $max - $size if $coord > $max - $size;
3378 3842
3379 int $coord + 0.5 3843 int $coord + 0.5
3380} 3844}
3381 3845
3382sub size_allocate { 3846sub invoke_size_allocate {
3383 my ($self, $w, $h) = @_; 3847 my ($self, $w, $h) = @_;
3384 3848
3385 for my $child ($self->children) { 3849 for my $child ($self->children) {
3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3850 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3387 3851
… …
3391 $X = _to_pixel $X, $W, $self->{w}; 3855 $X = _to_pixel $X, $W, $self->{w};
3392 $Y = _to_pixel $Y, $H, $self->{h}; 3856 $Y = _to_pixel $Y, $H, $self->{h};
3393 3857
3394 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
3395 } 3859 }
3860
3861 1
3396} 3862}
3397 3863
3398sub coord2local { 3864sub coord2local {
3399 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
3400 3866
… …
3485 3951
3486 delete $queue{$widget+0}; 3952 delete $queue{$widget+0};
3487 3953
3488 my ($w, $h) = $widget->size_request; 3954 my ($w, $h) = $widget->size_request;
3489 3955
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3956 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3957 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3492 3961
3493 $w = $widget->{force_w} if exists $widget->{force_w}; 3962 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h}; 3963 $h = $widget->{force_h} if exists $widget->{force_h};
3495 3964
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3965 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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