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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.314 by root, Mon Jun 26 21:59: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 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
… …
955package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
956 961
957our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
958 963
959sub new { 964sub new {
960 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
961 968
962 my $self; 969 my $self;
963 970
964 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
965 vertical => 1, 972 vertical => 1,
… …
970 ; 977 ;
971 978
972 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider, 981 slider => $slider,
975 @_, 982 %arg,
976 ); 983 );
977 984
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
981 987
982 $self 988 $self
983} 989}
984 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
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
985sub update { 1005sub update {
986 my ($self) = @_; 1006 my ($self) = @_;
987 1007
988 $self->SUPER::update; 1008 $self->SUPER::update;
989 1009
990 # todo: overwrite size_allocate of child 1010 $self->update_slider;
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1011}
994 1012
995sub size_allocate { 1013sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
997 1015
1016 $self->update_slider;
1017
998 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1019}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006 1020
1007############################################################################# 1021#############################################################################
1008 1022
1009package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1010 1024
… …
1026 1040
1027 if ($self->{bg}) { 1041 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
1029 1043
1030 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
1033 1047
1034 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1049 glVertex 0 , 0;
1036 glVertex 0 , $h; 1050 glVertex 0 , $h;
1037 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062 1076
1063sub new { 1077sub new {
1064 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1065
1066 my $title = delete $arg{title};
1067 1079
1068 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1083 border => 0.6,
… …
1073 min_w => 16, 1085 min_w => 16,
1074 min_h => 16, 1086 min_h => 16,
1075 %arg, 1087 %arg,
1076 ); 1088 );
1077 1089
1078 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1079 align => 0, 1091 align => 0,
1080 valign => 1, 1092 valign => 1,
1081 text => $title, 1093 text => $self->{title},
1082 fontsize => $self->{border} 1094 fontsize => $self->{border},
1083 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 }
1084 1105
1085 $self 1106 $self
1086} 1107}
1087 1108
1088sub add { 1109sub add {
1089 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1090 1111
1091 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1115}
1094 1116
1095sub border { 1117sub border {
1096 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1097} 1119}
1098 1120
1099sub size_request { 1121sub size_request {
1100 my ($self) = @_; 1122 my ($self) = @_;
1101 1123
1102 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1103 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1104 1129
1105 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1106 1131
1107 ( 1132 (
1108 $w + $self->border * 2, 1133 $w + $self->border * 2,
1109 $h + $self->border * 2, 1134 $h + $self->border * 2,
1110 ) 1135 )
1111} 1136}
1112 1137
1113sub size_allocate { 1138sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1115 1140
1116 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1145 }
1121 1146
1122 my $border = $self->border; 1147 my $border = $self->border;
1123 1148
1124 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1125 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1126 1151
1127 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1128}
1129 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1130sub button_down { 1160sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1132 1162
1133 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1164 my $border = $self->border;
1135 1165
… …
1151 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
1152 1182
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1185
1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1187 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1188 };
1159 1189
1160 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1166 1196
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1198
1169 $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});
1170 }; 1202 };
1171 } else { 1203 } else {
1172 return 0; 1204 return 0;
1173 } 1205 }
1174 1206
1175 1 1207 1
1176} 1208}
1177 1209
1178sub button_up { 1210sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1180 1212
1181 !!delete $self->{motion} 1213 ! ! delete $self->{motion}
1182} 1214}
1183 1215
1184sub mouse_motion { 1216sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1186 1218
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1220
1189 !!$self->{motion} 1221 ! ! $self->{motion}
1190} 1222}
1191 1223
1192sub _draw { 1224sub _draw {
1193 my ($self) = @_; 1225 my ($self) = @_;
1194 1226
… …
1220 1252
1221 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1222 1254
1223 $child->draw; 1255 $child->draw;
1224 1256
1225 if ($self->{title}) { 1257 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1258 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1228 } 1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1229} 1266}
1230 1267
1231############################################################################# 1268#############################################################################
1232 1269
1233package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1256 1293
1257 $child->set_parent ($self); 1294 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1259 1296
1260 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1261} 1304}
1262 1305
1263# 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?
1264sub clear { 1307sub clear {
1265 my ($self) = @_; 1308 my ($self) = @_;
… …
1306 (sum @$ws), 1349 (sum @$ws),
1307 (sum @$hs), 1350 (sum @$hs),
1308 ) 1351 )
1309} 1352}
1310 1353
1311sub size_allocate { 1354sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1313 1356
1314 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1315 1358
1316 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
… …
1348 } 1391 }
1349 1392
1350 $y += $row_h; 1393 $y += $row_h;
1351 } 1394 }
1352 1395
1396 1
1353} 1397}
1354 1398
1355sub find_widget { 1399sub find_widget {
1356 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1357 1401
… …
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 ) 1440 )
1397} 1441}
1398 1442
1399sub size_allocate { 1443sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1401 1445
1402 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1404 1448
1405 my @req; 1449 my @req;
1406 1450
1407 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1409 } else { 1453 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1412 1456
1413 if ($req > $space) { 1457 if ($req > $space) {
1414 # ah well, not enough space 1458 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1416 } else { 1460 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1462
1419 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1420 1464
1421 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1466 for 0 .. $#children;
1423 } 1467 }
1424 } 1468 }
1425 1469
1426 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1427 1471
1428 my $pos = 0; 1472 my $pos = 0;
1429 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1431 $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));
1432 1476
1433 $pos += $alloc; 1477 $pos += $alloc;
1434 } 1478 }
1435 1479
1436 1 1480 1
… …
1526 1570
1527 delete $self->{texture}; 1571 delete $self->{texture};
1528 $self->SUPER::update; 1572 $self->SUPER::update;
1529} 1573}
1530 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1531sub set_text { 1582sub set_text {
1532 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1533 1584
1534 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1536 1587
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1539 1590
1591 delete $self->{size_req};
1540 $self->realloc; 1592 $self->realloc;
1541 $self->update; 1593 $self->update;
1542} 1594}
1543 1595
1544sub set_markup { 1596sub set_markup {
… …
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1603
1552 $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;
1553 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1554 1606
1607 delete $self->{size_req};
1555 $self->realloc; 1608 $self->realloc;
1556 $self->update; 1609 $self->update;
1557} 1610}
1558 1611
1559sub size_request { 1612sub size_request {
1560 my ($self) = @_; 1613 my ($self) = @_;
1561 1614
1615 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1621
1568 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1569 1623
1570 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1627
1574 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1575 1629
1576 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1578 } 1635 };
1579 1636
1580 ($w, $h) 1637 @{ $self->{size_req} }
1581} 1638}
1582 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1583sub size_allocate { 1644sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1585 1646
1586 delete $self->{ox}; 1647 delete $self->{ox};
1587 1648
1588 delete $self->{texture} 1649 delete $self->{texture}
1589 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
1590} 1653}
1591 1654
1592sub set_fontsize { 1655sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1594 1657
1595 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1596 delete $self->{texture}; 1659 delete $self->{texture};
1597 1660
1598 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1599} 1670}
1600 1671
1601sub _draw { 1672sub _draw {
1602 my ($self) = @_; 1673 my ($self) = @_;
1603 1674
… …
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1625 }; 1696 };
1626 1697
1627 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1629 1702
1630 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1631 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1633 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1635 } 1710 }
1636 1711
1637 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1638} 1713}
1639 1714
… …
1656 can_hover => 1, 1731 can_hover => 1,
1657 can_focus => 1, 1732 can_focus => 1,
1658 valign => 0, 1733 valign => 0,
1659 can_events => 1, 1734 can_events => 1,
1660 #text => ... 1735 #text => ...
1736 #hidden => "*",
1661 @_ 1737 @_
1662 ) 1738 )
1663} 1739}
1664 1740
1665sub _set_text { 1741sub _set_text {
… …
1667 1743
1668 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1669 1745
1670 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1671 1747
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1749 $self->{text} = $text;
1676 1750
1677 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1679 1754
1680 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1681} 1759}
1682 1760
1683sub set_text { 1761sub set_text {
1684 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1685 1763
1686 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1765 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1766}
1691 1767
1692sub get_text { 1768sub get_text {
1693 $_[0]{text} 1769 $_[0]{text}
1694} 1770}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1700 1776
1701 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1702} 1778}
1703 1779
1704sub key_down { 1780sub invoke_key_down {
1705 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1706 1782
1707 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1721 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1722 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1724 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 1802 $self->emit ('escape');
1727 } elsif ($uni) { 1803 } elsif ($uni) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 1805 } else {
1730 return 0; 1806 return 0;
1731 } 1807 }
… …
1735 $self->realloc; 1811 $self->realloc;
1736 1812
1737 1 1813 1
1738} 1814}
1739 1815
1740sub focus_in { 1816sub invoke_focus_in {
1741 my ($self) = @_; 1817 my ($self) = @_;
1742 1818
1743 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1744 1820
1745 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1746} 1822}
1747 1823
1748sub button_down { 1824sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1750 1826
1751 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 1828
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 1830
1755 # byte-index to char-index 1831 # byte-index to char-index
1756 my $text = $self->{text}; 1832 my $text = $self->{text};
… …
1761 $self->update; 1837 $self->update;
1762 1838
1763 1 1839 1
1764} 1840}
1765 1841
1766sub mouse_motion { 1842sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1768# 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#
1769 1845
1770 0 1846 1
1771} 1847}
1772 1848
1773sub _draw { 1849sub _draw {
1774 my ($self) = @_; 1850 my ($self) = @_;
1775 1851
1776 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1777 1853
1778 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1781 } else { 1857 } else {
1782 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1783 } 1859 }
1784 1860
1785 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1864 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1816 1892
1817our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1818 1894
1819use CFClient::OpenGL; 1895use CFClient::OpenGL;
1820 1896
1821sub key_down { 1897sub invoke_key_down {
1822 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1823 1899
1824 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1825 1901
1826 if ($sym == 13) { 1902 if ($sym == 13) {
1827 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1829 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1832 $self->update; 1909 $self->update;
1833 1910
1834 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1852 } else { 1929 } else {
1853 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1854 } 1931 }
1855 1932
1856 } else { 1933 } else {
1857 return $self->SUPER::key_down ($ev) 1934 return $self->SUPER::invoke_key_down ($ev)
1858 } 1935 }
1859 1936
1860 1 1937 1
1861} 1938}
1862 1939
… …
1886 can_events => 1, 1963 can_events => 1,
1887 @_ 1964 @_
1888 ) 1965 )
1889} 1966}
1890 1967
1891sub activate { }
1892
1893sub button_up { 1968sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1895 1970
1896 $self->emit ("activate") 1971 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
… …
1901} 1976}
1902 1977
1903sub _draw { 1978sub _draw {
1904 my ($self) = @_; 1979 my ($self) = @_;
1905 1980
1906 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 1982
1912 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1915 1986
1916 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1917 1988
1918 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1919 1990
1920 $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
1921} 2028}
1922 2029
1923############################################################################# 2030#############################################################################
1924 2031
1925package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1952 my ($self) = @_; 2059 my ($self) = @_;
1953 2060
1954 (6) x 2 2061 (6) x 2
1955} 2062}
1956 2063
1957sub button_down { 2064sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1959 2066
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1963 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
1964 } else { 2071 } else {
1965 return 0 2072 return 0
1966 } 2073 }
1967 2074
1968 1 2075 1
… …
1993package CFClient::UI::Image; 2100package CFClient::UI::Image;
1994 2101
1995our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1996 2103
1997use CFClient::OpenGL; 2104use CFClient::OpenGL;
1998use Carp qw/confess/;
1999 2105
2000our %loaded_images; 2106our %texture_cache;
2001 2107
2002sub new { 2108sub new {
2003 my $class = shift; 2109 my $class = shift;
2004 2110
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2006 2115
2007 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2008 2118
2009 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2010 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2011 2121
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2013 2123
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2125
2018 $self 2126 $self
2019} 2127}
2020 2128
2021sub size_request { 2129sub size_request {
2022 my ($self) = @_; 2130 my ($self) = @_;
2023 2131
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
2025} 2133}
2026 2134
2027sub _draw { 2135sub _draw {
2028 my ($self) = @_; 2136 my ($self) = @_;
2029 2137
… …
2140 2248
2141 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
2143 2251
2144 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2257
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2264 $self->update; 2373 $self->update;
2265 2374
2266 $self 2375 $self
2267} 2376}
2268 2377
2269sub changed { }
2270
2271sub set_range { 2378sub set_range {
2272 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2273 2380
2274 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2275 2382
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2278} 2387}
2279 2388
2280sub set_value { 2389sub set_value {
2281 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2282 2391
… …
2293 if $unit; 2402 if $unit;
2294 2403
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2405
2297 if ($value != $old_value) { 2406 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2299 $self->update; 2408 $self->update;
2300 } 2409 }
2301} 2410}
2302 2411
2303sub size_request { 2412sub size_request {
2304 my ($self) = @_; 2413 my ($self) = @_;
2305 2414
2306 ($self->{req_w}, $self->{req_h}) 2415 ($self->{req_w}, $self->{req_h})
2307} 2416}
2308 2417
2309sub button_down { 2418sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2311 2420
2312 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2422
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2424
2316 $self->mouse_motion ($ev, $x, $y) 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2426}
2318 2427
2319sub mouse_motion { 2428sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2321 2430
2322 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2433
… …
2335} 2444}
2336 2445
2337sub update { 2446sub update {
2338 my ($self) = @_; 2447 my ($self) = @_;
2339 2448
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2342 2458
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2460 my $range = ($hi - $page - $lo) || 1e-100;
2345 2461
… …
2351 $value = ($value - $lo) / $range; 2467 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2468 $value = $value * $self->{scale} + $self->{offset};
2353 2469
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2471 $self->{knob_w} = $knob_w;
2356 }); 2472 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2473
2364 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2365 2475
2366 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2367 2477
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2430 2540
2431############################################################################# 2541#############################################################################
2432 2542
2433package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2434 2544
2435our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2436 2546
2437use CFClient::OpenGL; 2547use CFClient::OpenGL;
2438 2548
… …
2440 my $class = shift; 2550 my $class = shift;
2441 2551
2442 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2443 fontsize => 1, 2553 fontsize => 1,
2444 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2445 #font => default_font 2556 #font => default_font
2446 @_, 2557 @_,
2447 2558
2448 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2449 par => [], 2560 par => [],
… …
2464 2575
2465 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2577 $self->reflow;
2467} 2578}
2468 2579
2580sub size_request {
2581 my ($self) = @_;
2582
2583 my ($empty, $slider) = @{ $self->{children} };
2584
2585 local $self->{children} = [$empty, $slider];
2586 $self->SUPER::size_request
2587}
2588
2469sub size_allocate { 2589sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2590 my ($self, $w, $h) = @_;
2471 2591
2472 $self->SUPER::size_allocate ($w, $h); 2592 my ($empty, $slider, @other) = @{ $self->{children} };
2593 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2594
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2595 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2596 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2597 $self->{layout}->set_width ($empty->{w});
2598 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2599
2478 $self->reflow; 2600 $self->reflow;
2479}
2480 2601
2481sub text_size { 2602 local $self->{children} = [$empty, $slider];
2482 my ($self, $text, $indent) = @_; 2603 $self->SUPER::invoke_size_allocate ($w, $h)
2604}
2605
2606sub get_layout {
2607 my ($self, $para) = @_;
2483 2608
2484 my $layout = $self->{layout}; 2609 my $layout = $self->{layout};
2485 2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2613 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2614 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2615 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2616 $layout->set_markup ($para->{markup});
2617
2618 $layout->set_shapes (
2619 map
2620 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2621 @{$para->{widget}}
2489 2622 );
2623
2490 $layout->size 2624 $layout
2491} 2625}
2492 2626
2493sub reflow { 2627sub reflow {
2494 my ($self) = @_; 2628 my ($self) = @_;
2495 2629
… …
2504 $self->{children}[1]->set_value ($offset); 2638 $self->{children}[1]->set_value ($offset);
2505} 2639}
2506 2640
2507sub clear { 2641sub clear {
2508 my ($self) = @_; 2642 my ($self) = @_;
2643
2644 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other;
2509 2646
2510 $self->{par} = []; 2647 $self->{par} = [];
2511 $self->{height} = 0; 2648 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2650}
2514 2651
2515sub add_paragraph { 2652sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2653 my ($self, $color, $para, $indent) = @_;
2517 2654
2518 for my $line (split /\n/, $text) { 2655 my ($text, @w) = ref $para ? @$para : $para;
2519 my ($w, $h) = $self->text_size ($line); 2656
2520 $self->{height} += $h; 2657 $para = {
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2658 w => 1e10,
2659 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2522 } 2664 };
2523 2665
2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2666 $self->add (@w) if @w;
2667 push @{$self->{par}}, $para;
2668
2669 $self->{need_reflow}++;
2670 $self->update;
2671}
2672
2673sub scroll_to_bottom {
2674 my ($self) = @_;
2675
2676 $self->{scroll_to_bottom} = 1;
2677 $self->update;
2525} 2678}
2526 2679
2527sub update { 2680sub update {
2528 my ($self) = @_; 2681 my ($self) = @_;
2529 2682
… …
2531 2684
2532 return unless $self->{h} > 0; 2685 return unless $self->{h} > 0;
2533 2686
2534 delete $self->{texture}; 2687 delete $self->{texture};
2535 2688
2536 $ROOT->on_post_alloc ($self, sub { 2689 $ROOT->on_post_alloc ($self => sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2691
2539 if (delete $self->{need_reflow}) { 2692 if (delete $self->{need_reflow}) {
2540 my $height = 0; 2693 my $height = 0;
2541 2694
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) { 2695 for my $para (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2548 $layout->set_width ($W - $_->[3]); 2697 my $layout = $self->get_layout ($para);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2698 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2699
2552 $_->[1] = $h; 2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2553 } 2703 }
2554 2704
2555 $height += $_->[1]; 2705 $height += $para->{h};
2556 } 2706 }
2557 2707
2558 $self->{height} = $height; 2708 $self->{height} = $height;
2559 2709
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2561 2711
2562 delete $self->{texture}; 2712 delete $self->{texture};
2563 } 2713 }
2564 2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2720 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2721 glClear GL_COLOR_BUFFER_BIT;
2568 2722
2569 my $top = int $self->{children}[1]{range}[0]; 2723 my $top = int $self->{children}[1]{range}[0];
2570 2724
2571 my $y0 = $top; 2725 my $y0 = $top;
2572 my $y1 = $top + $H; 2726 my $y1 = $top + $H;
2573 2727
2574 my $y = 0; 2728 my $y = 0;
2575
2576 my $layout = $self->{layout};
2577
2578 $layout->set_font ($self->{font}) if $self->{font};
2579 2729
2580 glEnable GL_BLEND; 2730 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off 2731 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583 2733
2584 for my $par (@{$self->{par}}) { 2734 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 2735 my $h = $para->{h};
2586 2736
2587 if ($y0 < $y + $h && $y < $y1) { 2737 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] }); 2738
2589 $layout->set_width ($W - $par->[3]); 2739 my $layout = $self->get_layout ($para);
2590 $layout->set_markup ($par->[4]);
2591 2740
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2593 2742
2594 glRasterPos $par->[3], $y - $y0; 2743 glRasterPos $para->{indent}, $y - $y0;
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 glDisable GL_BLEND;
2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752
2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0;
2755
2756 $_->draw;
2757 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 }
2596 } 2761 }
2597 2762
2598 $y += $h; 2763 $y += $h;
2599 } 2764 }
2600 2765
2601 glDisable GL_BLEND; 2766 glDisable GL_BLEND;
2602 }; 2767 };
2603 }); 2768 });
2604} 2769}
2605 2770
2771sub reconfigure {
2772 my ($self) = @_;
2773
2774 $self->SUPER::reconfigure;
2775
2776 $_->{w} = 1e10 for @{ $self->{par} };
2777 $self->reflow;
2778}
2779
2606sub _draw { 2780sub _draw {
2607 my ($self) = @_; 2781 my ($self) = @_;
2608 2782
2609 glEnable GL_TEXTURE_2D; 2783 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2784 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2785 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2786 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2787 glDisable GL_TEXTURE_2D;
2614 2788
2615 $self->{children}[1]->draw; 2789 $self->{children}[1]->draw;
2616
2617} 2790}
2618 2791
2619############################################################################# 2792#############################################################################
2620 2793
2621package CFClient::UI::Animator; 2794package CFClient::UI::Animator;
… …
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 2881 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2882 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 2883 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 2884 . "visible $widget->{visible}";
2712 } 2885 }
2886
2887 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//;
2713 2889
2714 $self->add (new CFClient::UI::Label 2890 $self->add (new CFClient::UI::Label
2715 markup => $tooltip, 2891 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 2893 fontsize => 0.8,
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2903 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 2904
2729 ($w + 4, $h + 4) 2905 ($w + 4, $h + 4)
2730} 2906}
2731 2907
2732sub size_allocate { 2908sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2734 2910
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 2911 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 2912}
2737 2913
2738sub visibility_change { 2914sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 2915 my ($self, $visible) = @_;
2740 2916
2741 return unless $visible; 2917 return unless $visible;
2742 2918
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 2919 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2745 or return; 2921 or return;
2746 2922
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 2924
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 2926 if $x + $self->{w} > $self->{root}{w};
2751 2927
2752 $self->move_abs ($x, $y); 2928 $self->move_abs ($x, $y);
2753 }); 2929 });
2754} 2930}
2755 2931
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3020 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 3021
2846 if ($tex) { 3022 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3023 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3025 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3026 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3027 glDisable GL_TEXTURE_2D;
2852 } 3028 }
2853} 3029}
2854 3030
2855sub DESTROY { 3031sub destroy {
2856 my ($self) = @_; 3032 my ($self) = @_;
2857 3033
2858 $self->{timer}->cancel 3034 $self->{timer}->cancel
2859 if $self->{timer}; 3035 if $self->{timer};
2860 3036
2861 $self->SUPER::DESTROY; 3037 $self->SUPER::destroy;
2862} 3038}
2863 3039
2864############################################################################# 3040#############################################################################
2865 3041
2866package CFClient::UI::Buttonbar; 3042package CFClient::UI::Buttonbar;
… …
2887 ); 3063 );
2888 3064
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3065 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2890 3066
2891 for my $item (@{ $self->{items} }) { 3067 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3068 my ($widget, $cb, $tooltip) = @$item;
2893 3069
2894 # handle various types of items, only text for now 3070 # handle various types of items, only text for now
2895 if (!ref $widget) { 3071 if (!ref $widget) {
2896 $widget = new CFClient::UI::Label 3072 $widget = new CFClient::UI::Label
2897 can_hover => 1, 3073 can_hover => 1,
2898 can_events => 1, 3074 can_events => 1,
2899 text => $widget; 3075 markup => $widget,
3076 tooltip => $tooltip
2900 } 3077 }
2901 3078
2902 $self->{item}{$widget} = $item; 3079 $self->{item}{$widget} = $item;
2903 3080
2904 $self->{vbox}->add ($widget); 3081 $self->{vbox}->add ($widget);
… …
2909 3086
2910# popup given the event (must be a mouse button down event currently) 3087# popup given the event (must be a mouse button down event currently)
2911sub popup { 3088sub popup {
2912 my ($self, $ev) = @_; 3089 my ($self, $ev) = @_;
2913 3090
2914 $self->_emit ("popdown"); 3091 $self->emit ("popdown");
2915 3092
2916 # maybe save $GRAB? must be careful about events... 3093 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3094 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3095 $self->{button} = $ev->{button};
2919 3096
2920 $self->show; 3097 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3098 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3099}
2923 3100
2924sub mouse_motion { 3101sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3102 my ($self, $ev, $x, $y) = @_;
2926 3103
2927 # TODO: should use vbox->find_widget or so 3104 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3105 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3106 $self->{hover} = $self->{item}{$HOVER};
2930 3107
2931 0 3108 0
2932} 3109}
2933 3110
2934sub button_up { 3111sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2936 3113
2937 if ($ev->{button} == $self->{button}) { 3114 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3115 undef $GRAB;
2939 $self->hide; 3116 $self->hide;
2940 3117
2941 $self->_emit ("popdown"); 3118 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3119 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3120 } else {
2944 return 0 3121 return 0
2945 } 3122 }
2946 3123
… …
2983 : $self->{children}[$page_or_widget]; 3160 : $self->{children}[$page_or_widget];
2984 3161
2985 $self->{current} = $widget; 3162 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3163 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3164
2988 $self->_emit (page_changed => $self->{current}); 3165 $self->emit (page_changed => $self->{current});
2989 3166
2990 $self->realloc; 3167 $self->realloc;
2991} 3168}
2992 3169
2993sub visible_children { 3170sub visible_children {
… …
2998 my ($self) = @_; 3175 my ($self) = @_;
2999 3176
3000 $self->{current}->size_request 3177 $self->{current}->size_request
3001} 3178}
3002 3179
3003sub size_allocate { 3180sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3181 my ($self, $w, $h) = @_;
3005 3182
3006 $self->{current}->configure (0, 0, $w, $h); 3183 $self->{current}->configure (0, 0, $w, $h);
3184
3185 1
3007} 3186}
3008 3187
3009sub _draw { 3188sub _draw {
3010 my ($self) = @_; 3189 my ($self) = @_;
3011 3190
… …
3022 my $class = shift; 3201 my $class = shift;
3023 3202
3024 my $self = $class->SUPER::new ( 3203 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3204 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self
3027 @_, 3207 @_,
3028 ); 3208 );
3029 3209
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3211 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3212
3032 $self 3213 $self
3033} 3214}
3034 3215
3035sub add { 3216sub add {
… …
3048 3229
3049sub set_current_page { 3230sub set_current_page {
3050 my ($self, $page) = @_; 3231 my ($self, $page) = @_;
3051 3232
3052 $self->{multiplexer}->set_current_page ($page); 3233 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3234 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3235}
3055 3236
3056############################################################################# 3237#############################################################################
3057 3238
3058package CFClient::UI::Statusbox; 3239package CFClient::UI::Combobox;
3059 3240
3241use utf8;
3242
3060our @ISA = CFClient::UI::VBox::; 3243our @ISA = CFClient::UI::Button::;
3061 3244
3062sub new { 3245sub new {
3063 my $class = shift; 3246 my $class = shift;
3064 3247
3065 $class->SUPER::new ( 3248 my $self = $class->SUPER::new (
3249 options => [], # [value, title, longdesc], ...
3250 value => undef,
3251 @_,
3252 );
3253
3254 $self->_set_value ($self->{value});
3255
3256 $self
3257}
3258
3259sub invoke_button_down {
3260 my ($self, $ev) = @_;
3261
3262 my @menu_items;
3263
3264 for (@{ $self->{options} }) {
3265 my ($value, $title, $tooltip) = @$_;
3266
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 }
3269
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271}
3272
3273sub _set_value {
3274 my ($self, $value) = @_;
3275
3276 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3277 or return;
3278
3279 $self->{value} = $item->[0];
3280 $self->set_markup ("$item->[1] ⇓");
3281 $self->set_tooltip ($item->[2]);
3282}
3283
3284sub set_value {
3285 my ($self, $value) = @_;
3286
3287 return unless $self->{value} ne $value;
3288
3289 $self->_set_value ($value);
3290 $self->emit (changed => $value);
3291}
3292
3293#############################################################################
3294
3295package CFClient::UI::Statusbox;
3296
3297our @ISA = CFClient::UI::VBox::;
3298
3299sub new {
3300 my $class = shift;
3301
3302 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3303 fontsize => 0.8,
3067 @_, 3304 @_,
3068 ) 3305 );
3306
3307 Scalar::Util::weaken (my $this = $self);
3308
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310
3311 $self
3069} 3312}
3070 3313
3071sub reorder { 3314sub reorder {
3072 my ($self) = @_; 3315 my ($self) = @_;
3073 my $NOW = time; 3316 my $NOW = Time::HiRes::time;
3317
3318 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} };
3074 3322
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3323 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3324 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3325 }
3078 3326
… …
3081 my @items = sort { 3329 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3330 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3331 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3332 } values %{ $self->{item} };
3085 3333
3334 $self->{timer}->interval (1);
3335
3086 my $count = 10 + 1; 3336 my $count = 10 + 1;
3087 for my $item (@items) { 3337 for my $item (@items) {
3088 last unless --$count; 3338 last unless --$count;
3089 3339
3090 push @widgets, $item->{label} ||= do { 3340 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3341 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3342 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3343 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3344 : $item->{text};
3095 3345
… …
3103 tooltip => $item->{tooltip}, 3353 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3354 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3355 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3356 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3357 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3358 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3359 can_events => 1,
3110 can_hover => 1 3360 can_hover => 1
3111 }; 3361 };
3362
3363 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3364 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3365 $label->update;
3366 $label->set_max_size (undef, $label->{req_h} * $diff)
3367 if $diff < 1;
3368 $self->{timer}->interval (1/30);
3369 } else {
3370 $label->{fg}[3] = $item->{fg}[3] || 1;
3371 }
3372
3373 push @widgets, $label;
3112 } 3374 }
3113 3375
3114 $self->clear; 3376 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3377 $self->SUPER::add (reverse @widgets);
3116} 3378}
… …
3121 $text =~ s/^\s+//; 3383 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3384 $text =~ s/\s+$//;
3123 3385
3124 return unless $text; 3386 return unless $text;
3125 3387
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3388 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3389
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3390 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3391
3130 if (my $item = $self->{item}{$group}) { 3392 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3393 if ($item->{text} eq $text) {
3132 $item->{count}++; 3394 $item->{count}++;
3133 } else { 3395 } else {
3134 $item->{count} = 1; 3396 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3397 $item->{text} = $item->{tooltip} = $text;
3136 } 3398 }
3137 $item->{id} = ++$self->{id}; 3399 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3400 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3401 delete $item->{label};
3140 } else { 3402 } else {
3141 $self->{item}{$group} = { 3403 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3404 id => ++$self->{id},
… …
3161 3423
3162 $self->reorder; 3424 $self->reorder;
3163 $self->SUPER::reconfigure; 3425 $self->SUPER::reconfigure;
3164} 3426}
3165 3427
3428sub destroy {
3429 my ($self) = @_;
3430
3431 $self->{timer}->cancel;
3432
3433 $self->SUPER::destroy;
3434}
3435
3166############################################################################# 3436#############################################################################
3167 3437
3168package CFClient::UI::Inventory; 3438package CFClient::UI::Inventory;
3169 3439
3170our @ISA = CFClient::UI::ScrolledWindow::; 3440our @ISA = CFClient::UI::ScrolledWindow::;
3171 3441
3172sub new { 3442sub new {
3173 my $class = shift; 3443 my $class = shift;
3174 3444
3175 my $self = $class->SUPER::new ( 3445 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_, 3447 @_,
3178 ); 3448 );
3179 3449
3180 $self 3450 $self
3181} 3451}
3182 3452
3183sub set_items { 3453sub set_items {
3184 my ($self, $items) = @_; 3454 my ($self, $items) = @_;
3185 3455
3186 $self->{scrolled}->clear; 3456 $self->{child}->clear;
3187 return unless $items; 3457 return unless $items;
3188 3458
3189 my @items = sort { 3459 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3460 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3461 or ($a->{name} cmp $b->{name})
… …
3195 3465
3196 my $row = 0; 3466 my $row = 0;
3197 for my $item (@items) { 3467 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3468 CFClient::Item::update_widgets $item;
3199 3469
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3470 $self->{child}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3471 $self->{child}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3472 $self->{child}->add (2, $row, $item->{weight_widget});
3203 3473
3204 $row++; 3474 $row++;
3205 } 3475 }
3206} 3476}
3207 3477
3208############################################################################# 3478#############################################################################
3209 3479
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList; 3480package CFClient::UI::SpellList;
3408 3481
3409our @ISA = CFClient::UI::ScrolledWindow::; 3482our @ISA = CFClient::UI::Table::;
3410 3483
3411sub new { 3484sub new {
3412 my $class = shift; 3485 my $class = shift;
3413 3486
3414 my $self = $class->SUPER::new ( 3487 my $self = $class->SUPER::new (
3415 binding => [], 3488 binding => [],
3416 commands => [], 3489 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3490 @_,
3419 ) 3491 )
3420} 3492}
3421 3493
3422# XXX: Do sorting? Argl... 3494my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506
3507sub rebuild_spell_list {
3508 my ($self) = @_;
3509
3510 $CFClient::UI::ROOT->on_refresh ($self => sub {
3511 $self->clear;
3512
3513 return unless $::CONN;
3514
3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521 my $row = 0;
3522
3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524 my $spell = $self->{spell}{$_};
3525
3526 $row++;
3527
3528 my $spell_cb = sub {
3529 my ($widget, $ev) = @_;
3530
3531 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu
3537 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ],
3541 )->popup ($ev);
3542 } else {
3543 return 0;
3544 }
3545
3546 1
3547 };
3548
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554 $self->add (0, $row, new CFClient::UI::Face
3555 face => $spell->{face},
3556 can_hover => 1,
3557 can_events => 1,
3558 tooltip => $tooltip,
3559 on_button_down => $spell_cb,
3560 );
3561
3562 $self->add (1, $row, new CFClient::UI::Label
3563 expand => 1,
3564 text => $spell->{name},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575 }
3576 });
3577}
3578
3423sub add_spell { 3579sub add_spell {
3424 my ($self, $spell) = @_; 3580 my ($self, $spell) = @_;
3581
3425 $self->{spells}->{$spell->{name}} = $spell; 3582 $self->{spell}->{$spell->{name}} = $spell;
3426 3583 $self->rebuild_spell_list;
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454} 3584}
3455 3585
3456sub remove_spell { 3586sub remove_spell {
3457 my ($self, $spell) = @_; 3587 my ($self, $spell) = @_;
3588
3458 delete $self->{spells}->{$spell->{name}}; 3589 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3590 $self->rebuild_spell_list;
3460} 3591}
3461 3592
3593sub clear_spells {
3594 my ($self) = @_;
3595
3596 $self->{spell} = {};
3597 $self->rebuild_spell_list;
3598}
3599
3462############################################################################# 3600#############################################################################
3463 3601
3464package CFClient::UI::Root; 3602package CFClient::UI::Root;
3465 3603
3466our @ISA = CFClient::UI::Container::; 3604our @ISA = CFClient::UI::Container::;
3605
3606use List::Util qw(min max);
3467 3607
3468use CFClient::OpenGL; 3608use CFClient::OpenGL;
3469 3609
3470sub new { 3610sub new {
3471 my $class = shift; 3611 my $class = shift;
… …
3498 $coord = $max - $size if $coord > $max - $size; 3638 $coord = $max - $size if $coord > $max - $size;
3499 3639
3500 int $coord + 0.5 3640 int $coord + 0.5
3501} 3641}
3502 3642
3503sub size_allocate { 3643sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3644 my ($self, $w, $h) = @_;
3505 3645
3506 for my $child ($self->children) { 3646 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3647 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3648
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3652 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3653 $Y = _to_pixel $Y, $H, $self->{h};
3514 3654
3515 $child->configure ($X, $Y, $W, $H); 3655 $child->configure ($X, $Y, $W, $H);
3516 } 3656 }
3657
3658 1
3517} 3659}
3518 3660
3519sub coord2local { 3661sub coord2local {
3520 my ($self, $x, $y) = @_; 3662 my ($self, $x, $y) = @_;
3521 3663
… …
3606 3748
3607 delete $queue{$widget+0}; 3749 delete $queue{$widget+0};
3608 3750
3609 my ($w, $h) = $widget->size_request; 3751 my ($w, $h) = $widget->size_request;
3610 3752
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3753 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3754 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3755
3756 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3757 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3758
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3759 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3760 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3761
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3762 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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