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

Diff Legend

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