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.322 by root, Wed Jul 5 01:53:24 2006 UTC

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

Diff Legend

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