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