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.310 by root, Fri Jun 23 20:28:20 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
… …
366 366
367 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
368 } 368 }
369} 369}
370 370
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 371sub children {
376 # nop 372 # nop
377} 373}
378 374
379sub visible_children { 375sub visible_children {
… …
381} 377}
382 378
383sub set_max_size { 379sub set_max_size {
384 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
385 381
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
388} 386}
389 387
390sub set_tooltip { 388sub set_tooltip {
391 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
392 390
… …
397 395
398 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
399 397
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 401 }
404} 402}
405 403
406# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
407sub coord2local { 405sub coord2local {
… …
415 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
416 414
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 416}
419 417
420sub focus_in { 418sub invoke_focus_in {
421 my ($self) = @_; 419 my ($self) = @_;
422 420
423 return if $FOCUS == $self; 421 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
425 423
426 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
427 425
428 $self->_emit (focus_in => $focus);
429
430 $focus->update if $focus; 426 $focus->update if $focus;
431 $FOCUS->update; 427 $FOCUS->update;
432}
433 428
429 0
430}
431
434sub focus_out { 432sub invoke_focus_out {
435 my ($self) = @_; 433 my ($self) = @_;
436 434
437 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
438 436
439 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
440 438
441 $self->_emit (focus_out => $focus);
442
443 $focus->update if $focus; #? 439 $focus->update if $focus; #?
444 440
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 442 unless $FOCUS;
447}
448 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
449sub mouse_motion { 0 } 453sub invoke_mouse_motion { 1 }
450sub button_up { 0 } 454sub invoke_button_up { 1 }
451sub key_down { 0 } 455sub invoke_key_down { 1 }
452sub key_up { 0 } 456sub invoke_key_up { 1 }
453 457
454sub button_down { 458sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
456 460
457 $self->focus_in; 461 $self->grab_focus;
458 462
459 0 463 1
464}
465
466sub connect {
467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 479}
461 480
462sub find_widget { 481sub find_widget {
463 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
464 483
… …
474sub set_parent { 493sub set_parent {
475 my ($self, $parent) = @_; 494 my ($self, $parent) = @_;
476 495
477 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 497 $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} 498}
503 499
504sub realloc { 500sub realloc {
505 my ($self) = @_; 501 my ($self) = @_;
506 502
… …
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 546
551 glPushMatrix; 547 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 549
556 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 552 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 554 glBegin GL_QUADS;
563 glVertex $x , $y; 555 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 556 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 557 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 558 glVertex 0 , $self->{h};
567 glEnd; 559 glEnd;
568 glDisable GL_BLEND; 560 glDisable GL_BLEND;
569 } 561 }
570 562
571 if ($ENV{CFPLUS_DEBUG} & 1) { 563 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 564 glPushMatrix;
573 glColor 1, 1, 0, 1; 565 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 566 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 567 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 568 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 569 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 570 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 571 glVertex 0 , $self->{h} - 1;
580 glEnd; 572 glEnd;
581 glPopMatrix; 573 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
584} 579}
585 580
586sub _draw { 581sub _draw {
587 my ($self) = @_; 582 my ($self) = @_;
588 583
… …
591 586
592sub DESTROY { 587sub DESTROY {
593 my ($self) = @_; 588 my ($self) = @_;
594 589
595 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
596 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 594}
598 595
599############################################################################# 596#############################################################################
600 597
601package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
626 623
627 if ($color && (@$color < 4 || $color->[3])) { 624 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
629 626
630 glEnable GL_BLEND; 627 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 629 glColor_premultiply @$color;
633 630
634 glBegin GL_QUADS; 631 glBegin GL_QUADS;
635 glVertex 0 , 0; 632 glVertex 0 , 0;
636 glVertex 0 , $h; 633 glVertex 0 , $h;
637 glVertex $w, $h; 634 glVertex $w, $h;
… …
766} 763}
767 764
768sub add { 765sub add {
769 my ($self, $child) = @_; 766 my ($self, $child) = @_;
770 767
771 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
774} 770}
775 771
776sub remove { 772sub remove {
777 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
786 782
787sub size_request { 783sub size_request {
788 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
789} 785}
790 786
791sub size_allocate { 787sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
793 789
794 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
795} 793}
796 794
797############################################################################# 795#############################################################################
796
797# back-buffered drawing area
798 798
799package CFClient::UI::Window; 799package CFClient::UI::Window;
800 800
801our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
802 802
… …
813 813
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 815 $self->SUPER::update;
816} 816}
817 817
818sub size_allocate { 818sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
820 820
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
823} 824}
824 825
825sub _render { 826sub _render {
826 my ($self) = @_; 827 my ($self) = @_;
827 828
… …
854 my $tex = $self->{texture} 855 my $tex = $self->{texture}
855 or return; 856 or return;
856 857
857 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
860 861
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 863
863 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
864} 865}
… …
888 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
889 890
890 ($w, $h) 891 ($w, $h)
891} 892}
892 893
893sub size_allocate { 894sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
895 896
896 my $child = $self->child; 897 my $child = $self->child;
897 898
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 901
901 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
902 $self->update; 903 $self->update;
904
905 1
903} 906}
904 907
905sub set_offset { 908sub set_offset {
906 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
907 910
… …
955package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
956 959
957our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
958 961
959sub new { 962sub new {
960 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
961 966
962 my $self; 967 my $self;
963 968
964 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
965 vertical => 1, 970 vertical => 1,
… …
970 ; 975 ;
971 976
972 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider, 979 slider => $slider,
975 @_, 980 %arg,
976 ); 981 );
977 982
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
981 985
982 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
983} 993}
984 994
985sub update { 995sub update {
986 my ($self) = @_; 996 my ($self) = @_;
987 997
… …
990 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
991 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1003}
994 1004
995sub size_allocate { 1005sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
997
998 $self->SUPER::size_allocate ($w, $h);
999 1007
1000 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
1002} 1012}
1003 1013
1004#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll 1015# update viewport offset on scroll
1006 1016
… …
1026 1036
1027 if ($self->{bg}) { 1037 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
1029 1039
1030 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
1033 1043
1034 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1045 glVertex 0 , 0;
1036 glVertex 0 , $h; 1046 glVertex 0 , $h;
1037 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062 1072
1063sub new { 1073sub new {
1064 my ($class, %arg) = @_; 1074 my ($class, %arg) = @_;
1065
1066 my $title = delete $arg{title};
1067 1075
1068 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1079 border => 0.6,
… …
1073 min_w => 16, 1081 min_w => 16,
1074 min_h => 16, 1082 min_h => 16,
1075 %arg, 1083 %arg,
1076 ); 1084 );
1077 1085
1078 $self->{title} = new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1079 align => 0, 1087 align => 0,
1080 valign => 1, 1088 valign => 1,
1081 text => $title, 1089 text => $self->{title},
1082 fontsize => $self->{border} 1090 fontsize => $self->{border},
1083 if defined $title; 1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 path => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1084 1101
1085 $self 1102 $self
1086} 1103}
1087 1104
1088sub add { 1105sub add {
1089 my ($self, @widgets) = @_; 1106 my ($self, @widgets) = @_;
1090 1107
1091 $self->SUPER::add (@widgets); 1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1111}
1094 1112
1095sub border { 1113sub border {
1096 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1097} 1115}
1098 1116
1099sub size_request { 1117sub size_request {
1100 my ($self) = @_; 1118 my ($self) = @_;
1101 1119
1102 $self->{title}->size_request 1120 $self->{title_widget}->size_request
1103 if $self->{title}; 1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1104 1125
1105 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1106 1127
1107 ( 1128 (
1108 $w + $self->border * 2, 1129 $w + $self->border * 2,
1109 $h + $self->border * 2, 1130 $h + $self->border * 2,
1110 ) 1131 )
1111} 1132}
1112 1133
1113sub size_allocate { 1134sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1115 1136
1116 if ($self->{title}) { 1137 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1138 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1139 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1141 }
1121 1142
1122 my $border = $self->border; 1143 my $border = $self->border;
1123 1144
1124 $h -= List::Util::max 0, $border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1125 $w -= List::Util::max 0, $border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1126 1147
1127 $self->child->configure ($border, $border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1128}
1129 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1130sub button_down { 1156sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1132 1158
1133 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1160 my $border = $self->border;
1135 1161
… …
1151 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1152 1178
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1183 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1184 };
1159 1185
1160 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1166 1192
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1194
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1198 };
1171 } else { 1199 } else {
1172 return 0; 1200 return 0;
1173 } 1201 }
1174 1202
1175 1 1203 1
1176} 1204}
1177 1205
1178sub button_up { 1206sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1180 1208
1181 !!delete $self->{motion} 1209 ! ! delete $self->{motion}
1182} 1210}
1183 1211
1184sub mouse_motion { 1212sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1186 1214
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1216
1189 !!$self->{motion} 1217 ! ! $self->{motion}
1190} 1218}
1191 1219
1192sub _draw { 1220sub _draw {
1193 my ($self) = @_; 1221 my ($self) = @_;
1194 1222
… …
1220 1248
1221 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1222 1250
1223 $child->draw; 1251 $child->draw;
1224 1252
1225 if ($self->{title}) { 1253 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1254 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1228 } 1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1229} 1262}
1230 1263
1231############################################################################# 1264#############################################################################
1232 1265
1233package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1256 1289
1257 $child->set_parent ($self); 1290 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1259 1292
1260 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1261} 1300}
1262 1301
1263# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1264sub clear { 1303sub clear {
1265 my ($self) = @_; 1304 my ($self) = @_;
… …
1306 (sum @$ws), 1345 (sum @$ws),
1307 (sum @$hs), 1346 (sum @$hs),
1308 ) 1347 )
1309} 1348}
1310 1349
1311sub size_allocate { 1350sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1313 1352
1314 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1315 1354
1316 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1348 } 1387 }
1349 1388
1350 $y += $row_h; 1389 $y += $row_h;
1351 } 1390 }
1352 1391
1392 1
1353} 1393}
1354 1394
1355sub find_widget { 1395sub find_widget {
1356 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1357 1397
… …
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 ) 1436 )
1397} 1437}
1398 1438
1399sub size_allocate { 1439sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1401 1441
1402 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1443 my @children = $self->visible_children;
1404 1444
1405 my @req; 1445 my @req;
1406 1446
1407 if ($self->{homogeneous}) { 1447 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1448 @req = ($space / (@children || 1)) x @children;
1409 } else { 1449 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1451 my $req = List::Util::sum @req;
1412 1452
1413 if ($req > $space) { 1453 if ($req > $space) {
1414 # ah well, not enough space 1454 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1455 $_ *= $space / $req for @req;
1416 } else { 1456 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1457 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1458
1419 $space = ($space - $req) / $expand; # remaining space to give away 1459 $space = ($space - $req) / $expand; # remaining space to give away
1420 1460
1421 $req[$_] += $space * $children->[$_]{expand} 1461 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1462 for 0 .. $#children;
1423 } 1463 }
1424 } 1464 }
1425 1465
1426 CFClient::UI::harmonize \@req; 1466 CFClient::UI::harmonize \@req;
1427 1467
1428 my $pos = 0; 1468 my $pos = 0;
1429 for (0 .. $#$children) { 1469 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1470 my $alloc = $req[$_];
1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1432 1472
1433 $pos += $alloc; 1473 $pos += $alloc;
1434 } 1474 }
1435 1475
1436 1 1476 1
… …
1526 1566
1527 delete $self->{texture}; 1567 delete $self->{texture};
1528 $self->SUPER::update; 1568 $self->SUPER::update;
1529} 1569}
1530 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1531sub set_text { 1578sub set_text {
1532 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1533 1580
1534 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1536 1583
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1539 1586
1587 delete $self->{size_req};
1540 $self->realloc; 1588 $self->realloc;
1541 $self->update; 1589 $self->update;
1542} 1590}
1543 1591
1544sub set_markup { 1592sub set_markup {
… …
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1599
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1554 1602
1603 delete $self->{size_req};
1555 $self->realloc; 1604 $self->realloc;
1556 $self->update; 1605 $self->update;
1557} 1606}
1558 1607
1559sub size_request { 1608sub size_request {
1560 my ($self) = @_; 1609 my ($self) = @_;
1561 1610
1611 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1617
1568 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1569 1619
1570 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1623
1574 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1575 1625
1576 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1578 } 1631 };
1579 1632
1580 ($w, $h) 1633 @{ $self->{size_req} }
1581} 1634}
1582 1635
1583sub size_allocate { 1636sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1585 1638
1586 delete $self->{ox}; 1639 delete $self->{ox};
1587 1640
1588 delete $self->{texture} 1641 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1590} 1645}
1591 1646
1592sub set_fontsize { 1647sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1594 1649
1595 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1596 delete $self->{texture}; 1651 delete $self->{texture};
1597 1652
1598 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1599} 1662}
1600 1663
1601sub _draw { 1664sub _draw {
1602 my ($self) = @_; 1665 my ($self) = @_;
1603 1666
… …
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1625 }; 1688 };
1626 1689
1627 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1629 1694
1630 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1631 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1633 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1635 } 1702 }
1636 1703
1637 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1638} 1705}
1639 1706
… …
1656 can_hover => 1, 1723 can_hover => 1,
1657 can_focus => 1, 1724 can_focus => 1,
1658 valign => 0, 1725 valign => 0,
1659 can_events => 1, 1726 can_events => 1,
1660 #text => ... 1727 #text => ...
1728 #hidden => "*",
1661 @_ 1729 @_
1662 ) 1730 )
1663} 1731}
1664 1732
1665sub _set_text { 1733sub _set_text {
… …
1667 1735
1668 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1669 1737
1670 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1671 1739
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1741 $self->{text} = $text;
1676 1742
1677 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1679 1746
1680 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1681} 1751}
1682 1752
1683sub set_text { 1753sub set_text {
1684 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1685 1755
1686 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1757 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1758}
1691 1759
1692sub get_text { 1760sub get_text {
1693 $_[0]{text} 1761 $_[0]{text}
1694} 1762}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1700 1768
1701 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1702} 1770}
1703 1771
1704sub key_down { 1772sub invoke_key_down {
1705 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1706 1774
1707 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1721 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1722 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1724 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 1794 $self->emit ('escape');
1727 } elsif ($uni) { 1795 } elsif ($uni) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 1797 } else {
1730 return 0; 1798 return 0;
1731 } 1799 }
… …
1735 $self->realloc; 1803 $self->realloc;
1736 1804
1737 1 1805 1
1738} 1806}
1739 1807
1740sub focus_in { 1808sub invoke_focus_in {
1741 my ($self) = @_; 1809 my ($self) = @_;
1742 1810
1743 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1744 1812
1745 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1746} 1814}
1747 1815
1748sub button_down { 1816sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1750 1818
1751 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 1820
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 1822
1755 # byte-index to char-index 1823 # byte-index to char-index
1756 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1761 $self->update; 1829 $self->update;
1762 1830
1763 1 1831 1
1764} 1832}
1765 1833
1766sub mouse_motion { 1834sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769 1837
1770 0 1838 1
1771} 1839}
1772 1840
1773sub _draw { 1841sub _draw {
1774 my ($self) = @_; 1842 my ($self) = @_;
1775 1843
1776 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1777 1845
1778 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1781 } else { 1849 } else {
1782 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1783 } 1851 }
1784 1852
1785 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1856 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1816 1884
1817our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1818 1886
1819use CFClient::OpenGL; 1887use CFClient::OpenGL;
1820 1888
1821sub key_down { 1889sub invoke_key_down {
1822 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1823 1891
1824 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1825 1893
1826 if ($sym == 13) { 1894 if ($sym == 13) {
1827 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1829 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1832 $self->update; 1901 $self->update;
1833 1902
1834 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1852 } else { 1921 } else {
1853 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1854 } 1923 }
1855 1924
1856 } else { 1925 } else {
1857 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1858 } 1927 }
1859 1928
1860 1 1929 1
1861} 1930}
1862 1931
… …
1886 can_events => 1, 1955 can_events => 1,
1887 @_ 1956 @_
1888 ) 1957 )
1889} 1958}
1890 1959
1891sub activate { }
1892
1893sub button_up { 1960sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1895 1962
1896 $self->emit ("activate") 1963 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
1901} 1968}
1902 1969
1903sub _draw { 1970sub _draw {
1904 my ($self) = @_; 1971 my ($self) = @_;
1905 1972
1906 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 1974
1912 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1915 1978
1916 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1917 1980
1918 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1919 1982
1920 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1984}
1985
1986#############################################################################
1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
1921} 2020}
1922 2021
1923############################################################################# 2022#############################################################################
1924 2023
1925package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1952 my ($self) = @_; 2051 my ($self) = @_;
1953 2052
1954 (6) x 2 2053 (6) x 2
1955} 2054}
1956 2055
1957sub button_down { 2056sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1959 2058
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1963 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
1964 } else { 2063 } else {
1965 return 0 2064 return 0
1966 } 2065 }
1967 2066
1968 1 2067 1
… …
1993package CFClient::UI::Image; 2092package CFClient::UI::Image;
1994 2093
1995our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
1996 2095
1997use CFClient::OpenGL; 2096use CFClient::OpenGL;
1998use Carp qw/confess/;
1999 2097
2000our %loaded_images; 2098our %texture_cache;
2001 2099
2002sub new { 2100sub new {
2003 my $class = shift; 2101 my $class = shift;
2004 2102
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
2006 2107
2007 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
2008 2110
2009 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
2010 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2011 2113
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
2013 2115
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2117
2018 $self 2118 $self
2019} 2119}
2020 2120
2021sub size_request { 2121sub size_request {
2022 my ($self) = @_; 2122 my ($self) = @_;
2023 2123
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
2025} 2125}
2026 2126
2027sub _draw { 2127sub _draw {
2028 my ($self) = @_; 2128 my ($self) = @_;
2029 2129
… …
2140 2240
2141 my $h1 = $self->{h} * (1 - $ycut1); 2241 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2242 my $h2 = $self->{h} * (1 - $ycut2);
2143 2243
2144 glEnable GL_BLEND; 2244 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2247 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2248 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2249
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2250 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2251 glBegin GL_QUADS;
… …
2264 $self->update; 2365 $self->update;
2265 2366
2266 $self 2367 $self
2267} 2368}
2268 2369
2269sub changed { }
2270
2271sub set_range { 2370sub set_range {
2272 my ($self, $range) = @_; 2371 my ($self, $range) = @_;
2273 2372
2274 ($range, $self->{range}) = ($self->{range}, $range); 2373 ($range, $self->{range}) = ($self->{range}, $range);
2275 2374
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2375 if ("@$range" ne "@{$self->{range}}") {
2376 $self->update;
2377 $self->set_value ($self->{range}[0]);
2378 }
2278} 2379}
2279 2380
2280sub set_value { 2381sub set_value {
2281 my ($self, $value) = @_; 2382 my ($self, $value) = @_;
2282 2383
… …
2293 if $unit; 2394 if $unit;
2294 2395
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2397
2297 if ($value != $old_value) { 2398 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2399 $self->emit (changed => $value);
2299 $self->update; 2400 $self->update;
2300 } 2401 }
2301} 2402}
2302 2403
2303sub size_request { 2404sub size_request {
2304 my ($self) = @_; 2405 my ($self) = @_;
2305 2406
2306 ($self->{req_w}, $self->{req_h}) 2407 ($self->{req_w}, $self->{req_h})
2307} 2408}
2308 2409
2309sub button_down { 2410sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2311 2412
2312 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2414
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2416
2316 $self->mouse_motion ($ev, $x, $y) 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2418}
2318 2419
2319sub mouse_motion { 2420sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2321 2422
2322 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2425
… …
2335} 2436}
2336 2437
2337sub update { 2438sub update {
2338 my ($self) = @_; 2439 my ($self) = @_;
2339 2440
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2441 delete $self->{knob_w};
2442 $self->SUPER::update;
2443}
2444
2445sub _draw {
2446 my ($self) = @_;
2447
2448 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2449 $self->set_value ($self->{range}[0]);
2342 2450
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2451 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2452 my $range = ($hi - $page - $lo) || 1e-100;
2345 2453
… …
2351 $value = ($value - $lo) / $range; 2459 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2460 $value = $value * $self->{scale} + $self->{offset};
2353 2461
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2462 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2463 $self->{knob_w} = $knob_w;
2356 }); 2464 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2465
2364 $self->SUPER::_draw (); 2466 $self->SUPER::_draw ();
2365 2467
2366 glScale $self->{w}, $self->{h}; 2468 glScale $self->{w}, $self->{h};
2367 2469
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2530sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2531sub set_value { shift->{slider}->set_value (@_) }
2430 2532
2431############################################################################# 2533#############################################################################
2432 2534
2433package CFClient::UI::TextView; 2535package CFClient::UI::TextScroller;
2434 2536
2435our @ISA = CFClient::UI::HBox::; 2537our @ISA = CFClient::UI::HBox::;
2436 2538
2437use CFClient::OpenGL; 2539use CFClient::OpenGL;
2438 2540
… …
2440 my $class = shift; 2542 my $class = shift;
2441 2543
2442 my $self = $class->SUPER::new ( 2544 my $self = $class->SUPER::new (
2443 fontsize => 1, 2545 fontsize => 1,
2444 can_events => 0, 2546 can_events => 0,
2547 indent => 0,
2445 #font => default_font 2548 #font => default_font
2446 @_, 2549 @_,
2447 2550
2448 layout => (new CFClient::Layout 1), 2551 layout => (new CFClient::Layout 1),
2449 par => [], 2552 par => [],
… …
2464 2567
2465 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2569 $self->reflow;
2467} 2570}
2468 2571
2572sub visible_children {
2573 my ($self) = @_;
2574
2575 @{$self->{children}}[0,1]
2576}
2577
2469sub size_allocate { 2578sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2579 my ($self, $w, $h) = @_;
2471 2580
2472 $self->SUPER::size_allocate ($w, $h); 2581 my (undef, undef, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2583
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2586 $self->{layout}->set_width ($self->{children}[0]{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2588
2478 $self->reflow; 2589 $self->reflow;
2479}
2480 2590
2481sub text_size { 2591 $self->SUPER::invoke_size_allocate ($w, $h)
2482 my ($self, $text, $indent) = @_; 2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2483 2596
2484 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2485 2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2603 $layout->set_markup ($para->{markup});
2489 2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2490 $layout->size 2606 $layout
2491} 2607}
2492 2608
2493sub reflow { 2609sub reflow {
2494 my ($self) = @_; 2610 my ($self) = @_;
2495 2611
… …
2504 $self->{children}[1]->set_value ($offset); 2620 $self->{children}[1]->set_value ($offset);
2505} 2621}
2506 2622
2507sub clear { 2623sub clear {
2508 my ($self) = @_; 2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2509 2628
2510 $self->{par} = []; 2629 $self->{par} = [];
2511 $self->{height} = 0; 2630 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2632}
2514 2633
2515sub add_paragraph { 2634sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2517 2636
2518 for my $line (split /\n/, $text) { 2637 my ($text, @w) = ref $para ? @$para : $para;
2519 my ($w, $h) = $self->text_size ($line); 2638
2520 $self->{height} += $h; 2639 $para = {
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2640 w => 1e10,
2641 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2522 } 2646 };
2523 2647
2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2648 $self->add (@w) if @w;
2649 push @{$self->{par}}, $para;
2650
2651 $self->{need_reflow}++;
2652 $self->update;
2653}
2654
2655sub scroll_to_bottom {
2656 my ($self) = @_;
2657
2658 $self->{scroll_to_bottom} = 1;
2659 $self->update;
2525} 2660}
2526 2661
2527sub update { 2662sub update {
2528 my ($self) = @_; 2663 my ($self) = @_;
2529 2664
… …
2531 2666
2532 return unless $self->{h} > 0; 2667 return unless $self->{h} > 0;
2533 2668
2534 delete $self->{texture}; 2669 delete $self->{texture};
2535 2670
2536 $ROOT->on_post_alloc ($self, sub { 2671 $ROOT->on_post_alloc ($self => sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2673
2539 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2540 my $height = 0; 2675 my $height = 0;
2541 2676
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) { 2677 for my $para (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2548 $layout->set_width ($W - $_->[3]); 2679 my $layout = $self->get_layout ($para);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2680 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2681
2682 $para->{w} = $w + $para->{indent};
2552 $_->[1] = $h; 2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2553 } 2685 }
2554 2686
2555 $height += $_->[1]; 2687 $height += $para->{h};
2556 } 2688 }
2557 2689
2558 $self->{height} = $height; 2690 $self->{height} = $height;
2559 2691
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2561 2693
2562 delete $self->{texture}; 2694 delete $self->{texture};
2563 } 2695 }
2564 2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2699 }
2700
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2702 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
2568 2704
2569 my $top = int $self->{children}[1]{range}[0]; 2705 my $top = int $self->{children}[1]{range}[0];
2570 2706
2571 my $y0 = $top; 2707 my $y0 = $top;
2572 my $y1 = $top + $H; 2708 my $y1 = $top + $H;
2573 2709
2574 my $y = 0; 2710 my $y = 0;
2575
2576 my $layout = $self->{layout};
2577
2578 $layout->set_font ($self->{font}) if $self->{font};
2579 2711
2580 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off 2713 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583 2715
2584 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 2717 my $h = $para->{h};
2586 2718
2587 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] }); 2720
2589 $layout->set_width ($W - $par->[3]); 2721 my $layout = $self->get_layout ($para);
2590 $layout->set_markup ($par->[4]);
2591 2722
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2593 2724
2594 glRasterPos $par->[3], $y - $y0; 2725 glRasterPos $para->{indent}, $y - $y0;
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727
2728 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes;
2730
2731 for (@w) {
2732 my ($dx, $dy) = splice @s, 0, 2, ();
2733
2734 $_->{x} = $dx + $para->{indent};
2735 $_->{y} = $dy + $y - $y0;
2736
2737 $_->draw;
2738 }
2739 }
2596 } 2740 }
2597 2741
2598 $y += $h; 2742 $y += $h;
2599 } 2743 }
2600 2744
2601 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2602 }; 2746 };
2603 }); 2747 });
2604} 2748}
2605 2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2757}
2758
2606sub _draw { 2759sub _draw {
2607 my ($self) = @_; 2760 my ($self) = @_;
2608 2761
2609 glEnable GL_TEXTURE_2D; 2762 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2764 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2765 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2614 2767
2615 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2616
2617} 2769}
2618 2770
2619############################################################################# 2771#############################################################################
2620 2772
2621package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 2860 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2861 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 2862 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 2863 . "visible $widget->{visible}";
2712 } 2864 }
2865
2866 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//;
2713 2868
2714 $self->add (new CFClient::UI::Label 2869 $self->add (new CFClient::UI::Label
2715 markup => $tooltip, 2870 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 2872 fontsize => 0.8,
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 2883
2729 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2730} 2885}
2731 2886
2732sub size_allocate { 2887sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 2888 my ($self, $w, $h) = @_;
2734 2889
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 2890 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 2891}
2737 2892
2738sub visibility_change { 2893sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 2894 my ($self, $visible) = @_;
2740 2895
2741 return unless $visible; 2896 return unless $visible;
2742 2897
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 2898 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2745 or return; 2900 or return;
2746 2901
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 2903
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 2905 if $x + $self->{w} > $self->{root}{w};
2751 2906
2752 $self->move_abs ($x, $y); 2907 $self->move_abs ($x, $y);
2753 }); 2908 });
2754} 2909}
2755 2910
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2999 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 3000
2846 if ($tex) { 3001 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3002 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3003 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3004 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3006 glDisable GL_TEXTURE_2D;
2852 } 3007 }
2853} 3008}
2854 3009
2855sub DESTROY { 3010sub destroy {
2856 my ($self) = @_; 3011 my ($self) = @_;
2857 3012
2858 $self->{timer}->cancel 3013 $self->{timer}->cancel
2859 if $self->{timer}; 3014 if $self->{timer};
2860 3015
2861 $self->SUPER::DESTROY; 3016 $self->SUPER::destroy;
2862} 3017}
2863 3018
2864############################################################################# 3019#############################################################################
2865 3020
2866package CFClient::UI::Buttonbar; 3021package CFClient::UI::Buttonbar;
… …
2887 ); 3042 );
2888 3043
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3044 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2890 3045
2891 for my $item (@{ $self->{items} }) { 3046 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3047 my ($widget, $cb, $tooltip) = @$item;
2893 3048
2894 # handle various types of items, only text for now 3049 # handle various types of items, only text for now
2895 if (!ref $widget) { 3050 if (!ref $widget) {
2896 $widget = new CFClient::UI::Label 3051 $widget = new CFClient::UI::Label
2897 can_hover => 1, 3052 can_hover => 1,
2898 can_events => 1, 3053 can_events => 1,
2899 text => $widget; 3054 markup => $widget,
3055 tooltip => $tooltip
2900 } 3056 }
2901 3057
2902 $self->{item}{$widget} = $item; 3058 $self->{item}{$widget} = $item;
2903 3059
2904 $self->{vbox}->add ($widget); 3060 $self->{vbox}->add ($widget);
… …
2909 3065
2910# popup given the event (must be a mouse button down event currently) 3066# popup given the event (must be a mouse button down event currently)
2911sub popup { 3067sub popup {
2912 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2913 3069
2914 $self->_emit ("popdown"); 3070 $self->emit ("popdown");
2915 3071
2916 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3073 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2919 3075
2920 $self->show; 3076 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3077 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3078}
2923 3079
2924sub mouse_motion { 3080sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2926 3082
2927 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2930 3086
2931 0 3087 0
2932} 3088}
2933 3089
2934sub button_up { 3090sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2936 3092
2937 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3094 undef $GRAB;
2939 $self->hide; 3095 $self->hide;
2940 3096
2941 $self->_emit ("popdown"); 3097 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3099 } else {
2944 return 0 3100 return 0
2945 } 3101 }
2946 3102
… …
2983 : $self->{children}[$page_or_widget]; 3139 : $self->{children}[$page_or_widget];
2984 3140
2985 $self->{current} = $widget; 3141 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3142 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3143
2988 $self->_emit (page_changed => $self->{current}); 3144 $self->emit (page_changed => $self->{current});
2989 3145
2990 $self->realloc; 3146 $self->realloc;
2991} 3147}
2992 3148
2993sub visible_children { 3149sub visible_children {
… …
2998 my ($self) = @_; 3154 my ($self) = @_;
2999 3155
3000 $self->{current}->size_request 3156 $self->{current}->size_request
3001} 3157}
3002 3158
3003sub size_allocate { 3159sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3160 my ($self, $w, $h) = @_;
3005 3161
3006 $self->{current}->configure (0, 0, $w, $h); 3162 $self->{current}->configure (0, 0, $w, $h);
3163
3164 1
3007} 3165}
3008 3166
3009sub _draw { 3167sub _draw {
3010 my ($self) = @_; 3168 my ($self) = @_;
3011 3169
… …
3022 my $class = shift; 3180 my $class = shift;
3023 3181
3024 my $self = $class->SUPER::new ( 3182 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3183 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3184 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3185 # filter => # will be put between multiplexer and $self
3027 @_, 3186 @_,
3028 ); 3187 );
3029 3188
3189 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3190 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3191
3032 $self 3192 $self
3033} 3193}
3034 3194
3035sub add { 3195sub add {
… …
3048 3208
3049sub set_current_page { 3209sub set_current_page {
3050 my ($self, $page) = @_; 3210 my ($self, $page) = @_;
3051 3211
3052 $self->{multiplexer}->set_current_page ($page); 3212 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3213 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3214}
3055 3215
3056############################################################################# 3216#############################################################################
3057 3217
3058package CFClient::UI::Statusbox; 3218package CFClient::UI::Combobox;
3059 3219
3220use utf8;
3221
3060our @ISA = CFClient::UI::VBox::; 3222our @ISA = CFClient::UI::Button::;
3061 3223
3062sub new { 3224sub new {
3063 my $class = shift; 3225 my $class = shift;
3064 3226
3065 $class->SUPER::new ( 3227 my $self = $class->SUPER::new (
3228 options => [], # [value, title, longdesc], ...
3229 value => undef,
3230 @_,
3231 );
3232
3233 $self->_set_value ($self->{value});
3234
3235 $self
3236}
3237
3238sub invoke_button_down {
3239 my ($self, $ev) = @_;
3240
3241 my @menu_items;
3242
3243 for (@{ $self->{options} }) {
3244 my ($value, $title, $tooltip) = @$_;
3245
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 }
3248
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250}
3251
3252sub _set_value {
3253 my ($self, $value) = @_;
3254
3255 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3256 or return;
3257
3258 $self->{value} = $item->[0];
3259 $self->set_markup ("$item->[1] ⇓");
3260 $self->set_tooltip ($item->[2]);
3261}
3262
3263sub set_value {
3264 my ($self, $value) = @_;
3265
3266 return unless $self->{value} ne $value;
3267
3268 $self->_set_value ($value);
3269 $self->emit (changed => $value);
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::Statusbox;
3275
3276our @ISA = CFClient::UI::VBox::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3282 fontsize => 0.8,
3067 @_, 3283 @_,
3068 ) 3284 );
3285
3286 Scalar::Util::weaken (my $this = $self);
3287
3288 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289
3290 $self
3069} 3291}
3070 3292
3071sub reorder { 3293sub reorder {
3072 my ($self) = @_; 3294 my ($self) = @_;
3073 my $NOW = time; 3295 my $NOW = Time::HiRes::time;
3296
3297 # freeze display when hovering over any label
3298 return if $CFClient::UI::TOOLTIP->{owner}
3299 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3300 values %{ $self->{item} };
3074 3301
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3302 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3303 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3304 }
3078 3305
… …
3081 my @items = sort { 3308 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3309 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3310 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3311 } values %{ $self->{item} };
3085 3312
3313 $self->{timer}->interval (1);
3314
3086 my $count = 10 + 1; 3315 my $count = 10 + 1;
3087 for my $item (@items) { 3316 for my $item (@items) {
3088 last unless --$count; 3317 last unless --$count;
3089 3318
3090 push @widgets, $item->{label} ||= do { 3319 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3320 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3321 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3322 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3323 : $item->{text};
3095 3324
… …
3103 tooltip => $item->{tooltip}, 3332 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3333 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3334 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3335 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3336 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3337 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3338 can_events => 1,
3110 can_hover => 1 3339 can_hover => 1
3111 }; 3340 };
3341
3342 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3343 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3344 $label->update;
3345 $label->set_max_size (undef, $label->{req_h} * $diff)
3346 if $diff < 1;
3347 $self->{timer}->interval (1/30);
3348 } else {
3349 $label->{fg}[3] = $item->{fg}[3] || 1;
3350 }
3351
3352 push @widgets, $label;
3112 } 3353 }
3113 3354
3114 $self->clear; 3355 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3356 $self->SUPER::add (reverse @widgets);
3116} 3357}
… …
3121 $text =~ s/^\s+//; 3362 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3363 $text =~ s/\s+$//;
3123 3364
3124 return unless $text; 3365 return unless $text;
3125 3366
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3367 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3368
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3369 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3370
3130 if (my $item = $self->{item}{$group}) { 3371 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3372 if ($item->{text} eq $text) {
3132 $item->{count}++; 3373 $item->{count}++;
3133 } else { 3374 } else {
3134 $item->{count} = 1; 3375 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3376 $item->{text} = $item->{tooltip} = $text;
3136 } 3377 }
3137 $item->{id} = ++$self->{id}; 3378 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3379 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3380 delete $item->{label};
3140 } else { 3381 } else {
3141 $self->{item}{$group} = { 3382 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3383 id => ++$self->{id},
… …
3161 3402
3162 $self->reorder; 3403 $self->reorder;
3163 $self->SUPER::reconfigure; 3404 $self->SUPER::reconfigure;
3164} 3405}
3165 3406
3407sub destroy {
3408 my ($self) = @_;
3409
3410 $self->{timer}->cancel;
3411
3412 $self->SUPER::destroy;
3413}
3414
3166############################################################################# 3415#############################################################################
3167 3416
3168package CFClient::UI::Inventory; 3417package CFClient::UI::Inventory;
3169 3418
3170our @ISA = CFClient::UI::ScrolledWindow::; 3419our @ISA = CFClient::UI::ScrolledWindow::;
3171 3420
3172sub new { 3421sub new {
3173 my $class = shift; 3422 my $class = shift;
3174 3423
3175 my $self = $class->SUPER::new ( 3424 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_, 3426 @_,
3178 ); 3427 );
3179 3428
3180 $self 3429 $self
3181} 3430}
3182 3431
3183sub set_items { 3432sub set_items {
3184 my ($self, $items) = @_; 3433 my ($self, $items) = @_;
3185 3434
3186 $self->{scrolled}->clear; 3435 $self->{child}->clear;
3187 return unless $items; 3436 return unless $items;
3188 3437
3189 my @items = sort { 3438 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3439 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3440 or ($a->{name} cmp $b->{name})
… …
3195 3444
3196 my $row = 0; 3445 my $row = 0;
3197 for my $item (@items) { 3446 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3447 CFClient::Item::update_widgets $item;
3199 3448
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3449 $self->{child}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3450 $self->{child}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3451 $self->{child}->add (2, $row, $item->{weight_widget});
3203 3452
3204 $row++; 3453 $row++;
3205 } 3454 }
3206} 3455}
3207 3456
… …
3269 $self->update_binding_widgets; 3518 $self->update_binding_widgets;
3270 3519
3271 $self 3520 $self
3272} 3521}
3273 3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3274sub commit { 3535sub commit {
3275 my ($self) = @_; 3536 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding; 3537 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) { 3538 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3312 my ($self) = @_; 3573 my ($self) = @_;
3313 $self->ask_for_bind (1); 3574 $self->ask_for_bind (1);
3314} 3575}
3315 3576
3316sub ask_for_bind { 3577sub ask_for_bind {
3317 my ($self, $commit) = @_; 3578 my ($self, $commit, $end_cb) = @_;
3318 3579
3319 CFClient::Binder::open_binding_dialog (sub { 3580 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_; 3581 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets; 3583 $self->update_binding_widgets;
3323 $self->commit if $commit; 3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3324 }); 3586 });
3325} 3587}
3326 3588
3327# $mod and $sym are the modifiers and key symbol 3589# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands) 3590# $cmds is a array ref of strings (the commands)
… …
3346} 3608}
3347 3609
3348# this is a shortcut method that asks for a binding 3610# this is a shortcut method that asks for a binding
3349# and then just binds it. 3611# and then just binds it.
3350sub do_quick_binding { 3612sub do_quick_binding {
3351 my ($self, $cmds) = @_; 3613 my ($self, $cmds, $end_cb) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub { 3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1); 3615 $self->ask_for_bind (1, $end_cb);
3356} 3616}
3357 3617
3358sub update_binding_widgets { 3618sub update_binding_widgets {
3359 my ($self) = @_; 3619 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding; 3620 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3404 3664
3405############################################################################# 3665#############################################################################
3406 3666
3407package CFClient::UI::SpellList; 3667package CFClient::UI::SpellList;
3408 3668
3409our @ISA = CFClient::UI::ScrolledWindow::; 3669our @ISA = CFClient::UI::Table::;
3410 3670
3411sub new { 3671sub new {
3412 my $class = shift; 3672 my $class = shift;
3413 3673
3414 my $self = $class->SUPER::new ( 3674 my $self = $class->SUPER::new (
3415 binding => [], 3675 binding => [],
3416 commands => [], 3676 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3677 @_,
3419 ) 3678 )
3420} 3679}
3421 3680
3422# XXX: Do sorting? Argl... 3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693
3694sub rebuild_spell_list {
3695 my ($self) = @_;
3696
3697 $CFClient::UI::ROOT->on_refresh ($self => sub {
3698 $self->clear;
3699
3700 return unless $::CONN;
3701
3702 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708 my $row = 0;
3709
3710 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711 my $spell = $self->{spell}{$_};
3712
3713 $row++;
3714
3715 my $spell_cb = sub {
3716 my ($widget, $ev) = @_;
3717
3718 if ($ev->{button} == 1) {
3719 $::CONN->user_send ("cast $spell->{name}");
3720 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu
3724 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ],
3728 )->popup ($ev);
3729 } else {
3730 return 0;
3731 }
3732
3733 1
3734 };
3735
3736 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738 #TODO: add path info to tooltip
3739 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741 $self->add (0, $row, new CFClient::UI::Face
3742 face => $spell->{face},
3743 can_hover => 1,
3744 can_events => 1,
3745 tooltip => $tooltip,
3746 on_button_down => $spell_cb,
3747 );
3748
3749 $self->add (1, $row, new CFClient::UI::Label
3750 expand => 1,
3751 text => $spell->{name},
3752 can_hover => 1,
3753 can_events => 1,
3754 tooltip => $tooltip,
3755 on_button_down => $spell_cb,
3756 );
3757
3758 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762 }
3763 });
3764}
3765
3423sub add_spell { 3766sub add_spell {
3424 my ($self, $spell) = @_; 3767 my ($self, $spell) = @_;
3768
3425 $self->{spells}->{$spell->{name}} = $spell; 3769 $self->{spell}->{$spell->{name}} = $spell;
3426 3770 $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} 3771}
3455 3772
3456sub remove_spell { 3773sub remove_spell {
3457 my ($self, $spell) = @_; 3774 my ($self, $spell) = @_;
3775
3458 delete $self->{spells}->{$spell->{name}}; 3776 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3777 $self->rebuild_spell_list;
3460} 3778}
3461 3779
3780sub clear_spells {
3781 my ($self) = @_;
3782
3783 $self->{spell} = {};
3784 $self->rebuild_spell_list;
3785}
3786
3462############################################################################# 3787#############################################################################
3463 3788
3464package CFClient::UI::Root; 3789package CFClient::UI::Root;
3465 3790
3466our @ISA = CFClient::UI::Container::; 3791our @ISA = CFClient::UI::Container::;
3792
3793use List::Util qw(min max);
3467 3794
3468use CFClient::OpenGL; 3795use CFClient::OpenGL;
3469 3796
3470sub new { 3797sub new {
3471 my $class = shift; 3798 my $class = shift;
… …
3498 $coord = $max - $size if $coord > $max - $size; 3825 $coord = $max - $size if $coord > $max - $size;
3499 3826
3500 int $coord + 0.5 3827 int $coord + 0.5
3501} 3828}
3502 3829
3503sub size_allocate { 3830sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3831 my ($self, $w, $h) = @_;
3505 3832
3506 for my $child ($self->children) { 3833 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3834 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3835
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3839 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3840 $Y = _to_pixel $Y, $H, $self->{h};
3514 3841
3515 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
3516 } 3843 }
3844
3845 1
3517} 3846}
3518 3847
3519sub coord2local { 3848sub coord2local {
3520 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
3521 3850
… …
3606 3935
3607 delete $queue{$widget+0}; 3936 delete $queue{$widget+0};
3608 3937
3609 my ($w, $h) = $widget->size_request; 3938 my ($w, $h) = $widget->size_request;
3610 3939
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3940 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3941 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3942
3943 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3944 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3945
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3946 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3947 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3948
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3949 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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