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.316 by root, Sun Jul 2 13:57:58 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 my $focus = $FOCUS; $FOCUS = $self;
427 429
428 $self->_emit (focus_in => $focus);
429
430 $focus->update if $focus; 430 $focus->update if $focus;
431 $FOCUS->update; 431 $FOCUS->update;
432}
433 432
433 0
434}
435
434sub focus_out { 436sub invoke_focus_out {
435 my ($self) = @_; 437 my ($self) = @_;
436 438
437 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
438 440
439 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
440 442
441 $self->_emit (focus_out => $focus);
442
443 $focus->update if $focus; #? 443 $focus->update if $focus; #?
444 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 446 unless $FOCUS;
447}
448 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
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
… …
591 588
592sub DESTROY { 589sub DESTROY {
593 my ($self) = @_; 590 my ($self) = @_;
594 591
595 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
596 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 596}
598 597
599############################################################################# 598#############################################################################
600 599
601package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
626 625
627 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
629 628
630 glEnable GL_BLEND; 629 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 631 glColor_premultiply @$color;
633 632
634 glBegin GL_QUADS; 633 glBegin GL_QUADS;
635 glVertex 0 , 0; 634 glVertex 0 , 0;
636 glVertex 0 , $h; 635 glVertex 0 , $h;
637 glVertex $w, $h; 636 glVertex $w, $h;
… …
766} 765}
767 766
768sub add { 767sub add {
769 my ($self, $child) = @_; 768 my ($self, $child) = @_;
770 769
771 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
774} 772}
775 773
776sub remove { 774sub remove {
777 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
786 784
787sub size_request { 785sub size_request {
788 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
789} 787}
790 788
791sub size_allocate { 789sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
793 791
794 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
795} 795}
796 796
797############################################################################# 797#############################################################################
798
799# back-buffered drawing area
798 800
799package CFClient::UI::Window; 801package CFClient::UI::Window;
800 802
801our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
802 804
… …
813 815
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 817 $self->SUPER::update;
816} 818}
817 819
818sub size_allocate { 820sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
820 822
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
823} 826}
824 827
825sub _render { 828sub _render {
826 my ($self) = @_; 829 my ($self) = @_;
827 830
… …
854 my $tex = $self->{texture} 857 my $tex = $self->{texture}
855 or return; 858 or return;
856 859
857 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
860 863
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 865
863 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
864} 867}
… …
888 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
889 892
890 ($w, $h) 893 ($w, $h)
891} 894}
892 895
893sub size_allocate { 896sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
895 898
896 my $child = $self->child; 899 my $child = $self->child;
897 900
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 903
901 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
902 $self->update; 905 $self->update;
906
907 1
903} 908}
904 909
905sub set_offset { 910sub set_offset {
906 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
907 912
… …
981 $self->add ($child) if $child; 986 $self->add ($child) if $child;
982 987
983 $self 988 $self
984} 989}
985 990
991#TODO# update range on size_allocate depending on child
992
986sub add { 993sub add {
987 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
988 995
989 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
990} 997}
991 998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
992sub update { 1005sub update {
993 my ($self) = @_; 1006 my ($self) = @_;
994 1007
995 $self->SUPER::update; 1008 $self->SUPER::update;
996 1009
997 # todo: overwrite size_allocate of child 1010 $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} 1011}
1001 1012
1002sub size_allocate { 1013sub invoke_size_allocate {
1003 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1004 1015
1016 $self->update_slider;
1017
1005 $self->SUPER::size_allocate ($w, $h); 1018 $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} 1019}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
1013 1020
1014############################################################################# 1021#############################################################################
1015 1022
1016package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1017 1024
… …
1033 1040
1034 if ($self->{bg}) { 1041 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
1036 1043
1037 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
1040 1047
1041 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
1042 glVertex 0 , 0; 1049 glVertex 0 , 0;
1043 glVertex 0 , $h; 1050 glVertex 0 , $h;
1044 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 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); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1069 1076
1070sub new { 1077sub new {
1071 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1072
1073 my $title = delete $arg{title};
1074 1079
1075 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1083 border => 0.6,
… …
1080 min_w => 16, 1085 min_w => 16,
1081 min_h => 16, 1086 min_h => 16,
1082 %arg, 1087 %arg,
1083 ); 1088 );
1084 1089
1085 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1086 align => 0, 1091 align => 0,
1087 valign => 1, 1092 valign => 1,
1088 text => $title, 1093 text => $self->{title},
1089 fontsize => $self->{border} 1094 fontsize => $self->{border},
1090 if defined $title; 1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1091 1105
1092 $self 1106 $self
1093} 1107}
1094 1108
1095sub add { 1109sub add {
1096 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1097 1111
1098 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1100} 1115}
1101 1116
1102sub border { 1117sub border {
1103 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1104} 1119}
1105 1120
1106sub size_request { 1121sub size_request {
1107 my ($self) = @_; 1122 my ($self) = @_;
1108 1123
1109 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1110 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1111 1129
1112 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1113 1131
1114 ( 1132 (
1115 $w + $self->border * 2, 1133 $w + $self->border * 2,
1116 $h + $self->border * 2, 1134 $h + $self->border * 2,
1117 ) 1135 )
1118} 1136}
1119 1137
1120sub size_allocate { 1138sub invoke_size_allocate {
1121 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1122 1140
1123 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1124 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1125 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1127 } 1145 }
1128 1146
1129 my $border = $self->border; 1147 my $border = $self->border;
1130 1148
1131 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1132 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1133 1151
1134 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1135}
1136 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1137sub button_down { 1160sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1139 1162
1140 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1141 my $border = $self->border; 1164 my $border = $self->border;
1142 1165
… …
1158 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
1159 1182
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1185
1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1187 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1188 };
1166 1189
1167 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1173 1196
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1198
1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1177 }; 1202 };
1178 } else { 1203 } else {
1179 return 0; 1204 return 0;
1180 } 1205 }
1181 1206
1182 1 1207 1
1183} 1208}
1184 1209
1185sub button_up { 1210sub invoke_button_up {
1186 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1187 1212
1188 !!delete $self->{motion} 1213 ! ! delete $self->{motion}
1189} 1214}
1190 1215
1191sub mouse_motion { 1216sub invoke_mouse_motion {
1192 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1193 1218
1194 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195 1220
1196 !!$self->{motion} 1221 ! ! $self->{motion}
1197} 1222}
1198 1223
1199sub _draw { 1224sub _draw {
1200 my ($self) = @_; 1225 my ($self) = @_;
1201 1226
… …
1227 1252
1228 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1229 1254
1230 $child->draw; 1255 $child->draw;
1231 1256
1232 if ($self->{title}) { 1257 if ($self->{title_widget}) {
1233 glTranslate 0, $border - $self->{h}; 1258 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw; 1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1235 } 1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1236} 1266}
1237 1267
1238############################################################################# 1268#############################################################################
1239 1269
1240package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1263 1293
1264 $child->set_parent ($self); 1294 $child->set_parent ($self);
1265 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1266 1296
1267 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1268} 1304}
1269 1305
1270# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1271sub clear { 1307sub clear {
1272 my ($self) = @_; 1308 my ($self) = @_;
… …
1313 (sum @$ws), 1349 (sum @$ws),
1314 (sum @$hs), 1350 (sum @$hs),
1315 ) 1351 )
1316} 1352}
1317 1353
1318sub size_allocate { 1354sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1320 1356
1321 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1322 1358
1323 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
… …
1355 } 1391 }
1356 1392
1357 $y += $row_h; 1393 $y += $row_h;
1358 } 1394 }
1359 1395
1396 1
1360} 1397}
1361 1398
1362sub find_widget { 1399sub find_widget {
1363 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1364 1401
… …
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 ) 1440 )
1404} 1441}
1405 1442
1406sub size_allocate { 1443sub invoke_size_allocate {
1407 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1408 1445
1409 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1410 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1411 1448
1412 my @req; 1449 my @req;
1413 1450
1414 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1415 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1416 } else { 1453 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1418 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1419 1456
1420 if ($req > $space) { 1457 if ($req > $space) {
1421 # ah well, not enough space 1458 # ah well, not enough space
1422 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1423 } else { 1460 } else {
1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1425 1462
1426 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1427 1464
1428 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1429 for 0 .. $#$children; 1466 for 0 .. $#children;
1430 } 1467 }
1431 } 1468 }
1432 1469
1433 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1434 1471
1435 my $pos = 0; 1472 my $pos = 0;
1436 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1437 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1439 1476
1440 $pos += $alloc; 1477 $pos += $alloc;
1441 } 1478 }
1442 1479
1443 1 1480 1
… …
1533 1570
1534 delete $self->{texture}; 1571 delete $self->{texture};
1535 $self->SUPER::update; 1572 $self->SUPER::update;
1536} 1573}
1537 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1538sub set_text { 1582sub set_text {
1539 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1540 1584
1541 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1543 1587
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1546 1590
1591 delete $self->{size_req};
1547 $self->realloc; 1592 $self->realloc;
1548 $self->update; 1593 $self->update;
1549} 1594}
1550 1595
1551sub set_markup { 1596sub set_markup {
… …
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1603
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1560 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1561 1606
1607 delete $self->{size_req};
1562 $self->realloc; 1608 $self->realloc;
1563 $self->update; 1609 $self->update;
1564} 1610}
1565 1611
1566sub size_request { 1612sub size_request {
1567 my ($self) = @_; 1613 my ($self) = @_;
1568 1614
1615 $self->{size_req} ||= do {
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1621
1575 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1576 1623
1577 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1578 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1627
1581 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1582 1629
1583 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1585 } 1635 };
1586 1636
1587 ($w, $h) 1637 @{ $self->{size_req} }
1588} 1638}
1589 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1590sub size_allocate { 1644sub invoke_size_allocate {
1591 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1592 1646
1593 delete $self->{ox}; 1647 delete $self->{ox};
1594 1648
1595 delete $self->{texture} 1649 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1597} 1653}
1598 1654
1599sub set_fontsize { 1655sub set_fontsize {
1600 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1601 1657
1602 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1659 delete $self->{size_req};
1603 delete $self->{texture}; 1660 delete $self->{texture};
1604 1661
1605 $self->realloc; 1662 $self->realloc;
1663}
1664
1665sub reconfigure {
1666 my ($self) = @_;
1667
1668 delete $self->{size_req};
1669
1670 $self->SUPER::reconfigure;
1606} 1671}
1607 1672
1608sub _draw { 1673sub _draw {
1609 my ($self) = @_; 1674 my ($self) = @_;
1610 1675
… …
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5); 1696 : ($self->{h} - $tex->{h}) * 0.5);
1632 }; 1697 };
1633 1698
1634 glEnable GL_TEXTURE_2D; 1699 glEnable GL_TEXTURE_2D;
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1636 1703
1637 if ($tex->{format} == GL_ALPHA) { 1704 if ($tex->{format} == GL_ALPHA) {
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1638 glColor @{$self->{fg}}; 1706 glColor @{$self->{fg}};
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1640 } else { 1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1642 } 1711 }
1643 1712
1644 glDisable GL_TEXTURE_2D; 1713 glDisable GL_TEXTURE_2D;
1645} 1714}
1646 1715
… …
1663 can_hover => 1, 1732 can_hover => 1,
1664 can_focus => 1, 1733 can_focus => 1,
1665 valign => 0, 1734 valign => 0,
1666 can_events => 1, 1735 can_events => 1,
1667 #text => ... 1736 #text => ...
1737 #hidden => "*",
1668 @_ 1738 @_
1669 ) 1739 )
1670} 1740}
1671 1741
1672sub _set_text { 1742sub _set_text {
… …
1674 1744
1675 delete $self->{cur_h}; 1745 delete $self->{cur_h};
1676 1746
1677 return if $self->{text} eq $text; 1747 return if $self->{text} eq $text;
1678 1748
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 1749 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1750 $self->{text} = $text;
1683 1751
1684 $text =~ s/./*/g if $self->{hidden}; 1752 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1753 $self->{layout}->set_text ("$text ");
1754 delete $self->{size_req};
1686 1755
1687 $self->_emit (changed => $self->{text}); 1756 $self->emit (changed => $self->{text});
1757
1758 $self->realloc;
1759 $self->update;
1688} 1760}
1689 1761
1690sub set_text { 1762sub set_text {
1691 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1692 1764
1693 $self->{cursor} = length $text; 1765 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1766 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1767}
1698 1768
1699sub get_text { 1769sub get_text {
1700 $_[0]{text} 1770 $_[0]{text}
1701} 1771}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1776 my ($w, $h) = $self->SUPER::size_request;
1707 1777
1708 ($w + 1, $h) # add 1 for cursor 1778 ($w + 1, $h) # add 1 for cursor
1709} 1779}
1710 1780
1711sub key_down { 1781sub invoke_key_down {
1712 my ($self, $ev) = @_; 1782 my ($self, $ev) = @_;
1713 1783
1714 my $mod = $ev->{mod}; 1784 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1785 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1786 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1798 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1799 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1800 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1801 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1802 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1803 $self->emit ('escape');
1734 } elsif ($uni) { 1804 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1805 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1806 } else {
1737 return 0; 1807 return 0;
1738 } 1808 }
… …
1742 $self->realloc; 1812 $self->realloc;
1743 1813
1744 1 1814 1
1745} 1815}
1746 1816
1747sub focus_in { 1817sub invoke_focus_in {
1748 my ($self) = @_; 1818 my ($self) = @_;
1749 1819
1750 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1751 1821
1752 $self->SUPER::focus_in; 1822 $self->SUPER::invoke_focus_in
1753} 1823}
1754 1824
1755sub button_down { 1825sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1826 my ($self, $ev, $x, $y) = @_;
1757 1827
1758 $self->SUPER::button_down ($ev, $x, $y); 1828 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1829
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1830 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1831
1762 # byte-index to char-index 1832 # byte-index to char-index
1763 my $text = $self->{text}; 1833 my $text = $self->{text};
… …
1768 $self->update; 1838 $self->update;
1769 1839
1770 1 1840 1
1771} 1841}
1772 1842
1773sub mouse_motion { 1843sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1845# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776 1846
1777 0 1847 1
1778} 1848}
1779 1849
1780sub _draw { 1850sub _draw {
1781 my ($self) = @_; 1851 my ($self) = @_;
1782 1852
1783 local $self->{fg} = $self->{fg}; 1853 local $self->{fg} = $self->{fg};
1784 1854
1785 if ($FOCUS == $self) { 1855 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 1856 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 1857 $self->{fg} = $self->{active_fg};
1788 } else { 1858 } else {
1789 glColor @{$self->{bg}}; 1859 glColor_premultiply @{$self->{bg}};
1790 } 1860 }
1791 1861
1792 glEnable GL_BLEND; 1862 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1863 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 1864 glBegin GL_QUADS;
1795 glVertex 0 , 0; 1865 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 1866 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 1867 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 1868 glVertex $self->{w}, 0;
… …
1823 1893
1824our @ISA = CFClient::UI::EntryBase::; 1894our @ISA = CFClient::UI::EntryBase::;
1825 1895
1826use CFClient::OpenGL; 1896use CFClient::OpenGL;
1827 1897
1828sub key_down { 1898sub invoke_key_down {
1829 my ($self, $ev) = @_; 1899 my ($self, $ev) = @_;
1830 1900
1831 my $sym = $ev->{sym}; 1901 my $sym = $ev->{sym};
1832 1902
1833 if ($sym == 13) { 1903 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1904 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1905 my $txt = $self->get_text;
1906
1836 $self->{history_pointer} = -1; 1907 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1908 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1909 $self->emit (activate => $txt);
1839 $self->update; 1910 $self->update;
1840 1911
1841 } elsif ($sym == CFClient::SDLK_UP) { 1912 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1913 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1914 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1930 } else {
1860 $self->set_text ($self->{history_saveback}); 1931 $self->set_text ($self->{history_saveback});
1861 } 1932 }
1862 1933
1863 } else { 1934 } else {
1864 return $self->SUPER::key_down ($ev) 1935 return $self->SUPER::invoke_key_down ($ev)
1865 } 1936 }
1866 1937
1867 1 1938 1
1868} 1939}
1869 1940
… …
1893 can_events => 1, 1964 can_events => 1,
1894 @_ 1965 @_
1895 ) 1966 )
1896} 1967}
1897 1968
1898sub activate { }
1899
1900sub button_up { 1969sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1902 1971
1903 $self->emit ("activate") 1972 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 1973 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 1974 && $y >= 0 && $y < $self->{h};
… …
1908} 1977}
1909 1978
1910sub _draw { 1979sub _draw {
1911 my ($self) = @_; 1980 my ($self) = @_;
1912 1981
1913 local $self->{fg} = $self->{fg}; 1982 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 1983
1919 glEnable GL_TEXTURE_2D; 1984 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 1986 glColor 0, 0, 0, 1;
1922 1987
1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1988 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1924 1989
1925 glDisable GL_TEXTURE_2D; 1990 glDisable GL_TEXTURE_2D;
1926 1991
1927 $self->SUPER::_draw; 1992 $self->SUPER::_draw;
1993}
1994
1995#############################################################################
1996
1997package CFClient::UI::ImageButton;
1998
1999our @ISA = CFClient::UI::Image::;
2000
2001use CFClient::OpenGL;
2002
2003my %textures;
2004
2005sub new {
2006 my $class = shift;
2007
2008 my $self = $class->SUPER::new (
2009 padding_x => 4,
2010 padding_y => 4,
2011 fg => [1, 1, 1],
2012 active_fg => [0, 0, 1],
2013 can_hover => 1,
2014 align => 0,
2015 valign => 0,
2016 can_events => 1,
2017 @_
2018 );
2019}
2020
2021sub invoke_button_up {
2022 my ($self, $ev, $x, $y) = @_;
2023
2024 $self->emit ("activate")
2025 if $x >= 0 && $x < $self->{w}
2026 && $y >= 0 && $y < $self->{h};
2027
2028 1
1928} 2029}
1929 2030
1930############################################################################# 2031#############################################################################
1931 2032
1932package CFClient::UI::CheckBox; 2033package CFClient::UI::CheckBox;
… …
1959 my ($self) = @_; 2060 my ($self) = @_;
1960 2061
1961 (6) x 2 2062 (6) x 2
1962} 2063}
1963 2064
1964sub button_down { 2065sub invoke_button_down {
1965 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1966 2067
1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1969 $self->{state} = !$self->{state}; 2070 $self->{state} = !$self->{state};
1970 $self->_emit (changed => $self->{state}); 2071 $self->emit (changed => $self->{state});
1971 } else { 2072 } else {
1972 return 0 2073 return 0
1973 } 2074 }
1974 2075
1975 1 2076 1
… …
2000package CFClient::UI::Image; 2101package CFClient::UI::Image;
2001 2102
2002our @ISA = CFClient::UI::Base::; 2103our @ISA = CFClient::UI::Base::;
2003 2104
2004use CFClient::OpenGL; 2105use CFClient::OpenGL;
2005use Carp qw/confess/;
2006 2106
2007our %loaded_images; 2107our %texture_cache;
2008 2108
2009sub new { 2109sub new {
2010 my $class = shift; 2110 my $class = shift;
2011 2111
2012 my $self = $class->SUPER::new (can_events => 0, @_); 2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2013 2116
2014 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
2015 2119
2016 $loaded_images{$self->{image}} ||= 2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2017 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2018 2122
2019 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2020 2124
2021 Scalar::Util::weaken $loaded_images{$self->{image}}; 2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2022
2023 $self->{aspect} = $tex->{w} / $tex->{h};
2024 2126
2025 $self 2127 $self
2026} 2128}
2027 2129
2028sub size_request { 2130sub size_request {
2029 my ($self) = @_; 2131 my ($self) = @_;
2030 2132
2031 ($self->{tex}->{w}, $self->{tex}->{h}) 2133 ($self->{tex}{w}, $self->{tex}{h})
2032} 2134}
2033 2135
2034sub _draw { 2136sub _draw {
2035 my ($self) = @_; 2137 my ($self) = @_;
2036 2138
… …
2147 2249
2148 my $h1 = $self->{h} * (1 - $ycut1); 2250 my $h1 = $self->{h} * (1 - $ycut1);
2149 my $h2 = $self->{h} * (1 - $ycut2); 2251 my $h2 = $self->{h} * (1 - $ycut2);
2150 2252
2151 glEnable GL_BLEND; 2253 glEnable GL_BLEND;
2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2258
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2259 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2260 glBegin GL_QUADS;
… …
2271 $self->update; 2374 $self->update;
2272 2375
2273 $self 2376 $self
2274} 2377}
2275 2378
2276sub changed { }
2277
2278sub set_range { 2379sub set_range {
2279 my ($self, $range) = @_; 2380 my ($self, $range) = @_;
2280 2381
2281 ($range, $self->{range}) = ($self->{range}, $range); 2382 ($range, $self->{range}) = ($self->{range}, $range);
2282 2383
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 2384 if ("@$range" ne "@{$self->{range}}") {
2385 $self->update;
2386 $self->set_value ($self->{range}[0]);
2387 }
2285} 2388}
2286 2389
2287sub set_value { 2390sub set_value {
2288 my ($self, $value) = @_; 2391 my ($self, $value) = @_;
2289 2392
… …
2300 if $unit; 2403 if $unit;
2301 2404
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2405 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303 2406
2304 if ($value != $old_value) { 2407 if ($value != $old_value) {
2305 $self->_emit (changed => $value); 2408 $self->emit (changed => $value);
2306 $self->update; 2409 $self->update;
2307 } 2410 }
2308} 2411}
2309 2412
2310sub size_request { 2413sub size_request {
2311 my ($self) = @_; 2414 my ($self) = @_;
2312 2415
2313 ($self->{req_w}, $self->{req_h}) 2416 ($self->{req_w}, $self->{req_h})
2314} 2417}
2315 2418
2316sub button_down { 2419sub invoke_button_down {
2317 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2318 2421
2319 $self->SUPER::button_down ($ev, $x, $y); 2422 $self->SUPER::invoke_button_down ($ev, $x, $y);
2320 2423
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322 2425
2323 $self->mouse_motion ($ev, $x, $y) 2426 $self->invoke_mouse_motion ($ev, $x, $y)
2324} 2427}
2325 2428
2326sub mouse_motion { 2429sub invoke_mouse_motion {
2327 my ($self, $ev, $x, $y) = @_; 2430 my ($self, $ev, $x, $y) = @_;
2328 2431
2329 if ($GRAB == $self) { 2432 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2433 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331 2434
… …
2342} 2445}
2343 2446
2344sub update { 2447sub update {
2345 my ($self) = @_; 2448 my ($self) = @_;
2346 2449
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2450 delete $self->{knob_w};
2451 $self->SUPER::update;
2452}
2453
2454sub _draw {
2455 my ($self) = @_;
2456
2457 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 2458 $self->set_value ($self->{range}[0]);
2349 2459
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2460 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2461 my $range = ($hi - $page - $lo) || 1e-100;
2352 2462
… …
2358 $value = ($value - $lo) / $range; 2468 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2469 $value = $value * $self->{scale} + $self->{offset};
2360 2470
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2471 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2472 $self->{knob_w} = $knob_w;
2363 }); 2473 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2474
2371 $self->SUPER::_draw (); 2475 $self->SUPER::_draw ();
2372 2476
2373 glScale $self->{w}, $self->{h}; 2477 glScale $self->{w}, $self->{h};
2374 2478
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2539sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2540sub set_value { shift->{slider}->set_value (@_) }
2437 2541
2438############################################################################# 2542#############################################################################
2439 2543
2440package CFClient::UI::TextView; 2544package CFClient::UI::TextScroller;
2441 2545
2442our @ISA = CFClient::UI::HBox::; 2546our @ISA = CFClient::UI::HBox::;
2443 2547
2444use CFClient::OpenGL; 2548use CFClient::OpenGL;
2445 2549
… …
2447 my $class = shift; 2551 my $class = shift;
2448 2552
2449 my $self = $class->SUPER::new ( 2553 my $self = $class->SUPER::new (
2450 fontsize => 1, 2554 fontsize => 1,
2451 can_events => 0, 2555 can_events => 0,
2556 indent => 0,
2452 #font => default_font 2557 #font => default_font
2453 @_, 2558 @_,
2454 2559
2455 layout => (new CFClient::Layout 1), 2560 layout => (new CFClient::Layout 1),
2456 par => [], 2561 par => [],
… …
2471 2576
2472 $self->{fontsize} = $fontsize; 2577 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2578 $self->reflow;
2474} 2579}
2475 2580
2581sub size_request {
2582 my ($self) = @_;
2583
2584 my ($empty, $slider) = @{ $self->{children} };
2585
2586 local $self->{children} = [$empty, $slider];
2587 $self->SUPER::size_request
2588}
2589
2476sub size_allocate { 2590sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2591 my ($self, $w, $h) = @_;
2478 2592
2479 $self->SUPER::size_allocate ($w, $h); 2593 my ($empty, $slider, @other) = @{ $self->{children} };
2594 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2595
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2596 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2598 $self->{layout}->set_width ($empty->{w});
2599 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2600
2485 $self->reflow; 2601 $self->reflow;
2486}
2487 2602
2488sub text_size { 2603 local $self->{children} = [$empty, $slider];
2489 my ($self, $text, $indent) = @_; 2604 $self->SUPER::invoke_size_allocate ($w, $h)
2605}
2606
2607sub get_layout {
2608 my ($self, $para) = @_;
2490 2609
2491 my $layout = $self->{layout}; 2610 my $layout = $self->{layout};
2492 2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2614 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2615 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2616 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2617 $layout->set_markup ($para->{markup});
2618
2619 $layout->set_shapes (
2620 map
2621 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2622 @{$para->{widget}}
2496 2623 );
2624
2497 $layout->size 2625 $layout
2498} 2626}
2499 2627
2500sub reflow { 2628sub reflow {
2501 my ($self) = @_; 2629 my ($self) = @_;
2502 2630
… …
2511 $self->{children}[1]->set_value ($offset); 2639 $self->{children}[1]->set_value ($offset);
2512} 2640}
2513 2641
2514sub clear { 2642sub clear {
2515 my ($self) = @_; 2643 my ($self) = @_;
2644
2645 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other;
2516 2647
2517 $self->{par} = []; 2648 $self->{par} = [];
2518 $self->{height} = 0; 2649 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2651}
2521 2652
2522sub add_paragraph { 2653sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2654 my ($self, $color, $para, $indent) = @_;
2524 2655
2525 for my $line (split /\n/, $text) { 2656 my ($text, @w) = ref $para ? @$para : $para;
2526 my ($w, $h) = $self->text_size ($line); 2657
2527 $self->{height} += $h; 2658 $para = {
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2659 w => 1e10,
2660 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2529 } 2665 };
2530 2666
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2667 $self->add (@w) if @w;
2668 push @{$self->{par}}, $para;
2669
2670 $self->{need_reflow}++;
2671 $self->update;
2672}
2673
2674sub scroll_to_bottom {
2675 my ($self) = @_;
2676
2677 $self->{scroll_to_bottom} = 1;
2678 $self->update;
2532} 2679}
2533 2680
2534sub update { 2681sub update {
2535 my ($self) = @_; 2682 my ($self) = @_;
2536 2683
… …
2538 2685
2539 return unless $self->{h} > 0; 2686 return unless $self->{h} > 0;
2540 2687
2541 delete $self->{texture}; 2688 delete $self->{texture};
2542 2689
2543 $ROOT->on_post_alloc ($self, sub { 2690 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2692
2546 if (delete $self->{need_reflow}) { 2693 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2694 my $height = 0;
2548 2695
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2696 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2698 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2699 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2700
2559 $_->[1] = $h; 2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2560 } 2704 }
2561 2705
2562 $height += $_->[1]; 2706 $height += $para->{h};
2563 } 2707 }
2564 2708
2565 $self->{height} = $height; 2709 $self->{height} = $height;
2566 2710
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2568 2712
2569 delete $self->{texture}; 2713 delete $self->{texture};
2570 } 2714 }
2571 2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2718 }
2719
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 2721 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2722 glClear GL_COLOR_BUFFER_BIT;
2575 2723
2576 my $top = int $self->{children}[1]{range}[0]; 2724 my $top = int $self->{children}[1]{range}[0];
2577 2725
2578 my $y0 = $top; 2726 my $y0 = $top;
2579 my $y1 = $top + $H; 2727 my $y1 = $top + $H;
2580 2728
2581 my $y = 0; 2729 my $y = 0;
2582
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586 2730
2587 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off 2732 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590 2734
2591 for my $par (@{$self->{par}}) { 2735 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2736 my $h = $para->{h};
2593 2737
2594 if ($y0 < $y + $h && $y < $y1) { 2738 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 2739
2596 $layout->set_width ($W - $par->[3]); 2740 my $layout = $self->get_layout ($para);
2597 $layout->set_markup ($par->[4]);
2598 2741
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2600 2743
2601 glRasterPos $par->[3], $y - $y0; 2744 glRasterPos $para->{indent}, $y - $y0;
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 glDisable GL_BLEND;
2751 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, ();
2753
2754 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0;
2756
2757 $_->draw;
2758 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 }
2603 } 2762 }
2604 2763
2605 $y += $h; 2764 $y += $h;
2606 } 2765 }
2607 2766
2608 glDisable GL_BLEND; 2767 glDisable GL_BLEND;
2609 }; 2768 };
2610 }); 2769 });
2611} 2770}
2612 2771
2772sub reconfigure {
2773 my ($self) = @_;
2774
2775 $self->SUPER::reconfigure;
2776
2777 $_->{w} = 1e10 for @{ $self->{par} };
2778 $self->reflow;
2779}
2780
2613sub _draw { 2781sub _draw {
2614 my ($self) = @_; 2782 my ($self) = @_;
2615 2783
2616 glEnable GL_TEXTURE_2D; 2784 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 2786 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2787 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2788 glDisable GL_TEXTURE_2D;
2621 2789
2622 $self->{children}[1]->draw; 2790 $self->{children}[1]->draw;
2623
2624} 2791}
2625 2792
2626############################################################################# 2793#############################################################################
2627 2794
2628package CFClient::UI::Animator; 2795package CFClient::UI::Animator;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2882 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2883 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2884 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2885 . "visible $widget->{visible}";
2719 } 2886 }
2887
2888 $tooltip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//;
2720 2890
2721 $self->add (new CFClient::UI::Label 2891 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2892 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2894 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2904 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2905
2736 ($w + 4, $h + 4) 2906 ($w + 4, $h + 4)
2737} 2907}
2738 2908
2739sub size_allocate { 2909sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 2910 my ($self, $w, $h) = @_;
2741 2911
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 2912 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 2913}
2744 2914
2745sub visibility_change { 2915sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 2916 my ($self, $visible) = @_;
2747 2917
2748 return unless $visible; 2918 return unless $visible;
2749 2919
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 2920 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2752 or return; 2922 or return;
2753 2923
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2925
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2927 if $x + $self->{w} > $self->{root}{w};
2758 2928
2759 $self->move_abs ($x, $y); 2929 $self->move_abs ($x, $y);
2760 }); 2930 });
2761} 2931}
2762 2932
… …
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3021 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852 3022
2853 if ($tex) { 3023 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3024 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 3026 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3027 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3028 glDisable GL_TEXTURE_2D;
2859 } 3029 }
2860} 3030}
2861 3031
2862sub DESTROY { 3032sub destroy {
2863 my ($self) = @_; 3033 my ($self) = @_;
2864 3034
2865 $self->{timer}->cancel 3035 $self->{timer}->cancel
2866 if $self->{timer}; 3036 if $self->{timer};
2867 3037
2868 $self->SUPER::DESTROY; 3038 $self->SUPER::destroy;
2869} 3039}
2870 3040
2871############################################################################# 3041#############################################################################
2872 3042
2873package CFClient::UI::Buttonbar; 3043package CFClient::UI::Buttonbar;
… …
2894 ); 3064 );
2895 3065
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3066 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3067
2898 for my $item (@{ $self->{items} }) { 3068 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3069 my ($widget, $cb, $tooltip) = @$item;
2900 3070
2901 # handle various types of items, only text for now 3071 # handle various types of items, only text for now
2902 if (!ref $widget) { 3072 if (!ref $widget) {
2903 $widget = new CFClient::UI::Label 3073 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3074 can_hover => 1,
2905 can_events => 1, 3075 can_events => 1,
2906 text => $widget; 3076 markup => $widget,
3077 tooltip => $tooltip
2907 } 3078 }
2908 3079
2909 $self->{item}{$widget} = $item; 3080 $self->{item}{$widget} = $item;
2910 3081
2911 $self->{vbox}->add ($widget); 3082 $self->{vbox}->add ($widget);
… …
2916 3087
2917# popup given the event (must be a mouse button down event currently) 3088# popup given the event (must be a mouse button down event currently)
2918sub popup { 3089sub popup {
2919 my ($self, $ev) = @_; 3090 my ($self, $ev) = @_;
2920 3091
2921 $self->_emit ("popdown"); 3092 $self->emit ("popdown");
2922 3093
2923 # maybe save $GRAB? must be careful about events... 3094 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3095 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3096 $self->{button} = $ev->{button};
2926 3097
2927 $self->show; 3098 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3099 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3100}
2930 3101
2931sub mouse_motion { 3102sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3103 my ($self, $ev, $x, $y) = @_;
2933 3104
2934 # TODO: should use vbox->find_widget or so 3105 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3106 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3107 $self->{hover} = $self->{item}{$HOVER};
2937 3108
2938 0 3109 0
2939} 3110}
2940 3111
2941sub button_up { 3112sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2943 3114
2944 if ($ev->{button} == $self->{button}) { 3115 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3116 undef $GRAB;
2946 $self->hide; 3117 $self->hide;
2947 3118
2948 $self->_emit ("popdown"); 3119 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3120 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3121 } else {
2951 return 0 3122 return 0
2952 } 3123 }
2953 3124
… …
2990 : $self->{children}[$page_or_widget]; 3161 : $self->{children}[$page_or_widget];
2991 3162
2992 $self->{current} = $widget; 3163 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3165
2995 $self->_emit (page_changed => $self->{current}); 3166 $self->emit (page_changed => $self->{current});
2996 3167
2997 $self->realloc; 3168 $self->realloc;
2998} 3169}
2999 3170
3000sub visible_children { 3171sub visible_children {
… …
3005 my ($self) = @_; 3176 my ($self) = @_;
3006 3177
3007 $self->{current}->size_request 3178 $self->{current}->size_request
3008} 3179}
3009 3180
3010sub size_allocate { 3181sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3182 my ($self, $w, $h) = @_;
3012 3183
3013 $self->{current}->configure (0, 0, $w, $h); 3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3014} 3187}
3015 3188
3016sub _draw { 3189sub _draw {
3017 my ($self) = @_; 3190 my ($self) = @_;
3018 3191
… …
3057 3230
3058sub set_current_page { 3231sub set_current_page {
3059 my ($self, $page) = @_; 3232 my ($self, $page) = @_;
3060 3233
3061 $self->{multiplexer}->set_current_page ($page); 3234 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3235 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3236}
3064 3237
3065############################################################################# 3238#############################################################################
3066 3239
3067package CFClient::UI::Statusbox; 3240package CFClient::UI::Combobox;
3068 3241
3242use utf8;
3243
3069our @ISA = CFClient::UI::VBox::; 3244our @ISA = CFClient::UI::Button::;
3070 3245
3071sub new { 3246sub new {
3072 my $class = shift; 3247 my $class = shift;
3073 3248
3074 $class->SUPER::new ( 3249 my $self = $class->SUPER::new (
3250 options => [], # [value, title, longdesc], ...
3251 value => undef,
3252 @_,
3253 );
3254
3255 $self->_set_value ($self->{value});
3256
3257 $self
3258}
3259
3260sub invoke_button_down {
3261 my ($self, $ev) = @_;
3262
3263 my @menu_items;
3264
3265 for (@{ $self->{options} }) {
3266 my ($value, $title, $tooltip) = @$_;
3267
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 }
3270
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272}
3273
3274sub _set_value {
3275 my ($self, $value) = @_;
3276
3277 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3278 or return;
3279
3280 $self->{value} = $item->[0];
3281 $self->set_markup ("$item->[1] ⇓");
3282 $self->set_tooltip ($item->[2]);
3283}
3284
3285sub set_value {
3286 my ($self, $value) = @_;
3287
3288 return unless $self->{value} ne $value;
3289
3290 $self->_set_value ($value);
3291 $self->emit (changed => $value);
3292}
3293
3294#############################################################################
3295
3296package CFClient::UI::Statusbox;
3297
3298our @ISA = CFClient::UI::VBox::;
3299
3300sub new {
3301 my $class = shift;
3302
3303 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3304 fontsize => 0.8,
3076 @_, 3305 @_,
3077 ) 3306 );
3307
3308 Scalar::Util::weaken (my $this = $self);
3309
3310 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311
3312 $self
3078} 3313}
3079 3314
3080sub reorder { 3315sub reorder {
3081 my ($self) = @_; 3316 my ($self) = @_;
3082 my $NOW = time; 3317 my $NOW = Time::HiRes::time;
3318
3319 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} };
3083 3323
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3324 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3325 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3326 }
3087 3327
… …
3090 my @items = sort { 3330 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3331 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3332 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3333 } values %{ $self->{item} };
3094 3334
3335 $self->{timer}->interval (1);
3336
3095 my $count = 10 + 1; 3337 my $count = 10 + 1;
3096 for my $item (@items) { 3338 for my $item (@items) {
3097 last unless --$count; 3339 last unless --$count;
3098 3340
3099 push @widgets, $item->{label} ||= do { 3341 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3342 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3343 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3344 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3345 : $item->{text};
3104 3346
… …
3112 tooltip => $item->{tooltip}, 3354 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3355 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3356 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3357 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3358 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3359 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3360 can_events => 1,
3119 can_hover => 1 3361 can_hover => 1
3120 }; 3362 };
3363
3364 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3365 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3366 $label->update;
3367 $label->set_max_size (undef, $label->{req_h} * $diff)
3368 if $diff < 1;
3369 $self->{timer}->interval (1/30);
3370 } else {
3371 $label->{fg}[3] = $item->{fg}[3] || 1;
3372 }
3373
3374 push @widgets, $label;
3121 } 3375 }
3122 3376
3123 $self->clear; 3377 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3378 $self->SUPER::add (reverse @widgets);
3125} 3379}
… …
3130 $text =~ s/^\s+//; 3384 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3385 $text =~ s/\s+$//;
3132 3386
3133 return unless $text; 3387 return unless $text;
3134 3388
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3389 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3390
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3391 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3392
3139 if (my $item = $self->{item}{$group}) { 3393 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3394 if ($item->{text} eq $text) {
3141 $item->{count}++; 3395 $item->{count}++;
3142 } else { 3396 } else {
3143 $item->{count} = 1; 3397 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text; 3398 $item->{text} = $item->{tooltip} = $text;
3145 } 3399 }
3146 $item->{id} = ++$self->{id}; 3400 $item->{id} += 0.2;#d#
3147 $item->{timeout} = $timeout; 3401 $item->{timeout} = $timeout;
3148 delete $item->{label}; 3402 delete $item->{label};
3149 } else { 3403 } else {
3150 $self->{item}{$group} = { 3404 $self->{item}{$group} = {
3151 id => ++$self->{id}, 3405 id => ++$self->{id},
… …
3157 count => 1, 3411 count => 1,
3158 %arg, 3412 %arg,
3159 }; 3413 };
3160 } 3414 }
3161 3415
3416 $ROOT->on_refresh (reorder => sub {
3162 $self->reorder; 3417 $self->reorder;
3418 });
3163} 3419}
3164 3420
3165sub reconfigure { 3421sub reconfigure {
3166 my ($self) = @_; 3422 my ($self) = @_;
3167 3423
3168 delete $_->{label} 3424 delete $_->{label}
3169 for values %{ $self->{item} || {} }; 3425 for values %{ $self->{item} || {} };
3170 3426
3171 $self->reorder; 3427 $self->reorder;
3172 $self->SUPER::reconfigure; 3428 $self->SUPER::reconfigure;
3429}
3430
3431sub destroy {
3432 my ($self) = @_;
3433
3434 $self->{timer}->cancel;
3435
3436 $self->SUPER::destroy;
3173} 3437}
3174 3438
3175############################################################################# 3439#############################################################################
3176 3440
3177package CFClient::UI::Inventory; 3441package CFClient::UI::Inventory;
… …
3196 return unless $items; 3460 return unless $items;
3197 3461
3198 my @items = sort { 3462 my @items = sort {
3199 ($a->{type} <=> $b->{type}) 3463 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name}) 3464 or ($a->{name} cmp $b->{name})
3201 } @$items; 3465 } values %$items;
3202 3466
3203 $self->{real_items} = \@items; 3467 $self->{real_items} = \@items;
3204 3468
3205 my $row = 0; 3469 my $row = 0;
3206 for my $item (@items) { 3470 for my $item (@items) {
… …
3209 $self->{child}->add (0, $row, $item->{face_widget}); 3473 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget}); 3474 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget}); 3475 $self->{child}->add (2, $row, $item->{weight_widget});
3212 3476
3213 $row++; 3477 $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 } 3478 }
3412} 3479}
3413 3480
3414############################################################################# 3481#############################################################################
3415 3482
… …
3425 commands => [], 3492 commands => [],
3426 @_, 3493 @_,
3427 ) 3494 )
3428} 3495}
3429 3496
3430# XXX: Do sorting? Argl... 3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3431sub add_spell { 3582sub add_spell {
3432 my ($self, $spell) = @_; 3583 my ($self, $spell) = @_;
3584
3433 $self->{spells}->{$spell->{name}} = $spell; 3585 $self->{spell}->{$spell->{name}} = $spell;
3434 3586 $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} 3587}
3463 3588
3464sub remove_spell { 3589sub remove_spell {
3465 my ($self, $spell) = @_; 3590 my ($self, $spell) = @_;
3591
3466 delete $self->{spells}->{$spell->{name}}; 3592 delete $self->{spell}->{$spell->{name}};
3467 $self->rebuild_spell_list; 3593 $self->rebuild_spell_list;
3468} 3594}
3469 3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3470############################################################################# 3603#############################################################################
3471 3604
3472package CFClient::UI::Root; 3605package CFClient::UI::Root;
3473 3606
3474our @ISA = CFClient::UI::Container::; 3607our @ISA = CFClient::UI::Container::;
3608
3609use List::Util qw(min max);
3475 3610
3476use CFClient::OpenGL; 3611use CFClient::OpenGL;
3477 3612
3478sub new { 3613sub new {
3479 my $class = shift; 3614 my $class = shift;
… …
3506 $coord = $max - $size if $coord > $max - $size; 3641 $coord = $max - $size if $coord > $max - $size;
3507 3642
3508 int $coord + 0.5 3643 int $coord + 0.5
3509} 3644}
3510 3645
3511sub size_allocate { 3646sub invoke_size_allocate {
3512 my ($self, $w, $h) = @_; 3647 my ($self, $w, $h) = @_;
3513 3648
3514 for my $child ($self->children) { 3649 for my $child ($self->children) {
3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3650 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3516 3651
… …
3520 $X = _to_pixel $X, $W, $self->{w}; 3655 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h}; 3656 $Y = _to_pixel $Y, $H, $self->{h};
3522 3657
3523 $child->configure ($X, $Y, $W, $H); 3658 $child->configure ($X, $Y, $W, $H);
3524 } 3659 }
3660
3661 1
3525} 3662}
3526 3663
3527sub coord2local { 3664sub coord2local {
3528 my ($self, $x, $y) = @_; 3665 my ($self, $x, $y) = @_;
3529 3666
… …
3614 3751
3615 delete $queue{$widget+0}; 3752 delete $queue{$widget+0};
3616 3753
3617 my ($w, $h) = $widget->size_request; 3754 my ($w, $h) = $widget->size_request;
3618 3755
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3756 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3757 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3758
3759 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3760 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621 3761
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 3762 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 3763 $h = $widget->{force_h} if exists $widget->{force_h};
3624 3764
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3765 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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