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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.324 by root, Wed Jul 12 17:20:04 2006 UTC

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

Diff Legend

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