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.275 by root, Sat Jun 3 22:50:48 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#############################################################################
798 800
799# back-buffered drawing area 801# back-buffered drawing area
… …
815 817
816 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
817 $self->SUPER::update; 819 $self->SUPER::update;
818} 820}
819 821
820sub size_allocate { 822sub invoke_size_allocate {
821 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
822 824
823 $self->SUPER::size_allocate ($w, $h);
824 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
825} 828}
826 829
827sub _render { 830sub _render {
828 my ($self) = @_; 831 my ($self) = @_;
829 832
… …
856 my $tex = $self->{texture} 859 my $tex = $self->{texture}
857 or return; 860 or return;
858 861
859 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
862 865
863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864 867
865 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
866} 869}
… …
890 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
891 894
892 ($w, $h) 895 ($w, $h)
893} 896}
894 897
895sub size_allocate { 898sub invoke_size_allocate {
896 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
897 900
898 my $child = $self->child; 901 my $child = $self->child;
899 902
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902 905
903 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
904 $self->update; 907 $self->update;
908
909 1
905} 910}
906 911
907sub set_offset { 912sub set_offset {
908 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
909 914
… …
983 $self->add ($child) if $child; 988 $self->add ($child) if $child;
984 989
985 $self 990 $self
986} 991}
987 992
993#TODO# update range on size_allocate depending on child
994
988sub add { 995sub add {
989 my ($self, $widget) = @_; 996 my ($self, $widget) = @_;
990 997
991 $self->{vp}->add ($self->{child} = $widget); 998 $self->{vp}->add ($self->{child} = $widget);
992} 999}
993 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
994sub update { 1007sub update {
995 my ($self) = @_; 1008 my ($self) = @_;
996 1009
997 $self->SUPER::update; 1010 $self->SUPER::update;
998 1011
999 # todo: overwrite size_allocate of child 1012 $self->update_slider;
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1013}
1003 1014
1004sub size_allocate { 1015sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1016 my ($self, $w, $h) = @_;
1006 1017
1018 $self->update_slider;
1019
1007 $self->SUPER::size_allocate ($w, $h); 1020 $self->SUPER::invoke_size_allocate ($w, $h)
1008
1009 my $child = $self->{vp}->child;
1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1011} 1021}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1022
1016############################################################################# 1023#############################################################################
1017 1024
1018package CFClient::UI::Frame; 1025package CFClient::UI::Frame;
1019 1026
… …
1035 1042
1036 if ($self->{bg}) { 1043 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1044 my ($w, $h) = @$self{qw(w h)};
1038 1045
1039 glEnable GL_BLEND; 1046 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1047 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1048 glColor_premultiply @{ $self->{bg} };
1042 1049
1043 glBegin GL_QUADS; 1050 glBegin GL_QUADS;
1044 glVertex 0 , 0; 1051 glVertex 0 , 0;
1045 glVertex 0 , $h; 1052 glVertex 0 , $h;
1046 glVertex $w, $h; 1053 glVertex $w, $h;
… …
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1070 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);
1071 1078
1072sub new { 1079sub new {
1073 my ($class, %arg) = @_; 1080 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1076 1081
1077 my $self = $class->SUPER::new ( 1082 my $self = $class->SUPER::new (
1078 bg => [1, 1, 1, 1], 1083 bg => [1, 1, 1, 1],
1079 border_bg => [1, 1, 1, 1], 1084 border_bg => [1, 1, 1, 1],
1080 border => 0.6, 1085 border => 0.6,
… …
1082 min_w => 16, 1087 min_w => 16,
1083 min_h => 16, 1088 min_h => 16,
1084 %arg, 1089 %arg,
1085 ); 1090 );
1086 1091
1087 $self->{title} = new CFClient::UI::Label 1092 $self->{title_widget} = new CFClient::UI::Label
1088 align => 0, 1093 align => 0,
1089 valign => 1, 1094 valign => 1,
1090 text => $title, 1095 text => $self->{title},
1091 fontsize => $self->{border} 1096 fontsize => $self->{border},
1092 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 }
1093 1107
1094 $self 1108 $self
1095} 1109}
1096 1110
1097sub add { 1111sub add {
1098 my ($self, @widgets) = @_; 1112 my ($self, @widgets) = @_;
1099 1113
1100 $self->SUPER::add (@widgets); 1114 $self->SUPER::add (@widgets);
1115 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1116 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1102} 1117}
1103 1118
1104sub border { 1119sub border {
1105 int $_[0]{border} * $::FONTSIZE 1120 int $_[0]{border} * $::FONTSIZE
1106} 1121}
1107 1122
1108sub size_request { 1123sub size_request {
1109 my ($self) = @_; 1124 my ($self) = @_;
1110 1125
1111 $self->{title}->size_request 1126 $self->{title_widget}->size_request
1112 if $self->{title}; 1127 if $self->{title_widget};
1128
1129 $self->{close_button}->size_request
1130 if $self->{close_button};
1113 1131
1114 my ($w, $h) = $self->SUPER::size_request; 1132 my ($w, $h) = $self->SUPER::size_request;
1115 1133
1116 ( 1134 (
1117 $w + $self->border * 2, 1135 $w + $self->border * 2,
1118 $h + $self->border * 2, 1136 $h + $self->border * 2,
1119 ) 1137 )
1120} 1138}
1121 1139
1122sub size_allocate { 1140sub invoke_size_allocate {
1123 my ($self, $w, $h) = @_; 1141 my ($self, $w, $h) = @_;
1124 1142
1125 if ($self->{title}) { 1143 if ($self->{title_widget}) {
1126 $self->{title}{w} = $w; 1144 $self->{title_widget}{w} = $w;
1127 $self->{title}{h} = $h; 1145 $self->{title_widget}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h); 1146 $self->{title_widget}->invoke_size_allocate ($w, $h);
1129 } 1147 }
1130 1148
1131 my $border = $self->border; 1149 my $border = $self->border;
1132 1150
1133 $h -= List::Util::max 0, $border * 2; 1151 $h -= List::Util::max 0, $border * 2;
1134 $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;
1135 1166
1136 $self->child->configure ($border, $border, $w, $h); 1167 1
1137} 1168}
1138 1169
1139sub button_down { 1170sub invoke_button_down {
1140 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
1141 1172
1142 my ($w, $h) = @$self{qw(w h)}; 1173 my ($w, $h) = @$self{qw(w h)};
1143 my $border = $self->border; 1174 my $border = $self->border;
1144 1175
… …
1160 my $dy = $ev->{y} - $oy; 1191 my $dy = $ev->{y} - $oy;
1161 1192
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1193 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1194 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1195
1196 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1197 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1198 };
1168 1199
1169 } elsif ($lr ^ $td) { 1200 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1201 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1202 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1205 my ($ev, $x, $y) = @_;
1175 1206
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1207 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1208
1178 $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});
1179 }; 1212 };
1180 } else { 1213 } else {
1181 return 0; 1214 return 0;
1182 } 1215 }
1183 1216
1184 1 1217 1
1185} 1218}
1186 1219
1187sub button_up { 1220sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1189 1222
1190 !!delete $self->{motion} 1223 ! ! delete $self->{motion}
1191} 1224}
1192 1225
1193sub mouse_motion { 1226sub invoke_mouse_motion {
1194 my ($self, $ev, $x, $y) = @_; 1227 my ($self, $ev, $x, $y) = @_;
1195 1228
1196 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1229 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197 1230
1198 !!$self->{motion} 1231 ! ! $self->{motion}
1199} 1232}
1200 1233
1201sub _draw { 1234sub _draw {
1202 my ($self) = @_; 1235 my ($self) = @_;
1203 1236
… …
1229 1262
1230 glDisable GL_TEXTURE_2D; 1263 glDisable GL_TEXTURE_2D;
1231 1264
1232 $child->draw; 1265 $child->draw;
1233 1266
1234 if ($self->{title}) { 1267 if ($self->{title_widget}) {
1235 glTranslate 0, $border - $self->{h}; 1268 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw; 1269 $self->{title_widget}->_draw;
1270
1271 glTranslate 0, - ($border - $self->{h});
1237 } 1272 }
1273
1274 $self->{close_button}->draw
1275 if $self->{close_button};
1238} 1276}
1239 1277
1240############################################################################# 1278#############################################################################
1241 1279
1242package CFClient::UI::Table; 1280package CFClient::UI::Table;
… …
1265 1303
1266 $child->set_parent ($self); 1304 $child->set_parent ($self);
1267 $self->{children}[$y][$x] = $child; 1305 $self->{children}[$y][$x] = $child;
1268 1306
1269 $self->realloc; 1307 $self->realloc;
1308}
1309
1310sub remove {
1311 my ($self, $child) = @_;
1312
1313 # TODO: not yet implemented
1270} 1314}
1271 1315
1272# 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?
1273sub clear { 1317sub clear {
1274 my ($self) = @_; 1318 my ($self) = @_;
… …
1315 (sum @$ws), 1359 (sum @$ws),
1316 (sum @$hs), 1360 (sum @$hs),
1317 ) 1361 )
1318} 1362}
1319 1363
1320sub size_allocate { 1364sub invoke_size_allocate {
1321 my ($self, $w, $h) = @_; 1365 my ($self, $w, $h) = @_;
1322 1366
1323 my ($ws, $hs) = $self->get_wh; 1367 my ($ws, $hs) = $self->get_wh;
1324 1368
1325 my $req_w = (sum @$ws) || 1; 1369 my $req_w = (sum @$ws) || 1;
… …
1357 } 1401 }
1358 1402
1359 $y += $row_h; 1403 $y += $row_h;
1360 } 1404 }
1361 1405
1406 1
1362} 1407}
1363 1408
1364sub find_widget { 1409sub find_widget {
1365 my ($self, $x, $y) = @_; 1410 my ($self, $x, $y) = @_;
1366 1411
… …
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1448 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1449 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 ) 1450 )
1406} 1451}
1407 1452
1408sub size_allocate { 1453sub invoke_size_allocate {
1409 my ($self, $w, $h) = @_; 1454 my ($self, $w, $h) = @_;
1410 1455
1411 my $space = $self->{vertical} ? $h : $w; 1456 my $space = $self->{vertical} ? $h : $w;
1412 my $children = $self->{children}; 1457 my @children = $self->visible_children;
1413 1458
1414 my @req; 1459 my @req;
1415 1460
1416 if ($self->{homogeneous}) { 1461 if ($self->{homogeneous}) {
1417 @req = ($space / (@$children || 1)) x @$children; 1462 @req = ($space / (@children || 1)) x @children;
1418 } else { 1463 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1464 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1420 my $req = List::Util::sum @req; 1465 my $req = List::Util::sum @req;
1421 1466
1422 if ($req > $space) { 1467 if ($req > $space) {
1423 # ah well, not enough space 1468 # ah well, not enough space
1424 $_ *= $space / $req for @req; 1469 $_ *= $space / $req for @req;
1425 } else { 1470 } else {
1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1471 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1427 1472
1428 $space = ($space - $req) / $expand; # remaining space to give away 1473 $space = ($space - $req) / $expand; # remaining space to give away
1429 1474
1430 $req[$_] += $space * $children->[$_]{expand} 1475 $req[$_] += $space * $children[$_]{expand}
1431 for 0 .. $#$children; 1476 for 0 .. $#children;
1432 } 1477 }
1433 } 1478 }
1434 1479
1435 CFClient::UI::harmonize \@req; 1480 CFClient::UI::harmonize \@req;
1436 1481
1437 my $pos = 0; 1482 my $pos = 0;
1438 for (0 .. $#$children) { 1483 for (0 .. $#children) {
1439 my $alloc = $req[$_]; 1484 my $alloc = $req[$_];
1440 $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));
1441 1486
1442 $pos += $alloc; 1487 $pos += $alloc;
1443 } 1488 }
1444 1489
1445 1 1490 1
… …
1535 1580
1536 delete $self->{texture}; 1581 delete $self->{texture};
1537 $self->SUPER::update; 1582 $self->SUPER::update;
1538} 1583}
1539 1584
1585sub realloc {
1586 my ($self) = @_;
1587
1588 delete $self->{ox};
1589 $self->SUPER::realloc;
1590}
1591
1540sub set_text { 1592sub set_text {
1541 my ($self, $text) = @_; 1593 my ($self, $text) = @_;
1542 1594
1543 return if $self->{text} eq "T$text"; 1595 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1596 $self->{text} = "T$text";
1545 1597
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1598 $self->{layout}->set_text ($text);
1548 1599
1600 delete $self->{size_req};
1549 $self->realloc; 1601 $self->realloc;
1550 $self->update; 1602 $self->update;
1551} 1603}
1552 1604
1553sub set_markup { 1605sub set_markup {
… …
1556 return if $self->{text} eq "M$markup"; 1608 return if $self->{text} eq "M$markup";
1557 $self->{text} = "M$markup"; 1609 $self->{text} = "M$markup";
1558 1610
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1611 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1612
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1563 1614
1615 delete $self->{size_req};
1564 $self->realloc; 1616 $self->realloc;
1565 $self->update; 1617 $self->update;
1566} 1618}
1567 1619
1568sub size_request { 1620sub size_request {
1569 my ($self) = @_; 1621 my ($self) = @_;
1570 1622
1623 $self->{size_req} ||= do {
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1629
1577 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1578 1631
1579 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1580 $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);
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1636
1583 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1584 1638
1585 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1640 $h = List::Util::max $h, $h2;
1641 }
1642
1643 [$w, $h]
1587 } 1644 };
1588 1645
1589 ($w, $h) 1646 @{ $self->{size_req} }
1590} 1647}
1591 1648
1649sub baseline_shift {
1650 $_[0]{layout}->descent
1651}
1652
1592sub size_allocate { 1653sub invoke_size_allocate {
1593 my ($self, $w, $h) = @_; 1654 my ($self, $w, $h) = @_;
1594 1655
1595 delete $self->{ox}; 1656 delete $self->{ox};
1596 1657
1597 delete $self->{texture} 1658 delete $self->{texture}
1598 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
1599} 1662}
1600 1663
1601sub set_fontsize { 1664sub set_fontsize {
1602 my ($self, $fontsize) = @_; 1665 my ($self, $fontsize) = @_;
1603 1666
1604 $self->{fontsize} = $fontsize; 1667 $self->{fontsize} = $fontsize;
1668 delete $self->{size_req};
1605 delete $self->{texture}; 1669 delete $self->{texture};
1606 1670
1607 $self->realloc; 1671 $self->realloc;
1608} 1672}
1609 1673
1674sub reconfigure {
1675 my ($self) = @_;
1676
1677 delete $self->{size_req};
1678 delete $self->{texture};
1679
1680 $self->SUPER::reconfigure;
1681}
1682
1610sub _draw { 1683sub _draw {
1611 my ($self) = @_; 1684 my ($self) = @_;
1612 1685
1613 $self->SUPER::_draw; # draw background, if applicable 1686 $self->SUPER::_draw; # draw background, if applicable
1614 1687
1615 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1616 $self->{layout}->set_foreground (@{$self->{fg}}); 1689 $self->{layout}->set_foreground (@{$self->{fg}});
1617 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1618 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1619 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1695
1623 new_from_layout CFClient::Texture $self->{layout} 1696 [$self->{layout}->size]
1624 }; 1697 };
1625 1698
1626 unless (exists $self->{ox}) { 1699 unless (exists $self->{ox}) {
1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1629 : ($self->{w} - $tex->{w}) * 0.5); 1702 : ($self->{w} - $size->[0]) * 0.5);
1630 1703
1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1633 : ($self->{h} - $tex->{h}) * 0.5); 1706 : ($self->{h} - $size->[1]) * 0.5);
1634 }; 1707 };
1635 1708
1636 glEnable GL_TEXTURE_2D; 1709 my $w = List::Util::min $self->{w} + 4, $size->[0];
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1710 my $h = List::Util::min $self->{h} + 2, $size->[1];
1638 1711
1639 if ($tex->{format} == GL_ALPHA) { 1712 $self->{layout}->render ($self->{ox}, $self->{oy});
1640 glColor @{$self->{fg}};
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 }
1645
1646 glDisable GL_TEXTURE_2D;
1647} 1713}
1648 1714
1649############################################################################# 1715#############################################################################
1650 1716
1651package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
1665 can_hover => 1, 1731 can_hover => 1,
1666 can_focus => 1, 1732 can_focus => 1,
1667 valign => 0, 1733 valign => 0,
1668 can_events => 1, 1734 can_events => 1,
1669 #text => ... 1735 #text => ...
1736 #hidden => "*",
1670 @_ 1737 @_
1671 ) 1738 )
1672} 1739}
1673 1740
1674sub _set_text { 1741sub _set_text {
… …
1676 1743
1677 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1678 1745
1679 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1680 1747
1681 delete $self->{texture};
1682
1683 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 1749 $self->{text} = $text;
1685 1750
1686 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1688 1754
1689 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1690} 1759}
1691 1760
1692sub set_text { 1761sub set_text {
1693 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1694 1763
1695 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 1765 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 1766}
1700 1767
1701sub get_text { 1768sub get_text {
1702 $_[0]{text} 1769 $_[0]{text}
1703} 1770}
… …
1708 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1709 1776
1710 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1711} 1778}
1712 1779
1713sub key_down { 1780sub invoke_key_down {
1714 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1715 1782
1716 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1717 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1718 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1730 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1731 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1732 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1733 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1734 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1735 $self->_emit ('escape'); 1802 $self->emit ('escape');
1736 } elsif ($uni) { 1803 } elsif ($uni) {
1737 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else { 1805 } else {
1739 return 0; 1806 return 0;
1740 } 1807 }
… …
1744 $self->realloc; 1811 $self->realloc;
1745 1812
1746 1 1813 1
1747} 1814}
1748 1815
1749sub focus_in { 1816sub invoke_focus_in {
1750 my ($self) = @_; 1817 my ($self) = @_;
1751 1818
1752 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1753 1820
1754 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1755} 1822}
1756 1823
1757sub button_down { 1824sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1759 1826
1760 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1761 1828
1762 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1763 1830
1764 # byte-index to char-index 1831 # byte-index to char-index
1765 my $text = $self->{text}; 1832 my $text = $self->{text};
… …
1770 $self->update; 1837 $self->update;
1771 1838
1772 1 1839 1
1773} 1840}
1774 1841
1775sub mouse_motion { 1842sub invoke_mouse_motion {
1776 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1777# 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#
1778 1845
1779 0 1846 1
1780} 1847}
1781 1848
1782sub _draw { 1849sub _draw {
1783 my ($self) = @_; 1850 my ($self) = @_;
1784 1851
1785 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1786 1853
1787 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1788 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1789 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1790 } else { 1857 } else {
1791 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1792 } 1859 }
1793 1860
1794 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1795 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1796 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1797 glVertex 0 , 0; 1864 glVertex 0 , 0;
1798 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1799 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1800 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1825 1892
1826our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1827 1894
1828use CFClient::OpenGL; 1895use CFClient::OpenGL;
1829 1896
1830sub key_down { 1897sub invoke_key_down {
1831 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1832 1899
1833 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1834 1901
1835 if ($sym == 13) { 1902 if ($sym == 13) {
1836 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1837 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1838 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1839 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1840 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1841 $self->update; 1909 $self->update;
1842 1910
1843 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1844 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1845 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1861 } else { 1929 } else {
1862 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1863 } 1931 }
1864 1932
1865 } else { 1933 } else {
1866 return $self->SUPER::key_down ($ev) 1934 return $self->SUPER::invoke_key_down ($ev)
1867 } 1935 }
1868 1936
1869 1 1937 1
1870} 1938}
1871 1939
… …
1895 can_events => 1, 1963 can_events => 1,
1896 @_ 1964 @_
1897 ) 1965 )
1898} 1966}
1899 1967
1900sub activate { }
1901
1902sub button_up { 1968sub invoke_button_up {
1903 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1904 1970
1905 $self->emit ("activate") 1971 $self->emit ("activate")
1906 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1907 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
… …
1910} 1976}
1911 1977
1912sub _draw { 1978sub _draw {
1913 my ($self) = @_; 1979 my ($self) = @_;
1914 1980
1915 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1916
1917 if ($GRAB == $self) {
1918 $self->{fg} = $self->{active_fg};
1919 }
1920 1982
1921 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1923 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1924 1986
1925 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1926 1988
1927 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1928 1990
1929 $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
1930} 2028}
1931 2029
1932############################################################################# 2030#############################################################################
1933 2031
1934package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1961 my ($self) = @_; 2059 my ($self) = @_;
1962 2060
1963 (6) x 2 2061 (6) x 2
1964} 2062}
1965 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
1966sub button_down { 2072sub invoke_button_down {
1967 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
1968 2074
1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1971 $self->{state} = !$self->{state}; 2077 $self->toggle;
1972 $self->_emit (changed => $self->{state});
1973 } else { 2078 } else {
1974 return 0 2079 return 0
1975 } 2080 }
1976 2081
1977 1 2082 1
… …
2002package CFClient::UI::Image; 2107package CFClient::UI::Image;
2003 2108
2004our @ISA = CFClient::UI::Base::; 2109our @ISA = CFClient::UI::Base::;
2005 2110
2006use CFClient::OpenGL; 2111use CFClient::OpenGL;
2007use Carp qw/confess/;
2008 2112
2009our %loaded_images; 2113our %texture_cache;
2010 2114
2011sub new { 2115sub new {
2012 my $class = shift; 2116 my $class = shift;
2013 2117
2014 my $self = $class->SUPER::new (can_events => 0, @_); 2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
2015 2122
2016 $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";
2017 2125
2018 $loaded_images{$self->{image}} ||= 2126 $self->{tex} = $texture_cache{$self->{path}} ||=
2019 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;
2020 2128
2021 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2022 2130
2023 Scalar::Util::weaken $loaded_images{$self->{image}}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2024
2025 $self->{aspect} = $tex->{w} / $tex->{h};
2026 2132
2027 $self 2133 $self
2028} 2134}
2029 2135
2030sub size_request { 2136sub size_request {
2031 my ($self) = @_; 2137 my ($self) = @_;
2032 2138
2033 ($self->{tex}->{w}, $self->{tex}->{h}) 2139 ($self->{tex}{w}, $self->{tex}{h})
2034} 2140}
2035 2141
2036sub _draw { 2142sub _draw {
2037 my ($self) = @_; 2143 my ($self) = @_;
2038 2144
… …
2147 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2148 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2149 2255
2150 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2151 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);
2152 2261
2153 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2154 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;
2155 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2266 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157 2267
2158 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2268 glBindTexture GL_TEXTURE_2D, $t1->{name};
2159 glBegin GL_QUADS; 2269 glBegin GL_QUADS;
… …
2174 2284
2175 if ($t3) { 2285 if ($t3) {
2176 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2177 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2178 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2179 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2180 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2181 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2182 glEnd; 2292 glEnd;
2183 } 2293 }
2184 2294
2185 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
2273 $self->update; 2383 $self->update;
2274 2384
2275 $self 2385 $self
2276} 2386}
2277 2387
2278sub changed { }
2279
2280sub set_range { 2388sub set_range {
2281 my ($self, $range) = @_; 2389 my ($self, $range) = @_;
2282 2390
2283 ($range, $self->{range}) = ($self->{range}, $range); 2391 ($range, $self->{range}) = ($self->{range}, $range);
2284 2392
2285 $self->update
2286 if "@$range" ne "@{$self->{range}}"; 2393 if ("@$range" ne "@{$self->{range}}") {
2394 $self->update;
2395 $self->set_value ($self->{range}[0]);
2396 }
2287} 2397}
2288 2398
2289sub set_value { 2399sub set_value {
2290 my ($self, $value) = @_; 2400 my ($self, $value) = @_;
2291 2401
… …
2302 if $unit; 2412 if $unit;
2303 2413
2304 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2414 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2305 2415
2306 if ($value != $old_value) { 2416 if ($value != $old_value) {
2307 $self->_emit (changed => $value); 2417 $self->emit (changed => $value);
2308 $self->update; 2418 $self->update;
2309 } 2419 }
2310} 2420}
2311 2421
2312sub size_request { 2422sub size_request {
2313 my ($self) = @_; 2423 my ($self) = @_;
2314 2424
2315 ($self->{req_w}, $self->{req_h}) 2425 ($self->{req_w}, $self->{req_h})
2316} 2426}
2317 2427
2318sub button_down { 2428sub invoke_button_down {
2319 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2320 2430
2321 $self->SUPER::button_down ($ev, $x, $y); 2431 $self->SUPER::invoke_button_down ($ev, $x, $y);
2322 2432
2323 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2433 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2324 2434
2325 $self->mouse_motion ($ev, $x, $y) 2435 $self->invoke_mouse_motion ($ev, $x, $y)
2326} 2436}
2327 2437
2328sub mouse_motion { 2438sub invoke_mouse_motion {
2329 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2330 2440
2331 if ($GRAB == $self) { 2441 if ($GRAB == $self) {
2332 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2442 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2333 2443
… …
2438sub set_range { shift->{slider}->set_range (@_) } 2548sub set_range { shift->{slider}->set_range (@_) }
2439sub set_value { shift->{slider}->set_value (@_) } 2549sub set_value { shift->{slider}->set_value (@_) }
2440 2550
2441############################################################################# 2551#############################################################################
2442 2552
2443package CFClient::UI::TextView; 2553package CFClient::UI::TextScroller;
2444 2554
2445our @ISA = CFClient::UI::HBox::; 2555our @ISA = CFClient::UI::HBox::;
2446 2556
2447use CFClient::OpenGL; 2557use CFClient::OpenGL;
2448 2558
… …
2450 my $class = shift; 2560 my $class = shift;
2451 2561
2452 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2453 fontsize => 1, 2563 fontsize => 1,
2454 can_events => 0, 2564 can_events => 0,
2565 indent => 0,
2455 #font => default_font 2566 #font => default_font
2456 @_, 2567 @_,
2457 2568
2458 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2459 par => [], 2570 par => [],
2460 height => 0, 2571 height => 0,
2461 children => [ 2572 children => [
2462 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2463 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
… …
2474 2585
2475 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2476 $self->reflow; 2587 $self->reflow;
2477} 2588}
2478 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
2479sub size_allocate { 2599sub invoke_size_allocate {
2480 my ($self, $w, $h) = @_; 2600 my ($self, $w, $h) = @_;
2481 2601
2482 $self->SUPER::size_allocate ($w, $h); 2602 my ($empty, $slider, @other) = @{ $self->{children} };
2603 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2483 2604
2484 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2605 $self->{layout}->set_font ($self->{font}) if $self->{font};
2485 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2606 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2486 $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});
2487 2609
2488 $self->reflow; 2610 $self->reflow;
2489}
2490 2611
2491sub text_size { 2612 local $self->{children} = [$empty, $slider];
2492 my ($self, $text, $indent) = @_; 2613 $self->SUPER::invoke_size_allocate ($w, $h)
2614}
2615
2616sub get_layout {
2617 my ($self, $para) = @_;
2493 2618
2494 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2495 2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622 $layout->set_foreground (@{$para->{fg}});
2496 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2623 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $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});
2498 $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}}
2499 2632 );
2633
2500 $layout->size 2634 $layout
2501} 2635}
2502 2636
2503sub reflow { 2637sub reflow {
2504 my ($self) = @_; 2638 my ($self) = @_;
2505 2639
… …
2514 $self->{children}[1]->set_value ($offset); 2648 $self->{children}[1]->set_value ($offset);
2515} 2649}
2516 2650
2517sub clear { 2651sub clear {
2518 my ($self) = @_; 2652 my ($self) = @_;
2653
2654 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other;
2519 2656
2520 $self->{par} = []; 2657 $self->{par} = [];
2521 $self->{height} = 0; 2658 $self->{height} = 0;
2522 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2523} 2660}
2524 2661
2525sub add_paragraph { 2662sub add_paragraph {
2526 my ($self, $color, $text, $indent) = @_; 2663 my ($self, $color, $para, $indent) = @_;
2527 2664
2528 for my $line (split /\n/, $text) { 2665 my ($text, @w) = ref $para ? @$para : $para;
2529 my ($w, $h) = $self->text_size ($line); 2666
2530 $self->{height} += $h; 2667 $para = {
2531 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,
2532 } 2674 };
2533 2675
2534 $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;
2535} 2688}
2536 2689
2537sub update { 2690sub update {
2538 my ($self) = @_; 2691 my ($self) = @_;
2539 2692
… …
2541 2694
2542 return unless $self->{h} > 0; 2695 return unless $self->{h} > 0;
2543 2696
2544 delete $self->{texture}; 2697 delete $self->{texture};
2545 2698
2546 $ROOT->on_post_alloc ($self, sub { 2699 $ROOT->on_post_alloc ($self => sub {
2547 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2548 2701
2549 if (delete $self->{need_reflow}) { 2702 if (delete $self->{need_reflow}) {
2550 my $height = 0; 2703 my $height = 0;
2551 2704
2552 my $layout = $self->{layout};
2553
2554 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2555
2556 for (@{$self->{par}}) { 2705 for my $para (@{$self->{par}}) {
2557 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2558 $layout->set_width ($W - $_->[3]); 2707 my $layout = $self->get_layout ($para);
2559 $layout->set_markup ($_->[4]);
2560 my ($w, $h) = $layout->size; 2708 my ($w, $h) = $layout->size;
2561 $_->[0] = $w + $_->[3]; 2709
2562 $_->[1] = $h; 2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2563 } 2713 }
2564 2714
2565 $height += $_->[1]; 2715 $height += $para->{h};
2566 } 2716 }
2567 2717
2568 $self->{height} = $height; 2718 $self->{height} = $height;
2569 2719
2570 $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]);
2571 2721
2572 delete $self->{texture}; 2722 delete $self->{texture};
2573 } 2723 }
2574 2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2727 }
2728
2575 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2576 glClearColor 0.5, 0.5, 0.5, 0; 2730 glClearColor 0, 0, 0, 0;
2577 glClear GL_COLOR_BUFFER_BIT; 2731 glClear GL_COLOR_BUFFER_BIT;
2578 2732
2579 my $top = int $self->{children}[1]{range}[0]; 2733 my $top = int $self->{children}[1]{range}[0];
2580 2734
2581 my $y0 = $top; 2735 my $y0 = $top;
2582 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2583 2737
2584 my $y = 0; 2738 my $y = 0;
2585 2739
2586 my $layout = $self->{layout};
2587
2588 $layout->set_font ($self->{font}) if $self->{font};
2589
2590 glEnable GL_BLEND;
2591 #TODO# not correct in windows where rgba is forced off
2592 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2593
2594 for my $par (@{$self->{par}}) { 2740 for my $para (@{$self->{par}}) {
2595 my $h = $par->[1]; 2741 my $h = $para->{h};
2596 2742
2597 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2598 $layout->set_foreground (@{ $par->[2] });
2599 $layout->set_width ($W - $par->[3]);
2600 $layout->set_markup ($par->[4]);
2601 2744
2602 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2745 my $layout = $self->get_layout ($para);
2603 2746
2604 glRasterPos $par->[3], $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2605 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 }
2606 } 2761 }
2607 2762
2608 $y += $h; 2763 $y += $h;
2609 } 2764 }
2610
2611 glDisable GL_BLEND;
2612 }; 2765 };
2613 }); 2766 });
2614} 2767}
2615 2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2776}
2777
2616sub _draw { 2778sub _draw {
2617 my ($self) = @_; 2779 my ($self) = @_;
2618 2780
2619 glEnable GL_TEXTURE_2D; 2781 glEnable GL_TEXTURE_2D;
2620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2621 glColor 1, 1, 1, 1; 2783 glColor 0, 0, 0, 1;
2622 $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});
2623 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2624 2786
2625 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2626
2627} 2788}
2628 2789
2629############################################################################# 2790#############################################################################
2630 2791
2631package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2718 $tooltip .= "\n\n" . (ref $widget) . "\n" 2879 $tooltip .= "\n\n" . (ref $widget) . "\n"
2719 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2880 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2720 . "req $widget->{req_w} $widget->{req_h}\n" 2881 . "req $widget->{req_w} $widget->{req_h}\n"
2721 . "visible $widget->{visible}"; 2882 . "visible $widget->{visible}";
2722 } 2883 }
2884
2885 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//;
2723 2887
2724 $self->add (new CFClient::UI::Label 2888 $self->add (new CFClient::UI::Label
2725 markup => $tooltip, 2889 markup => $tooltip,
2726 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2727 fontsize => 0.8, 2891 fontsize => 0.8,
… …
2737 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2738 2902
2739 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2740} 2904}
2741 2905
2742sub size_allocate { 2906sub invoke_size_allocate {
2743 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2744 2908
2745 $self->SUPER::size_allocate ($w - 4, $h - 4); 2909 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2746} 2910}
2747 2911
2748sub visibility_change { 2912sub invoke_visibility_change {
2749 my ($self, $visible) = @_; 2913 my ($self, $visible) = @_;
2750 2914
2751 return unless $visible; 2915 return unless $visible;
2752 2916
2753 $self->{root}->on_post_alloc ("move_$self" => sub { 2917 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2755 or return; 2919 or return;
2756 2920
2757 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2758 2922
2759 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2760 if $x + $self->{w} > $::WIDTH; 2924 if $x + $self->{w} > $self->{root}{w};
2761 2925
2762 $self->move_abs ($x, $y); 2926 $self->move_abs ($x, $y);
2763 }); 2927 });
2764} 2928}
2765 2929
… …
2854 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2855 3019
2856 if ($tex) { 3020 if ($tex) {
2857 glEnable GL_TEXTURE_2D; 3021 glEnable GL_TEXTURE_2D;
2858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2859 glColor 1, 1, 1, 1; 3023 glColor 0, 0, 0, 1;
2860 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3024 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2861 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2862 } 3026 }
2863} 3027}
2864 3028
2865sub DESTROY { 3029sub destroy {
2866 my ($self) = @_; 3030 my ($self) = @_;
2867 3031
2868 $self->{timer}->cancel 3032 $self->{timer}->cancel
2869 if $self->{timer}; 3033 if $self->{timer};
2870 3034
2871 $self->SUPER::DESTROY; 3035 $self->SUPER::destroy;
2872} 3036}
2873 3037
2874############################################################################# 3038#############################################################################
2875 3039
2876package CFClient::UI::Buttonbar; 3040package CFClient::UI::Buttonbar;
… …
2897 ); 3061 );
2898 3062
2899 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3063 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2900 3064
2901 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
2902 my ($widget, $cb) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
2903 3067
2904 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
2905 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 {
2906 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2907 can_hover => 1, 3085 can_hover => 1,
2908 can_events => 1, 3086 can_events => 1,
2909 text => $widget; 3087 markup => $widget,
3088 tooltip => $tooltip;
3089 }
2910 } 3090 }
2911 3091
2912 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
2913 3093
2914 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
2919 3099
2920# 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)
2921sub popup { 3101sub popup {
2922 my ($self, $ev) = @_; 3102 my ($self, $ev) = @_;
2923 3103
2924 $self->_emit ("popdown"); 3104 $self->emit ("popdown");
2925 3105
2926 # maybe save $GRAB? must be careful about events... 3106 # maybe save $GRAB? must be careful about events...
2927 $GRAB = $self; 3107 $GRAB = $self;
2928 $self->{button} = $ev->{button}; 3108 $self->{button} = $ev->{button};
2929 3109
2930 $self->show; 3110 $self->show;
2931 $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);
2932} 3112}
2933 3113
2934sub mouse_motion { 3114sub invoke_mouse_motion {
2935 my ($self, $ev, $x, $y) = @_; 3115 my ($self, $ev, $x, $y) = @_;
2936 3116
2937 # TODO: should use vbox->find_widget or so 3117 # TODO: should use vbox->find_widget or so
2938 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3118 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2939 $self->{hover} = $self->{item}{$HOVER}; 3119 $self->{hover} = $self->{item}{$HOVER};
2940 3120
2941 0 3121 0
2942} 3122}
2943 3123
2944sub button_up { 3124sub invoke_button_up {
2945 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2946 3126
2947 if ($ev->{button} == $self->{button}) { 3127 if ($ev->{button} == $self->{button}) {
2948 undef $GRAB; 3128 undef $GRAB;
2949 $self->hide; 3129 $self->hide;
2950 3130
2951 $self->_emit ("popdown"); 3131 $self->emit ("popdown");
2952 $self->{hover}[1]->() if $self->{hover}; 3132 $self->{hover}[1]->() if $self->{hover};
2953 } else { 3133 } else {
2954 return 0 3134 return 0
2955 } 3135 }
2956 3136
… …
2983 3163
2984 $self->{current} = $self->{children}[0] 3164 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} }; 3165 if @{ $self->{children} };
2986} 3166}
2987 3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3172}
3173
2988sub set_current_page { 3174sub set_current_page {
2989 my ($self, $page_or_widget) = @_; 3175 my ($self, $page_or_widget) = @_;
2990 3176
2991 my $widget = ref $page_or_widget 3177 my $widget = ref $page_or_widget
2992 ? $page_or_widget 3178 ? $page_or_widget
2993 : $self->{children}[$page_or_widget]; 3179 : $self->{children}[$page_or_widget];
2994 3180
2995 $self->{current} = $widget; 3181 $self->{current} = $widget;
2996 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3182 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2997 3183
2998 $self->_emit (page_changed => $self->{current}); 3184 $self->emit (page_changed => $self->{current});
2999 3185
3000 $self->realloc; 3186 $self->realloc;
3001} 3187}
3002 3188
3003sub visible_children { 3189sub visible_children {
… …
3008 my ($self) = @_; 3194 my ($self) = @_;
3009 3195
3010 $self->{current}->size_request 3196 $self->{current}->size_request
3011} 3197}
3012 3198
3013sub size_allocate { 3199sub invoke_size_allocate {
3014 my ($self, $w, $h) = @_; 3200 my ($self, $w, $h) = @_;
3015 3201
3016 $self->{current}->configure (0, 0, $w, $h); 3202 $self->{current}->configure (0, 0, $w, $h);
3203
3204 1
3017} 3205}
3018 3206
3019sub _draw { 3207sub _draw {
3020 my ($self) = @_; 3208 my ($self) = @_;
3021 3209
… …
3056 ); 3244 );
3057 3245
3058 $self->{multiplexer}->add ($widget); 3246 $self->{multiplexer}->add ($widget);
3059} 3247}
3060 3248
3249sub get_current_page {
3250 my ($self) = @_;
3251
3252 $self->{multiplexer}->get_current_page
3253}
3254
3061sub set_current_page { 3255sub set_current_page {
3062 my ($self, $page) = @_; 3256 my ($self, $page) = @_;
3063 3257
3064 $self->{multiplexer}->set_current_page ($page); 3258 $self->{multiplexer}->set_current_page ($page);
3065 $self->_emit (page_changed => $self->{multiplexer}{current}); 3259 $self->emit (page_changed => $self->{multiplexer}{current});
3066} 3260}
3067 3261
3068############################################################################# 3262#############################################################################
3069 3263
3070package CFClient::UI::Statusbox; 3264package CFClient::UI::Combobox;
3071 3265
3266use utf8;
3267
3072our @ISA = CFClient::UI::VBox::; 3268our @ISA = CFClient::UI::Button::;
3073 3269
3074sub new { 3270sub new {
3075 my $class = shift; 3271 my $class = shift;
3076 3272
3077 $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 (
3078 fontsize => 0.8, 3328 fontsize => 0.8,
3079 @_, 3329 @_,
3080 ) 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
3081} 3337}
3082 3338
3083sub reorder { 3339sub reorder {
3084 my ($self) = @_; 3340 my ($self) = @_;
3085 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} };
3086 3347
3087 while (my ($k, $v) = each %{ $self->{item} }) { 3348 while (my ($k, $v) = each %{ $self->{item} }) {
3088 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3349 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3089 } 3350 }
3090 3351
… …
3093 my @items = sort { 3354 my @items = sort {
3094 $a->{pri} <=> $b->{pri} 3355 $a->{pri} <=> $b->{pri}
3095 or $b->{id} <=> $a->{id} 3356 or $b->{id} <=> $a->{id}
3096 } values %{ $self->{item} }; 3357 } values %{ $self->{item} };
3097 3358
3359 $self->{timer}->interval (1);
3360
3098 my $count = 10 + 1; 3361 my $count = 10 + 1;
3099 for my $item (@items) { 3362 for my $item (@items) {
3100 last unless --$count; 3363 last unless --$count;
3101 3364
3102 push @widgets, $item->{label} ||= do { 3365 my $label = $item->{label} ||= do {
3103 # TODO: doesn't handle markup well (read as: at all) 3366 # TODO: doesn't handle markup well (read as: at all)
3104 my $short = $item->{count} > 1 3367 my $short = $item->{count} > 1
3105 ? "<b>$item->{count} ×</b> $item->{text}" 3368 ? "<b>$item->{count} ×</b> $item->{text}"
3106 : $item->{text}; 3369 : $item->{text};
3107 3370
… …
3115 tooltip => $item->{tooltip}, 3378 tooltip => $item->{tooltip},
3116 tooltip_font => $::FONT_PROP, 3379 tooltip_font => $::FONT_PROP,
3117 tooltip_width => 0.67, 3380 tooltip_width => 0.67,
3118 fontsize => $item->{fontsize} || $self->{fontsize}, 3381 fontsize => $item->{fontsize} || $self->{fontsize},
3119 max_w => $::WIDTH * 0.44, 3382 max_w => $::WIDTH * 0.44,
3120 fg => $item->{fg}, 3383 fg => [@{ $item->{fg} }],
3121 can_events => 1, 3384 can_events => 1,
3122 can_hover => 1 3385 can_hover => 1
3123 }; 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;
3124 } 3399 }
3125 3400
3126 $self->clear; 3401 $self->clear;
3127 $self->SUPER::add (reverse @widgets); 3402 $self->SUPER::add (reverse @widgets);
3128} 3403}
… …
3133 $text =~ s/^\s+//; 3408 $text =~ s/^\s+//;
3134 $text =~ s/\s+$//; 3409 $text =~ s/\s+$//;
3135 3410
3136 return unless $text; 3411 return unless $text;
3137 3412
3138 my $timeout = time + ((delete $arg{timeout}) || 60); 3413 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3139 3414
3140 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3415 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3141 3416
3142 if (my $item = $self->{item}{$group}) { 3417 if (my $item = $self->{item}{$group}) {
3143 if ($item->{text} eq $text) { 3418 if ($item->{text} eq $text) {
3144 $item->{count}++; 3419 $item->{count}++;
3145 } else { 3420 } else {
3146 $item->{count} = 1; 3421 $item->{count} = 1;
3147 $item->{text} = $item->{tooltip} = $text; 3422 $item->{text} = $item->{tooltip} = $text;
3148 } 3423 }
3149 $item->{id} = ++$self->{id}; 3424 $item->{id} += 0.2;#d#
3150 $item->{timeout} = $timeout; 3425 $item->{timeout} = $timeout;
3151 delete $item->{label}; 3426 delete $item->{label};
3152 } else { 3427 } else {
3153 $self->{item}{$group} = { 3428 $self->{item}{$group} = {
3154 id => ++$self->{id}, 3429 id => ++$self->{id},
… …
3160 count => 1, 3435 count => 1,
3161 %arg, 3436 %arg,
3162 }; 3437 };
3163 } 3438 }
3164 3439
3440 $ROOT->on_refresh (reorder => sub {
3165 $self->reorder; 3441 $self->reorder;
3442 });
3166} 3443}
3167 3444
3168sub reconfigure { 3445sub reconfigure {
3169 my ($self) = @_; 3446 my ($self) = @_;
3170 3447
… …
3173 3450
3174 $self->reorder; 3451 $self->reorder;
3175 $self->SUPER::reconfigure; 3452 $self->SUPER::reconfigure;
3176} 3453}
3177 3454
3455sub destroy {
3456 my ($self) = @_;
3457
3458 $self->{timer}->cancel;
3459
3460 $self->SUPER::destroy;
3461}
3462
3178############################################################################# 3463#############################################################################
3179 3464
3180package CFClient::UI::Inventory; 3465package CFClient::UI::Inventory;
3181 3466
3182our @ISA = CFClient::UI::ScrolledWindow::; 3467our @ISA = CFClient::UI::Table::;
3183 3468
3184sub new { 3469sub new {
3185 my $class = shift; 3470 my $class = shift;
3186 3471
3187 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3188 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3473 col_expand => [0, 1, 0],
3189 @_, 3474 @_,
3190 ); 3475 );
3191 3476
3192 $self 3477 $self
3193} 3478}
3194 3479
3195sub set_items { 3480sub set_items {
3196 my ($self, $items) = @_; 3481 my ($self, $items) = @_;
3197 3482
3198 $self->{child}->clear; 3483 $self->clear;
3199 return unless $items; 3484 return unless $items;
3200 3485
3201 my @items = sort { 3486 my @items = sort {
3202 ($a->{type} <=> $b->{type}) 3487 ($a->{type} <=> $b->{type})
3203 or ($a->{name} cmp $b->{name}) 3488 or ($a->{name} cmp $b->{name})
3204 } @$items; 3489 } values %$items;
3205 3490
3206 $self->{real_items} = \@items; 3491 $self->{real_items} = \@items;
3207 3492
3208 my $row = 0; 3493 my $row = 0;
3209 for my $item (@items) { 3494 for my $item (@items) {
3210 CFClient::Item::update_widgets $item; 3495 CFClient::Item::update_widgets $item;
3211 3496
3212 $self->{child}->add (0, $row, $item->{face_widget}); 3497 $self->add (0, $row, $item->{face_widget});
3213 $self->{child}->add (1, $row, $item->{desc_widget}); 3498 $self->add (1, $row, $item->{desc_widget});
3214 $self->{child}->add (2, $row, $item->{weight_widget}); 3499 $self->add (2, $row, $item->{weight_widget});
3215 3500
3216 $row++; 3501 $row++;
3217 }
3218}
3219
3220#############################################################################
3221
3222package CFClient::UI::BindEditor;
3223
3224our @ISA = CFClient::UI::FancyFrame::;
3225
3226sub new {
3227 my $class = shift;
3228
3229 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3230
3231 $self->add (my $vb = new CFClient::UI::VBox);
3232
3233
3234 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3235 text => "start recording",
3236 tooltip => "Start/Stops recording of actions."
3237 ."All subsequent actions after the recording started will be captured."
3238 ."The actions are displayed after the record was stopped."
3239 ."To bind the action you have to click on the 'Bind' button",
3240 on_activate => sub {
3241 unless ($self->{recording}) {
3242 $self->start;
3243 } else {
3244 $self->stop;
3245 }
3246 });
3247
3248 $vb->add (new CFClient::UI::Label text => "Actions:");
3249 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3250
3251 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3252 $vb->add (my $hb = new CFClient::UI::HBox);
3253 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3254 $hb->add (new CFClient::UI::Button
3255 text => "bind",
3256 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3257 on_activate => sub {
3258 $self->ask_for_bind;
3259 });
3260
3261 $vb->add (my $hb = new CFClient::UI::HBox);
3262 $hb->add (new CFClient::UI::Button
3263 text => "ok",
3264 expand => 1,
3265 tooltip => "This closes the binding editor and saves the binding",
3266 on_activate => sub {
3267 $self->hide;
3268 $self->commit;
3269 });
3270
3271 $hb->add (new CFClient::UI::Button
3272 text => "cancel",
3273 expand => 1,
3274 tooltip => "This closes the binding editor without saving",
3275 on_activate => sub {
3276 $self->hide;
3277 $self->{binding_cancel}->()
3278 if $self->{binding_cancel};
3279 });
3280
3281 $self->update_binding_widgets;
3282
3283 $self
3284}
3285
3286sub commit {
3287 my ($self) = @_;
3288 my ($mod, $sym, $cmds) = $self->get_binding;
3289 if ($sym != 0 && @$cmds > 0) {
3290 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3291 ."'. Don't forget 'Save Config'!");
3292 $self->{binding_change}->($mod, $sym, $cmds)
3293 if $self->{binding_change};
3294 } else {
3295 $::STATUSBOX->add ("No action bound, no key or action specified!");
3296 $self->{binding_cancel}->()
3297 if $self->{binding_cancel};
3298 }
3299}
3300
3301sub start {
3302 my ($self) = @_;
3303
3304 $self->{rec_btn}->set_text ("stop recording");
3305 $self->{recording} = 1;
3306 $self->clear_command_list;
3307 $::CONN->start_record if $::CONN;
3308}
3309
3310sub stop {
3311 my ($self) = @_;
3312
3313 $self->{rec_btn}->set_text ("start recording");
3314 $self->{recording} = 0;
3315
3316 my $rec;
3317 $rec = $::CONN->stop_record if $::CONN;
3318 return unless ref $rec eq 'ARRAY';
3319 $self->set_command_list ($rec);
3320}
3321
3322
3323sub ask_for_bind_and_commit {
3324 my ($self) = @_;
3325 $self->ask_for_bind (1);
3326}
3327
3328sub ask_for_bind {
3329 my ($self, $commit) = @_;
3330
3331 CFClient::Binder::open_binding_dialog (sub {
3332 my ($mod, $sym) = @_;
3333 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3334 $self->update_binding_widgets;
3335 $self->commit if $commit;
3336 });
3337}
3338
3339# $mod and $sym are the modifiers and key symbol
3340# $cmds is a array ref of strings (the commands)
3341# $cb is the callback that is executed on OK
3342# $ccb is the callback that is executed on CANCEL and
3343# when the binding was unsuccessful on OK
3344sub set_binding {
3345 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3346
3347 $self->clear_command_list;
3348 $self->{recording} = 0;
3349 $self->{rec_btn}->set_text ("start recording");
3350
3351 $self->{binding} = [$mod, $sym];
3352 $self->{commands} = $cmds;
3353
3354 $self->{binding_change} = $cb;
3355 $self->{binding_cancel} = $ccb;
3356
3357 $self->update_binding_widgets;
3358}
3359
3360# this is a shortcut method that asks for a binding
3361# and then just binds it.
3362sub do_quick_binding {
3363 my ($self, $cmds) = @_;
3364 $self->set_binding (undef, undef, $cmds, sub {
3365 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3366 });
3367 $self->ask_for_bind (1);
3368}
3369
3370sub update_binding_widgets {
3371 my ($self) = @_;
3372 my ($mod, $sym, $cmds) = $self->get_binding;
3373 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3374 $self->set_command_list ($cmds);
3375}
3376
3377sub get_binding {
3378 my ($self) = @_;
3379 return (
3380 $self->{binding}->[0],
3381 $self->{binding}->[1],
3382 [ grep { defined $_ } @{$self->{commands}} ]
3383 );
3384}
3385
3386sub clear_command_list {
3387 my ($self) = @_;
3388 $self->{cmdbox}->clear ();
3389}
3390
3391sub set_command_list {
3392 my ($self, $cmds) = @_;
3393
3394 $self->{cmdbox}->clear ();
3395 $self->{commands} = $cmds;
3396
3397 my $idx = 0;
3398
3399 for (@$cmds) {
3400 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3401
3402 my $i = $idx;
3403 $hb->add (new CFClient::UI::Label text => $_);
3404 $hb->add (new CFClient::UI::Button
3405 text => "delete",
3406 tooltip => "Deletes the action from the record",
3407 on_activate => sub {
3408 $self->{cmdbox}->remove ($hb);
3409 $cmds->[$i] = undef;
3410 });
3411
3412
3413 $idx++
3414 } 3502 }
3415} 3503}
3416 3504
3417############################################################################# 3505#############################################################################
3418 3506
… …
3428 commands => [], 3516 commands => [],
3429 @_, 3517 @_,
3430 ) 3518 )
3431} 3519}
3432 3520
3433# 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
3434sub add_spell { 3606sub add_spell {
3435 my ($self, $spell) = @_; 3607 my ($self, $spell) = @_;
3608
3436 $self->{spells}->{$spell->{name}} = $spell; 3609 $self->{spell}->{$spell->{name}} = $spell;
3437 3610 $self->rebuild_spell_list;
3438 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3439 face => $spell->{face},
3440 can_hover => 1,
3441 can_events => 1,
3442 tooltip => $spell->{message});
3443
3444 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3445 text => $spell->{name},
3446 can_hover => 1,
3447 can_events => 1,
3448 tooltip => $spell->{message},
3449 expand => 1);
3450
3451 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3452 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3453 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3454 expand => 1);
3455
3456 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3457 text => "bind to key",
3458 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3459}
3460
3461sub rebuild_spell_list {
3462 my ($self) = @_;
3463 $self->{tbl_idx} = 0;
3464 $self->add_spell ($_) for values %{$self->{spells}};
3465} 3611}
3466 3612
3467sub remove_spell { 3613sub remove_spell {
3468 my ($self, $spell) = @_; 3614 my ($self, $spell) = @_;
3615
3469 delete $self->{spells}->{$spell->{name}}; 3616 delete $self->{spell}->{$spell->{name}};
3470 $self->rebuild_spell_list; 3617 $self->rebuild_spell_list;
3471} 3618}
3472 3619
3620sub clear_spells {
3621 my ($self) = @_;
3622
3623 $self->{spell} = {};
3624 $self->rebuild_spell_list;
3625}
3626
3473############################################################################# 3627#############################################################################
3474 3628
3475package CFClient::UI::Root; 3629package CFClient::UI::Root;
3476 3630
3477our @ISA = CFClient::UI::Container::; 3631our @ISA = CFClient::UI::Container::;
3632
3633use List::Util qw(min max);
3478 3634
3479use CFClient::OpenGL; 3635use CFClient::OpenGL;
3480 3636
3481sub new { 3637sub new {
3482 my $class = shift; 3638 my $class = shift;
… …
3509 $coord = $max - $size if $coord > $max - $size; 3665 $coord = $max - $size if $coord > $max - $size;
3510 3666
3511 int $coord + 0.5 3667 int $coord + 0.5
3512} 3668}
3513 3669
3514sub size_allocate { 3670sub invoke_size_allocate {
3515 my ($self, $w, $h) = @_; 3671 my ($self, $w, $h) = @_;
3516 3672
3517 for my $child ($self->children) { 3673 for my $child ($self->children) {
3518 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)};
3519 3675
… …
3523 $X = _to_pixel $X, $W, $self->{w}; 3679 $X = _to_pixel $X, $W, $self->{w};
3524 $Y = _to_pixel $Y, $H, $self->{h}; 3680 $Y = _to_pixel $Y, $H, $self->{h};
3525 3681
3526 $child->configure ($X, $Y, $W, $H); 3682 $child->configure ($X, $Y, $W, $H);
3527 } 3683 }
3684
3685 1
3528} 3686}
3529 3687
3530sub coord2local { 3688sub coord2local {
3531 my ($self, $x, $y) = @_; 3689 my ($self, $x, $y) = @_;
3532 3690
… …
3617 3775
3618 delete $queue{$widget+0}; 3776 delete $queue{$widget+0};
3619 3777
3620 my ($w, $h) = $widget->size_request; 3778 my ($w, $h) = $widget->size_request;
3621 3779
3622 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3780 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3623 $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};
3624 3785
3625 $w = $widget->{force_w} if exists $widget->{force_w}; 3786 $w = $widget->{force_w} if exists $widget->{force_w};
3626 $h = $widget->{force_h} if exists $widget->{force_h}; 3787 $h = $widget->{force_h} if exists $widget->{force_h};
3627 3788
3628 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