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.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.318 by elmex, Sun Jul 2 19:32:55 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop 376 # nop
377} 377}
378 378
379sub visible_children { 379sub visible_children {
… …
381} 381}
382 382
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
388} 390}
389 391
390sub set_tooltip { 392sub set_tooltip {
391 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
392 394
… …
397 399
398 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
399 401
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 405 }
404} 406}
405 407
406# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
407sub coord2local { 409sub coord2local {
… …
415 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
416 418
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 420}
419 421
420sub focus_in { 422sub invoke_focus_in {
421 my ($self) = @_; 423 my ($self) = @_;
422 424
423 return if $FOCUS == $self; 425 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
425 427
426 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
427 429
428 $self->_emit (focus_in => $focus); 430 $self->update;
429 431
430 $focus->update if $focus; 432 0
431 $FOCUS->update;
432} 433}
433 434
434sub focus_out { 435sub invoke_focus_out {
435 my ($self) = @_; 436 my ($self) = @_;
436 437
437 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
438 439
439 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
440 441
441 $self->_emit (focus_out => $focus); 442 $self->update;
442 443
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 445 unless $FOCUS;
447}
448 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
449sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
450sub button_up { 0 } 458sub invoke_button_up { 1 }
451sub key_down { 0 } 459sub invoke_key_down { 1 }
452sub key_up { 0 } 460sub invoke_key_up { 1 }
453 461
454sub button_down { 462sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
456 464
457 $self->focus_in; 465 $self->grab_focus;
458 466
459 0 467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 483}
461 484
462sub find_widget { 485sub find_widget {
463 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
464 487
… …
474sub set_parent { 497sub set_parent {
475 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
476 499
477 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 502}
503 503
504sub realloc { 504sub realloc {
505 my ($self) = @_; 505 my ($self) = @_;
506 506
… …
539 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540 540
541 # update screen rectangle 541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 544
547 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 548
551 glPushMatrix; 549 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 551
556 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 554 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 556 glBegin GL_QUADS;
563 glVertex $x , $y; 557 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
567 glEnd; 561 glEnd;
568 glDisable GL_BLEND; 562 glDisable GL_BLEND;
569 } 563 }
570 564
571 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 566 glPushMatrix;
573 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 570 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
580 glEnd; 574 glEnd;
581 glPopMatrix; 575 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
584} 581}
585 582
586sub _draw { 583sub _draw {
587 my ($self) = @_; 584 my ($self) = @_;
588 585
… …
591 588
592sub DESTROY { 589sub DESTROY {
593 my ($self) = @_; 590 my ($self) = @_;
594 591
595 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
596 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 596}
598 597
599############################################################################# 598#############################################################################
600 599
601package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
626 625
627 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
629 628
630 glEnable GL_BLEND; 629 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 631 glColor_premultiply @$color;
633 632
634 glBegin GL_QUADS; 633 glBegin GL_QUADS;
635 glVertex 0 , 0; 634 glVertex 0 , 0;
636 glVertex 0 , $h; 635 glVertex 0 , $h;
637 glVertex $w, $h; 636 glVertex $w, $h;
… …
766} 765}
767 766
768sub add { 767sub add {
769 my ($self, $child) = @_; 768 my ($self, $child) = @_;
770 769
771 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
774} 772}
775 773
776sub remove { 774sub remove {
777 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
786 784
787sub size_request { 785sub size_request {
788 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
789} 787}
790 788
791sub size_allocate { 789sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
793 791
794 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
795} 795}
796 796
797############################################################################# 797#############################################################################
798 798
799# back-buffered drawing area 799# back-buffered drawing area
… …
815 815
816 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
817 $self->SUPER::update; 817 $self->SUPER::update;
818} 818}
819 819
820sub size_allocate { 820sub invoke_size_allocate {
821 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
822 822
823 $self->SUPER::size_allocate ($w, $h);
824 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
825} 826}
826 827
827sub _render { 828sub _render {
828 my ($self) = @_; 829 my ($self) = @_;
829 830
… …
856 my $tex = $self->{texture} 857 my $tex = $self->{texture}
857 or return; 858 or return;
858 859
859 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
862 863
863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864 865
865 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
866} 867}
… …
890 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
891 892
892 ($w, $h) 893 ($w, $h)
893} 894}
894 895
895sub size_allocate { 896sub invoke_size_allocate {
896 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
897 898
898 my $child = $self->child; 899 my $child = $self->child;
899 900
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902 903
903 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
904 $self->update; 905 $self->update;
906
907 1
905} 908}
906 909
907sub set_offset { 910sub set_offset {
908 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
909 912
… …
983 $self->add ($child) if $child; 986 $self->add ($child) if $child;
984 987
985 $self 988 $self
986} 989}
987 990
991#TODO# update range on size_allocate depending on child
992
988sub add { 993sub add {
989 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
990 995
991 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
992} 997}
993 998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
994sub update { 1005sub update {
995 my ($self) = @_; 1006 my ($self) = @_;
996 1007
997 $self->SUPER::update; 1008 $self->SUPER::update;
998 1009
999 # todo: overwrite size_allocate of child 1010 $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} 1011}
1003 1012
1004sub size_allocate { 1013sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1006 1015
1016 $self->update_slider;
1017
1007 $self->SUPER::size_allocate ($w, $h); 1018 $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} 1019}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1020
1016############################################################################# 1021#############################################################################
1017 1022
1018package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1019 1024
… …
1035 1040
1036 if ($self->{bg}) { 1041 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
1038 1043
1039 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
1042 1047
1043 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
1044 glVertex 0 , 0; 1049 glVertex 0 , 0;
1045 glVertex 0 , $h; 1050 glVertex 0 , $h;
1046 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071 1076
1072sub new { 1077sub new {
1073 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1076 1079
1077 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1078 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1079 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1080 border => 0.6, 1083 border => 0.6,
… …
1082 min_w => 16, 1085 min_w => 16,
1083 min_h => 16, 1086 min_h => 16,
1084 %arg, 1087 %arg,
1085 ); 1088 );
1086 1089
1087 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1088 align => 0, 1091 align => 0,
1089 valign => 1, 1092 valign => 1,
1090 text => $title, 1093 text => $self->{title},
1091 fontsize => $self->{border} 1094 fontsize => $self->{border},
1092 if defined $title; 1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1093 1105
1094 $self 1106 $self
1095} 1107}
1096 1108
1097sub add { 1109sub add {
1098 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1099 1111
1100 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1102} 1115}
1103 1116
1104sub border { 1117sub border {
1105 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1106} 1119}
1107 1120
1108sub size_request { 1121sub size_request {
1109 my ($self) = @_; 1122 my ($self) = @_;
1110 1123
1111 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1112 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1113 1129
1114 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1115 1131
1116 ( 1132 (
1117 $w + $self->border * 2, 1133 $w + $self->border * 2,
1118 $h + $self->border * 2, 1134 $h + $self->border * 2,
1119 ) 1135 )
1120} 1136}
1121 1137
1122sub size_allocate { 1138sub invoke_size_allocate {
1123 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1124 1140
1125 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1126 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1127 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1129 } 1145 }
1130 1146
1131 my $border = $self->border; 1147 my $border = $self->border;
1132 1148
1133 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1134 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1151
1152 $self->child->configure ($border, $border, $w, $h);
1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1135 1164
1136 $self->child->configure ($border, $border, $w, $h); 1165 1
1137} 1166}
1138 1167
1139sub button_down { 1168sub invoke_button_down {
1140 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1141 1170
1142 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1143 my $border = $self->border; 1172 my $border = $self->border;
1144 1173
… …
1160 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1161 1190
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1193
1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1195 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1196 };
1168 1197
1169 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1175 1204
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1206
1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1208 # HACK: the next line is required to enforce placement
1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1210 };
1180 } else { 1211 } else {
1181 return 0; 1212 return 0;
1182 } 1213 }
1183 1214
1184 1 1215 1
1185} 1216}
1186 1217
1187sub button_up { 1218sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1189 1220
1190 !!delete $self->{motion} 1221 ! ! delete $self->{motion}
1191} 1222}
1192 1223
1193sub mouse_motion { 1224sub invoke_mouse_motion {
1194 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1195 1226
1196 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197 1228
1198 !!$self->{motion} 1229 ! ! $self->{motion}
1199} 1230}
1200 1231
1201sub _draw { 1232sub _draw {
1202 my ($self) = @_; 1233 my ($self) = @_;
1203 1234
… …
1229 1260
1230 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1231 1262
1232 $child->draw; 1263 $child->draw;
1233 1264
1234 if ($self->{title}) { 1265 if ($self->{title_widget}) {
1235 glTranslate 0, $border - $self->{h}; 1266 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw; 1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1237 } 1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1238} 1274}
1239 1275
1240############################################################################# 1276#############################################################################
1241 1277
1242package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1265 1301
1266 $child->set_parent ($self); 1302 $child->set_parent ($self);
1267 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1268 1304
1269 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1270} 1312}
1271 1313
1272# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1273sub clear { 1315sub clear {
1274 my ($self) = @_; 1316 my ($self) = @_;
… …
1315 (sum @$ws), 1357 (sum @$ws),
1316 (sum @$hs), 1358 (sum @$hs),
1317 ) 1359 )
1318} 1360}
1319 1361
1320sub size_allocate { 1362sub invoke_size_allocate {
1321 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1322 1364
1323 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1324 1366
1325 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1357 } 1399 }
1358 1400
1359 $y += $row_h; 1401 $y += $row_h;
1360 } 1402 }
1361 1403
1404 1
1362} 1405}
1363 1406
1364sub find_widget { 1407sub find_widget {
1365 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1366 1409
… …
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 ) 1448 )
1406} 1449}
1407 1450
1408sub size_allocate { 1451sub invoke_size_allocate {
1409 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1410 1453
1411 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1412 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1413 1456
1414 my @req; 1457 my @req;
1415 1458
1416 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1417 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1418 } else { 1461 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1420 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1421 1464
1422 if ($req > $space) { 1465 if ($req > $space) {
1423 # ah well, not enough space 1466 # ah well, not enough space
1424 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1425 } else { 1468 } else {
1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1427 1470
1428 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1429 1472
1430 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1431 for 0 .. $#$children; 1474 for 0 .. $#children;
1432 } 1475 }
1433 } 1476 }
1434 1477
1435 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1436 1479
1437 my $pos = 0; 1480 my $pos = 0;
1438 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1439 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1441 1484
1442 $pos += $alloc; 1485 $pos += $alloc;
1443 } 1486 }
1444 1487
1445 1 1488 1
… …
1535 1578
1536 delete $self->{texture}; 1579 delete $self->{texture};
1537 $self->SUPER::update; 1580 $self->SUPER::update;
1538} 1581}
1539 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1540sub set_text { 1590sub set_text {
1541 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1542 1592
1543 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1545 1595
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1548 1598
1599 delete $self->{size_req};
1549 $self->realloc; 1600 $self->realloc;
1550 $self->update; 1601 $self->update;
1551} 1602}
1552 1603
1553sub set_markup { 1604sub set_markup {
… …
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1610 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1611
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1563 1614
1615 delete $self->{size_req};
1564 $self->realloc; 1616 $self->realloc;
1565 $self->update; 1617 $self->update;
1566} 1618}
1567 1619
1568sub size_request { 1620sub size_request {
1569 my ($self) = @_; 1621 my ($self) = @_;
1570 1622
1623 $self->{size_req} ||= do {
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1629
1577 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1578 1631
1579 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1580 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1635
1583 my ($w2, $h2) = $self->{template}->size; 1636 my ($w2, $h2) = $self->{template}->size;
1584 1637
1585 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1640 }
1641
1642 [$w, $h]
1587 } 1643 };
1588 1644
1589 ($w, $h) 1645 @{ $self->{size_req} }
1590} 1646}
1591 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1592sub size_allocate { 1652sub invoke_size_allocate {
1593 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1594 1654
1595 delete $self->{ox}; 1655 delete $self->{ox};
1596 1656
1597 delete $self->{texture} 1657 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1599} 1661}
1600 1662
1601sub set_fontsize { 1663sub set_fontsize {
1602 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1603 1665
1604 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1605 delete $self->{texture}; 1668 delete $self->{texture};
1606 1669
1607 $self->realloc; 1670 $self->realloc;
1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1608} 1679}
1609 1680
1610sub _draw { 1681sub _draw {
1611 my ($self) = @_; 1682 my ($self) = @_;
1612 1683
… …
1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1633 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1634 }; 1705 };
1635 1706
1636 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1638 1711
1639 if ($tex->{format} == GL_ALPHA) { 1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1640 glColor @{$self->{fg}}; 1714 glColor @{$self->{fg}};
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1642 } else { 1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1644 } 1719 }
1645 1720
1646 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1647} 1722}
1648 1723
… …
1665 can_hover => 1, 1740 can_hover => 1,
1666 can_focus => 1, 1741 can_focus => 1,
1667 valign => 0, 1742 valign => 0,
1668 can_events => 1, 1743 can_events => 1,
1669 #text => ... 1744 #text => ...
1745 #hidden => "*",
1670 @_ 1746 @_
1671 ) 1747 )
1672} 1748}
1673 1749
1674sub _set_text { 1750sub _set_text {
… …
1681 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1758 $self->{text} = $text;
1683 1759
1684 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1762 delete $self->{size_req};
1686 1763
1687 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1765
1766 $self->realloc;
1688 $self->update; 1767 $self->update;
1689} 1768}
1690 1769
1691sub set_text { 1770sub set_text {
1692 my ($self, $text) = @_; 1771 my ($self, $text) = @_;
1693 1772
1694 $self->{cursor} = length $text; 1773 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 1774 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 1775}
1699 1776
1700sub get_text { 1777sub get_text {
1701 $_[0]{text} 1778 $_[0]{text}
1702} 1779}
… …
1707 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1708 1785
1709 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1710} 1787}
1711 1788
1712sub key_down { 1789sub invoke_key_down {
1713 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1714 1791
1715 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1716 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1717 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
… …
1729 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1730 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1731 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1732 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1733 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1734 $self->_emit ('escape'); 1811 $self->emit ('escape');
1735 } elsif ($uni) { 1812 } elsif ($uni) {
1736 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else { 1814 } else {
1738 return 0; 1815 return 0;
1739 } 1816 }
… …
1743 $self->realloc; 1820 $self->realloc;
1744 1821
1745 1 1822 1
1746} 1823}
1747 1824
1748sub focus_in { 1825sub invoke_focus_in {
1749 my ($self) = @_; 1826 my ($self) = @_;
1750 1827
1751 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1752 1829
1753 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1754} 1831}
1755 1832
1756sub button_down { 1833sub invoke_button_down {
1757 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1758 1835
1759 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1760 1837
1761 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1762 1839
1763 # byte-index to char-index 1840 # byte-index to char-index
1764 my $text = $self->{text}; 1841 my $text = $self->{text};
… …
1769 $self->update; 1846 $self->update;
1770 1847
1771 1 1848 1
1772} 1849}
1773 1850
1774sub mouse_motion { 1851sub invoke_mouse_motion {
1775 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1776# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1777 1854
1778 0 1855 1
1779} 1856}
1780 1857
1781sub _draw { 1858sub _draw {
1782 my ($self) = @_; 1859 my ($self) = @_;
1783 1860
1784 local $self->{fg} = $self->{fg}; 1861 local $self->{fg} = $self->{fg};
1785 1862
1786 if ($FOCUS == $self) { 1863 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 1864 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 1865 $self->{fg} = $self->{active_fg};
1789 } else { 1866 } else {
1790 glColor @{$self->{bg}}; 1867 glColor_premultiply @{$self->{bg}};
1791 } 1868 }
1792 1869
1793 glEnable GL_BLEND; 1870 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1871 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS; 1872 glBegin GL_QUADS;
1796 glVertex 0 , 0; 1873 glVertex 0 , 0;
1797 glVertex 0 , $self->{h}; 1874 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 1875 glVertex $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0; 1876 glVertex $self->{w}, 0;
… …
1824 1901
1825our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1826 1903
1827use CFClient::OpenGL; 1904use CFClient::OpenGL;
1828 1905
1829sub key_down { 1906sub invoke_key_down {
1830 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1831 1908
1832 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1833 1910
1834 if ($sym == 13) { 1911 if ($sym == 13) {
1835 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1836 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1837 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1838 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1839 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1840 $self->update; 1918 $self->update;
1841 1919
1842 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1843 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1844 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
… …
1860 } else { 1938 } else {
1861 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1862 } 1940 }
1863 1941
1864 } else { 1942 } else {
1865 return $self->SUPER::key_down ($ev) 1943 return $self->SUPER::invoke_key_down ($ev)
1866 } 1944 }
1867 1945
1868 1 1946 1
1869} 1947}
1870 1948
… …
1894 can_events => 1, 1972 can_events => 1,
1895 @_ 1973 @_
1896 ) 1974 )
1897} 1975}
1898 1976
1899sub activate { }
1900
1901sub button_up { 1977sub invoke_button_up {
1902 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1903 1979
1904 $self->emit ("activate") 1980 $self->emit ("activate")
1905 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1906 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
… …
1909} 1985}
1910 1986
1911sub _draw { 1987sub _draw {
1912 my ($self) = @_; 1988 my ($self) = @_;
1913 1989
1914 local $self->{fg} = $self->{fg}; 1990 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919 1991
1920 glEnable GL_TEXTURE_2D; 1992 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 1994 glColor 0, 0, 0, 1;
1923 1995
1924 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1925 1997
1926 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1927 1999
1928 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
2001}
2002
2003#############################################################################
2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
1929} 2037}
1930 2038
1931############################################################################# 2039#############################################################################
1932 2040
1933package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
… …
1960 my ($self) = @_; 2068 my ($self) = @_;
1961 2069
1962 (6) x 2 2070 (6) x 2
1963} 2071}
1964 2072
1965sub button_down { 2073sub invoke_button_down {
1966 my ($self, $ev, $x, $y) = @_; 2074 my ($self, $ev, $x, $y) = @_;
1967 2075
1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2076 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2077 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970 $self->{state} = !$self->{state}; 2078 $self->{state} = !$self->{state};
1971 $self->_emit (changed => $self->{state}); 2079 $self->emit (changed => $self->{state});
1972 } else { 2080 } else {
1973 return 0 2081 return 0
1974 } 2082 }
1975 2083
1976 1 2084 1
… …
2001package CFClient::UI::Image; 2109package CFClient::UI::Image;
2002 2110
2003our @ISA = CFClient::UI::Base::; 2111our @ISA = CFClient::UI::Base::;
2004 2112
2005use CFClient::OpenGL; 2113use CFClient::OpenGL;
2006use Carp qw/confess/;
2007 2114
2008our %loaded_images; 2115our %texture_cache;
2009 2116
2010sub new { 2117sub new {
2011 my $class = shift; 2118 my $class = shift;
2012 2119
2013 my $self = $class->SUPER::new (can_events => 0, @_); 2120 my $self = $class->SUPER::new (
2121 can_events => 0,
2122 @_,
2123 );
2014 2124
2015 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2125 $self->{path}
2126 or Carp::croak "required attribute 'path' not set";
2016 2127
2017 $loaded_images{$self->{image}} ||= 2128 $self->{tex} = $texture_cache{$self->{path}} ||=
2018 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2129 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2019 2130
2020 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2131 Scalar::Util::weaken $texture_cache{$self->{path}};
2021 2132
2022 Scalar::Util::weaken $loaded_images{$self->{image}}; 2133 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2023
2024 $self->{aspect} = $tex->{w} / $tex->{h};
2025 2134
2026 $self 2135 $self
2027} 2136}
2028 2137
2029sub size_request { 2138sub size_request {
2030 my ($self) = @_; 2139 my ($self) = @_;
2031 2140
2032 ($self->{tex}->{w}, $self->{tex}->{h}) 2141 ($self->{tex}{w}, $self->{tex}{h})
2033} 2142}
2034 2143
2035sub _draw { 2144sub _draw {
2036 my ($self) = @_; 2145 my ($self) = @_;
2037 2146
… …
2146 my $ycut1 = max 0, min 1, $ycut; 2255 my $ycut1 = max 0, min 1, $ycut;
2147 my $ycut2 = max 0, min 1, $ycut - 1; 2256 my $ycut2 = max 0, min 1, $ycut - 1;
2148 2257
2149 my $h1 = $self->{h} * (1 - $ycut1); 2258 my $h1 = $self->{h} * (1 - $ycut1);
2150 my $h2 = $self->{h} * (1 - $ycut2); 2259 my $h2 = $self->{h} * (1 - $ycut2);
2260 my $h3 = $self->{h};
2261
2262 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2151 2263
2152 glEnable GL_BLEND; 2264 glEnable GL_BLEND;
2153 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2265 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2266 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2154 glEnable GL_TEXTURE_2D; 2267 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2268 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2269
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2270 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2271 glBegin GL_QUADS;
… …
2173 2286
2174 if ($t3) { 2287 if ($t3) {
2175 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2288 glBindTexture GL_TEXTURE_2D, $t3->{name};
2176 glBegin GL_QUADS; 2289 glBegin GL_QUADS;
2177 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2290 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2178 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2291 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2179 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2292 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2180 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2293 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2181 glEnd; 2294 glEnd;
2182 } 2295 }
2183 2296
2184 glDisable GL_BLEND; 2297 glDisable GL_BLEND;
… …
2272 $self->update; 2385 $self->update;
2273 2386
2274 $self 2387 $self
2275} 2388}
2276 2389
2277sub changed { }
2278
2279sub set_range { 2390sub set_range {
2280 my ($self, $range) = @_; 2391 my ($self, $range) = @_;
2281 2392
2282 ($range, $self->{range}) = ($self->{range}, $range); 2393 ($range, $self->{range}) = ($self->{range}, $range);
2283 2394
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}"; 2395 if ("@$range" ne "@{$self->{range}}") {
2396 $self->update;
2397 $self->set_value ($self->{range}[0]);
2398 }
2286} 2399}
2287 2400
2288sub set_value { 2401sub set_value {
2289 my ($self, $value) = @_; 2402 my ($self, $value) = @_;
2290 2403
… …
2301 if $unit; 2414 if $unit;
2302 2415
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2416 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304 2417
2305 if ($value != $old_value) { 2418 if ($value != $old_value) {
2306 $self->_emit (changed => $value); 2419 $self->emit (changed => $value);
2307 $self->update; 2420 $self->update;
2308 } 2421 }
2309} 2422}
2310 2423
2311sub size_request { 2424sub size_request {
2312 my ($self) = @_; 2425 my ($self) = @_;
2313 2426
2314 ($self->{req_w}, $self->{req_h}) 2427 ($self->{req_w}, $self->{req_h})
2315} 2428}
2316 2429
2317sub button_down { 2430sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_; 2431 my ($self, $ev, $x, $y) = @_;
2319 2432
2320 $self->SUPER::button_down ($ev, $x, $y); 2433 $self->SUPER::invoke_button_down ($ev, $x, $y);
2321 2434
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2435 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323 2436
2324 $self->mouse_motion ($ev, $x, $y) 2437 $self->invoke_mouse_motion ($ev, $x, $y)
2325} 2438}
2326 2439
2327sub mouse_motion { 2440sub invoke_mouse_motion {
2328 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2329 2442
2330 if ($GRAB == $self) { 2443 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2444 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332 2445
… …
2437sub set_range { shift->{slider}->set_range (@_) } 2550sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) } 2551sub set_value { shift->{slider}->set_value (@_) }
2439 2552
2440############################################################################# 2553#############################################################################
2441 2554
2442package CFClient::UI::TextView; 2555package CFClient::UI::TextScroller;
2443 2556
2444our @ISA = CFClient::UI::HBox::; 2557our @ISA = CFClient::UI::HBox::;
2445 2558
2446use CFClient::OpenGL; 2559use CFClient::OpenGL;
2447 2560
… …
2449 my $class = shift; 2562 my $class = shift;
2450 2563
2451 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2452 fontsize => 1, 2565 fontsize => 1,
2453 can_events => 0, 2566 can_events => 0,
2567 indent => 0,
2454 #font => default_font 2568 #font => default_font
2455 @_, 2569 @_,
2456 2570
2457 layout => (new CFClient::Layout 1), 2571 layout => (new CFClient::Layout 1),
2458 par => [], 2572 par => [],
… …
2473 2587
2474 $self->{fontsize} = $fontsize; 2588 $self->{fontsize} = $fontsize;
2475 $self->reflow; 2589 $self->reflow;
2476} 2590}
2477 2591
2592sub size_request {
2593 my ($self) = @_;
2594
2595 my ($empty, $slider) = @{ $self->{children} };
2596
2597 local $self->{children} = [$empty, $slider];
2598 $self->SUPER::size_request
2599}
2600
2478sub size_allocate { 2601sub invoke_size_allocate {
2479 my ($self, $w, $h) = @_; 2602 my ($self, $w, $h) = @_;
2480 2603
2481 $self->SUPER::size_allocate ($w, $h); 2604 my ($empty, $slider, @other) = @{ $self->{children} };
2605 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2482 2606
2483 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2607 $self->{layout}->set_font ($self->{font}) if $self->{font};
2484 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2608 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485 $self->{layout}->set_width ($self->{children}[0]{w}); 2609 $self->{layout}->set_width ($empty->{w});
2610 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2486 2611
2487 $self->reflow; 2612 $self->reflow;
2488}
2489 2613
2490sub text_size { 2614 local $self->{children} = [$empty, $slider];
2491 my ($self, $text, $indent) = @_; 2615 $self->SUPER::invoke_size_allocate ($w, $h)
2616}
2617
2618sub get_layout {
2619 my ($self, $para) = @_;
2492 2620
2493 my $layout = $self->{layout}; 2621 my $layout = $self->{layout};
2494 2622
2623 $layout->set_font ($self->{font}) if $self->{font};
2624 $layout->set_foreground (@{$para->{fg}});
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2625 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $layout->set_width ($self->{children}[0]{w} - $indent); 2626 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2627 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2497 $layout->set_markup ($text); 2628 $layout->set_markup ($para->{markup});
2629
2630 $layout->set_shapes (
2631 map
2632 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2633 @{$para->{widget}}
2498 2634 );
2635
2499 $layout->size 2636 $layout
2500} 2637}
2501 2638
2502sub reflow { 2639sub reflow {
2503 my ($self) = @_; 2640 my ($self) = @_;
2504 2641
… …
2513 $self->{children}[1]->set_value ($offset); 2650 $self->{children}[1]->set_value ($offset);
2514} 2651}
2515 2652
2516sub clear { 2653sub clear {
2517 my ($self) = @_; 2654 my ($self) = @_;
2655
2656 my (undef, undef, @other) = @{ $self->{children} };
2657 $self->remove ($_) for @other;
2518 2658
2519 $self->{par} = []; 2659 $self->{par} = [];
2520 $self->{height} = 0; 2660 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2661 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522} 2662}
2523 2663
2524sub add_paragraph { 2664sub add_paragraph {
2525 my ($self, $color, $text, $indent) = @_; 2665 my ($self, $color, $para, $indent) = @_;
2526 2666
2527 for my $line (split /\n/, $text) { 2667 my ($text, @w) = ref $para ? @$para : $para;
2528 my ($w, $h) = $self->text_size ($line); 2668
2529 $self->{height} += $h; 2669 $para = {
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2670 w => 1e10,
2671 wrapped => 1,
2672 fg => $color,
2673 indent => $indent,
2674 markup => $text,
2675 widget => \@w,
2531 } 2676 };
2532 2677
2533 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2678 $self->add (@w) if @w;
2679 push @{$self->{par}}, $para;
2680
2681 $self->{need_reflow}++;
2682 $self->update;
2683}
2684
2685sub scroll_to_bottom {
2686 my ($self) = @_;
2687
2688 $self->{scroll_to_bottom} = 1;
2689 $self->update;
2534} 2690}
2535 2691
2536sub update { 2692sub update {
2537 my ($self) = @_; 2693 my ($self) = @_;
2538 2694
… …
2540 2696
2541 return unless $self->{h} > 0; 2697 return unless $self->{h} > 0;
2542 2698
2543 delete $self->{texture}; 2699 delete $self->{texture};
2544 2700
2545 $ROOT->on_post_alloc ($self, sub { 2701 $ROOT->on_post_alloc ($self => sub {
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2702 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547 2703
2548 if (delete $self->{need_reflow}) { 2704 if (delete $self->{need_reflow}) {
2549 my $height = 0; 2705 my $height = 0;
2550 2706
2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2555 for (@{$self->{par}}) { 2707 for my $para (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2708 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2557 $layout->set_width ($W - $_->[3]); 2709 my $layout = $self->get_layout ($para);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size; 2710 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3]; 2711
2561 $_->[1] = $h; 2712 $para->{w} = $w + $para->{indent};
2713 $para->{h} = $h;
2714 $para->{wrapped} = $layout->has_wrapped;
2562 } 2715 }
2563 2716
2564 $height += $_->[1]; 2717 $height += $para->{h};
2565 } 2718 }
2566 2719
2567 $self->{height} = $height; 2720 $self->{height} = $height;
2568 2721
2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2722 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2570 2723
2571 delete $self->{texture}; 2724 delete $self->{texture};
2572 } 2725 }
2573 2726
2727 if (delete $self->{scroll_to_bottom}) {
2728 $self->{children}[1]->set_value (1e10);
2729 }
2730
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2731 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 2732 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 2733 glClear GL_COLOR_BUFFER_BIT;
2577 2734
2578 my $top = int $self->{children}[1]{range}[0]; 2735 my $top = int $self->{children}[1]{range}[0];
2579 2736
2580 my $y0 = $top; 2737 my $y0 = $top;
2581 my $y1 = $top + $H; 2738 my $y1 = $top + $H;
2582 2739
2583 my $y = 0; 2740 my $y = 0;
2584
2585 my $layout = $self->{layout};
2586
2587 $layout->set_font ($self->{font}) if $self->{font};
2588 2741
2589 glEnable GL_BLEND; 2742 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off 2743 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2744 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592 2745
2593 for my $par (@{$self->{par}}) { 2746 for my $para (@{$self->{par}}) {
2594 my $h = $par->[1]; 2747 my $h = $para->{h};
2595 2748
2596 if ($y0 < $y + $h && $y < $y1) { 2749 if ($y0 < $y + $h && $y < $y1) {
2597 $layout->set_foreground (@{ $par->[2] }); 2750
2598 $layout->set_width ($W - $par->[3]); 2751 my $layout = $self->get_layout ($para);
2599 $layout->set_markup ($par->[4]);
2600 2752
2601 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2753 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2602 2754
2603 glRasterPos $par->[3], $y - $y0; 2755 glRasterPos $para->{indent}, $y - $y0;
2604 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2756 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757
2758 if (my @w = @{ $para->{widget} }) {
2759 my @s = $layout->get_shapes;
2760
2761 glDisable GL_BLEND;
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 glEnable GL_BLEND;
2771 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772 }
2605 } 2773 }
2606 2774
2607 $y += $h; 2775 $y += $h;
2608 } 2776 }
2609 2777
2610 glDisable GL_BLEND; 2778 glDisable GL_BLEND;
2611 }; 2779 };
2612 }); 2780 });
2613} 2781}
2614 2782
2783sub reconfigure {
2784 my ($self) = @_;
2785
2786 $self->SUPER::reconfigure;
2787
2788 $_->{w} = 1e10 for @{ $self->{par} };
2789 $self->reflow;
2790}
2791
2615sub _draw { 2792sub _draw {
2616 my ($self) = @_; 2793 my ($self) = @_;
2617 2794
2618 glEnable GL_TEXTURE_2D; 2795 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2796 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 2797 glColor 0, 0, 0, 1;
2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2798 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622 glDisable GL_TEXTURE_2D; 2799 glDisable GL_TEXTURE_2D;
2623 2800
2624 $self->{children}[1]->draw; 2801 $self->{children}[1]->draw;
2625
2626} 2802}
2627 2803
2628############################################################################# 2804#############################################################################
2629 2805
2630package CFClient::UI::Animator; 2806package CFClient::UI::Animator;
… …
2717 $tooltip .= "\n\n" . (ref $widget) . "\n" 2893 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2894 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n" 2895 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}"; 2896 . "visible $widget->{visible}";
2721 } 2897 }
2898
2899 $tooltip =~ s/^\n+//;
2900 $tooltip =~ s/\n+$//;
2722 2901
2723 $self->add (new CFClient::UI::Label 2902 $self->add (new CFClient::UI::Label
2724 markup => $tooltip, 2903 markup => $tooltip,
2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2904 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726 fontsize => 0.8, 2905 fontsize => 0.8,
… …
2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2915 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737 2916
2738 ($w + 4, $h + 4) 2917 ($w + 4, $h + 4)
2739} 2918}
2740 2919
2741sub size_allocate { 2920sub invoke_size_allocate {
2742 my ($self, $w, $h) = @_; 2921 my ($self, $w, $h) = @_;
2743 2922
2744 $self->SUPER::size_allocate ($w - 4, $h - 4); 2923 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745} 2924}
2746 2925
2747sub visibility_change { 2926sub invoke_visibility_change {
2748 my ($self, $visible) = @_; 2927 my ($self, $visible) = @_;
2749 2928
2750 return unless $visible; 2929 return unless $visible;
2751 2930
2752 $self->{root}->on_post_alloc ("move_$self" => sub { 2931 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2754 or return; 2933 or return;
2755 2934
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2935 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757 2936
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2937 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH; 2938 if $x + $self->{w} > $self->{root}{w};
2760 2939
2761 $self->move_abs ($x, $y); 2940 $self->move_abs ($x, $y);
2762 }); 2941 });
2763} 2942}
2764 2943
… …
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3032 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854 3033
2855 if ($tex) { 3034 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 3035 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 3037 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3038 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 3039 glDisable GL_TEXTURE_2D;
2861 } 3040 }
2862} 3041}
2863 3042
2864sub DESTROY { 3043sub destroy {
2865 my ($self) = @_; 3044 my ($self) = @_;
2866 3045
2867 $self->{timer}->cancel 3046 $self->{timer}->cancel
2868 if $self->{timer}; 3047 if $self->{timer};
2869 3048
2870 $self->SUPER::DESTROY; 3049 $self->SUPER::destroy;
2871} 3050}
2872 3051
2873############################################################################# 3052#############################################################################
2874 3053
2875package CFClient::UI::Buttonbar; 3054package CFClient::UI::Buttonbar;
… …
2896 ); 3075 );
2897 3076
2898 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3077 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2899 3078
2900 for my $item (@{ $self->{items} }) { 3079 for my $item (@{ $self->{items} }) {
2901 my ($widget, $cb) = @$item; 3080 my ($widget, $cb, $tooltip) = @$item;
2902 3081
2903 # handle various types of items, only text for now 3082 # handle various types of items, only text for now
2904 if (!ref $widget) { 3083 if (!ref $widget) {
2905 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2906 can_hover => 1, 3085 can_hover => 1,
2907 can_events => 1, 3086 can_events => 1,
2908 text => $widget; 3087 markup => $widget,
3088 tooltip => $tooltip
2909 } 3089 }
2910 3090
2911 $self->{item}{$widget} = $item; 3091 $self->{item}{$widget} = $item;
2912 3092
2913 $self->{vbox}->add ($widget); 3093 $self->{vbox}->add ($widget);
… …
2918 3098
2919# popup given the event (must be a mouse button down event currently) 3099# popup given the event (must be a mouse button down event currently)
2920sub popup { 3100sub popup {
2921 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
2922 3102
2923 $self->_emit ("popdown"); 3103 $self->emit ("popdown");
2924 3104
2925 # maybe save $GRAB? must be careful about events... 3105 # maybe save $GRAB? must be careful about events...
2926 $GRAB = $self; 3106 $GRAB = $self;
2927 $self->{button} = $ev->{button}; 3107 $self->{button} = $ev->{button};
2928 3108
2929 $self->show; 3109 $self->show;
2930 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3110 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2931} 3111}
2932 3112
2933sub mouse_motion { 3113sub invoke_mouse_motion {
2934 my ($self, $ev, $x, $y) = @_; 3114 my ($self, $ev, $x, $y) = @_;
2935 3115
2936 # TODO: should use vbox->find_widget or so 3116 # TODO: should use vbox->find_widget or so
2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3117 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938 $self->{hover} = $self->{item}{$HOVER}; 3118 $self->{hover} = $self->{item}{$HOVER};
2939 3119
2940 0 3120 0
2941} 3121}
2942 3122
2943sub button_up { 3123sub invoke_button_up {
2944 my ($self, $ev, $x, $y) = @_; 3124 my ($self, $ev, $x, $y) = @_;
2945 3125
2946 if ($ev->{button} == $self->{button}) { 3126 if ($ev->{button} == $self->{button}) {
2947 undef $GRAB; 3127 undef $GRAB;
2948 $self->hide; 3128 $self->hide;
2949 3129
2950 $self->_emit ("popdown"); 3130 $self->emit ("popdown");
2951 $self->{hover}[1]->() if $self->{hover}; 3131 $self->{hover}[1]->() if $self->{hover};
2952 } else { 3132 } else {
2953 return 0 3133 return 0
2954 } 3134 }
2955 3135
… …
2992 : $self->{children}[$page_or_widget]; 3172 : $self->{children}[$page_or_widget];
2993 3173
2994 $self->{current} = $widget; 3174 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3175 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996 3176
2997 $self->_emit (page_changed => $self->{current}); 3177 $self->emit (page_changed => $self->{current});
2998 3178
2999 $self->realloc; 3179 $self->realloc;
3000} 3180}
3001 3181
3002sub visible_children { 3182sub visible_children {
… …
3007 my ($self) = @_; 3187 my ($self) = @_;
3008 3188
3009 $self->{current}->size_request 3189 $self->{current}->size_request
3010} 3190}
3011 3191
3012sub size_allocate { 3192sub invoke_size_allocate {
3013 my ($self, $w, $h) = @_; 3193 my ($self, $w, $h) = @_;
3014 3194
3015 $self->{current}->configure (0, 0, $w, $h); 3195 $self->{current}->configure (0, 0, $w, $h);
3196
3197 1
3016} 3198}
3017 3199
3018sub _draw { 3200sub _draw {
3019 my ($self) = @_; 3201 my ($self) = @_;
3020 3202
… …
3059 3241
3060sub set_current_page { 3242sub set_current_page {
3061 my ($self, $page) = @_; 3243 my ($self, $page) = @_;
3062 3244
3063 $self->{multiplexer}->set_current_page ($page); 3245 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current}); 3246 $self->emit (page_changed => $self->{multiplexer}{current});
3065} 3247}
3066 3248
3067############################################################################# 3249#############################################################################
3068 3250
3069package CFClient::UI::Statusbox; 3251package CFClient::UI::Combobox;
3070 3252
3253use utf8;
3254
3071our @ISA = CFClient::UI::VBox::; 3255our @ISA = CFClient::UI::Button::;
3072 3256
3073sub new { 3257sub new {
3074 my $class = shift; 3258 my $class = shift;
3075 3259
3076 $class->SUPER::new ( 3260 my $self = $class->SUPER::new (
3261 options => [], # [value, title, longdesc], ...
3262 value => undef,
3263 @_,
3264 );
3265
3266 $self->_set_value ($self->{value});
3267
3268 $self
3269}
3270
3271sub invoke_button_down {
3272 my ($self, $ev) = @_;
3273
3274 my @menu_items;
3275
3276 for (@{ $self->{options} }) {
3277 my ($value, $title, $tooltip) = @$_;
3278
3279 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3280 }
3281
3282 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3283}
3284
3285sub _set_value {
3286 my ($self, $value) = @_;
3287
3288 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3289 or return;
3290
3291 $self->{value} = $item->[0];
3292 $self->set_markup ("$item->[1] ⇓");
3293 $self->set_tooltip ($item->[2]);
3294}
3295
3296sub set_value {
3297 my ($self, $value) = @_;
3298
3299 return unless $self->{value} ne $value;
3300
3301 $self->_set_value ($value);
3302 $self->emit (changed => $value);
3303}
3304
3305#############################################################################
3306
3307package CFClient::UI::Statusbox;
3308
3309our @ISA = CFClient::UI::VBox::;
3310
3311sub new {
3312 my $class = shift;
3313
3314 my $self = $class->SUPER::new (
3077 fontsize => 0.8, 3315 fontsize => 0.8,
3078 @_, 3316 @_,
3079 ) 3317 );
3318
3319 Scalar::Util::weaken (my $this = $self);
3320
3321 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3322
3323 $self
3080} 3324}
3081 3325
3082sub reorder { 3326sub reorder {
3083 my ($self) = @_; 3327 my ($self) = @_;
3084 my $NOW = time; 3328 my $NOW = Time::HiRes::time;
3329
3330 # freeze display when hovering over any label
3331 return if $CFClient::UI::TOOLTIP->{owner}
3332 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3333 values %{ $self->{item} };
3085 3334
3086 while (my ($k, $v) = each %{ $self->{item} }) { 3335 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3336 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 3337 }
3089 3338
… …
3092 my @items = sort { 3341 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 3342 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 3343 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 3344 } values %{ $self->{item} };
3096 3345
3346 $self->{timer}->interval (1);
3347
3097 my $count = 10 + 1; 3348 my $count = 10 + 1;
3098 for my $item (@items) { 3349 for my $item (@items) {
3099 last unless --$count; 3350 last unless --$count;
3100 3351
3101 push @widgets, $item->{label} ||= do { 3352 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 3353 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 3354 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 3355 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 3356 : $item->{text};
3106 3357
… …
3114 tooltip => $item->{tooltip}, 3365 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 3366 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 3367 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 3368 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 3369 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 3370 fg => [@{ $item->{fg} }],
3120 can_events => 1, 3371 can_events => 1,
3121 can_hover => 1 3372 can_hover => 1
3122 }; 3373 };
3374
3375 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3376 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3377 $label->update;
3378 $label->set_max_size (undef, $label->{req_h} * $diff)
3379 if $diff < 1;
3380 $self->{timer}->interval (1/30);
3381 } else {
3382 $label->{fg}[3] = $item->{fg}[3] || 1;
3383 }
3384
3385 push @widgets, $label;
3123 } 3386 }
3124 3387
3125 $self->clear; 3388 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 3389 $self->SUPER::add (reverse @widgets);
3127} 3390}
… …
3132 $text =~ s/^\s+//; 3395 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 3396 $text =~ s/\s+$//;
3134 3397
3135 return unless $text; 3398 return unless $text;
3136 3399
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 3400 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 3401
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3402 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 3403
3141 if (my $item = $self->{item}{$group}) { 3404 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 3405 if ($item->{text} eq $text) {
3143 $item->{count}++; 3406 $item->{count}++;
3144 } else { 3407 } else {
3145 $item->{count} = 1; 3408 $item->{count} = 1;
3146 $item->{text} = $item->{tooltip} = $text; 3409 $item->{text} = $item->{tooltip} = $text;
3147 } 3410 }
3148 $item->{id} = ++$self->{id}; 3411 $item->{id} += 0.2;#d#
3149 $item->{timeout} = $timeout; 3412 $item->{timeout} = $timeout;
3150 delete $item->{label}; 3413 delete $item->{label};
3151 } else { 3414 } else {
3152 $self->{item}{$group} = { 3415 $self->{item}{$group} = {
3153 id => ++$self->{id}, 3416 id => ++$self->{id},
… …
3159 count => 1, 3422 count => 1,
3160 %arg, 3423 %arg,
3161 }; 3424 };
3162 } 3425 }
3163 3426
3427 $ROOT->on_refresh (reorder => sub {
3164 $self->reorder; 3428 $self->reorder;
3429 });
3165} 3430}
3166 3431
3167sub reconfigure { 3432sub reconfigure {
3168 my ($self) = @_; 3433 my ($self) = @_;
3169 3434
… …
3172 3437
3173 $self->reorder; 3438 $self->reorder;
3174 $self->SUPER::reconfigure; 3439 $self->SUPER::reconfigure;
3175} 3440}
3176 3441
3442sub destroy {
3443 my ($self) = @_;
3444
3445 $self->{timer}->cancel;
3446
3447 $self->SUPER::destroy;
3448}
3449
3177############################################################################# 3450#############################################################################
3178 3451
3179package CFClient::UI::Inventory; 3452package CFClient::UI::Inventory;
3180 3453
3181our @ISA = CFClient::UI::ScrolledWindow::; 3454our @ISA = CFClient::UI::Table::;
3182 3455
3183sub new { 3456sub new {
3184 my $class = shift; 3457 my $class = shift;
3185 3458
3186 my $self = $class->SUPER::new ( 3459 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3460 col_expand => [0, 1, 0],
3188 @_, 3461 @_,
3189 ); 3462 );
3190 3463
3191 $self 3464 $self
3192} 3465}
3193 3466
3194sub set_items { 3467sub set_items {
3195 my ($self, $items) = @_; 3468 my ($self, $items) = @_;
3196 3469
3197 $self->{child}->clear; 3470 $self->clear;
3198 return unless $items; 3471 return unless $items;
3199 3472
3200 my @items = sort { 3473 my @items = sort {
3201 ($a->{type} <=> $b->{type}) 3474 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name}) 3475 or ($a->{name} cmp $b->{name})
3203 } @$items; 3476 } values %$items;
3204 3477
3205 $self->{real_items} = \@items; 3478 $self->{real_items} = \@items;
3206 3479
3207 my $row = 0; 3480 my $row = 0;
3208 for my $item (@items) { 3481 for my $item (@items) {
3209 CFClient::Item::update_widgets $item; 3482 CFClient::Item::update_widgets $item;
3210 3483
3211 $self->{child}->add (0, $row, $item->{face_widget}); 3484 $self->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget}); 3485 $self->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget}); 3486 $self->add (2, $row, $item->{weight_widget});
3214 3487
3215 $row++; 3488 $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 } 3489 }
3414} 3490}
3415 3491
3416############################################################################# 3492#############################################################################
3417 3493
… …
3427 commands => [], 3503 commands => [],
3428 @_, 3504 @_,
3429 ) 3505 )
3430} 3506}
3431 3507
3432# XXX: Do sorting? Argl... 3508my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3509
3510my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3511 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3512my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3513 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3514my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3515 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3516my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3517 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3518my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3519 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3520
3521sub rebuild_spell_list {
3522 my ($self) = @_;
3523
3524 $CFClient::UI::ROOT->on_refresh ($self => sub {
3525 $self->clear;
3526
3527 return unless $::CONN;
3528
3529 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3530 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3531 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3532 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3533 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3534
3535 my $row = 0;
3536
3537 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3538 my $spell = $self->{spell}{$_};
3539
3540 $row++;
3541
3542 my $spell_cb = sub {
3543 my ($widget, $ev) = @_;
3544
3545 if ($ev->{button} == 1) {
3546 $::CONN->user_send ("cast $spell->{name}");
3547 } elsif ($ev->{button} == 2) {
3548 $::CONN->user_send ("invoke $spell->{name}");
3549 } elsif ($ev->{button} == 3) {
3550 (new CFClient::UI::Menu
3551 items => [
3552 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3553 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3554 ],
3555 )->popup ($ev);
3556 } else {
3557 return 0;
3558 }
3559
3560 1
3561 };
3562
3563 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3564
3565 #TODO: add path info to tooltip
3566 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3567
3568 $self->add (0, $row, new CFClient::UI::Face
3569 face => $spell->{face},
3570 can_hover => 1,
3571 can_events => 1,
3572 tooltip => $tooltip,
3573 on_button_down => $spell_cb,
3574 );
3575
3576 $self->add (1, $row, new CFClient::UI::Label
3577 expand => 1,
3578 text => $spell->{name},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $tooltip,
3582 on_button_down => $spell_cb,
3583 );
3584
3585 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3586 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3587 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3588 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3589 }
3590 });
3591}
3592
3433sub add_spell { 3593sub add_spell {
3434 my ($self, $spell) = @_; 3594 my ($self, $spell) = @_;
3595
3435 $self->{spells}->{$spell->{name}} = $spell; 3596 $self->{spell}->{$spell->{name}} = $spell;
3436 3597 $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} 3598}
3465 3599
3466sub remove_spell { 3600sub remove_spell {
3467 my ($self, $spell) = @_; 3601 my ($self, $spell) = @_;
3602
3468 delete $self->{spells}->{$spell->{name}}; 3603 delete $self->{spell}->{$spell->{name}};
3469 $self->rebuild_spell_list; 3604 $self->rebuild_spell_list;
3470} 3605}
3471 3606
3607sub clear_spells {
3608 my ($self) = @_;
3609
3610 $self->{spell} = {};
3611 $self->rebuild_spell_list;
3612}
3613
3472############################################################################# 3614#############################################################################
3473 3615
3474package CFClient::UI::Root; 3616package CFClient::UI::Root;
3475 3617
3476our @ISA = CFClient::UI::Container::; 3618our @ISA = CFClient::UI::Container::;
3619
3620use List::Util qw(min max);
3477 3621
3478use CFClient::OpenGL; 3622use CFClient::OpenGL;
3479 3623
3480sub new { 3624sub new {
3481 my $class = shift; 3625 my $class = shift;
… …
3508 $coord = $max - $size if $coord > $max - $size; 3652 $coord = $max - $size if $coord > $max - $size;
3509 3653
3510 int $coord + 0.5 3654 int $coord + 0.5
3511} 3655}
3512 3656
3513sub size_allocate { 3657sub invoke_size_allocate {
3514 my ($self, $w, $h) = @_; 3658 my ($self, $w, $h) = @_;
3515 3659
3516 for my $child ($self->children) { 3660 for my $child ($self->children) {
3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3661 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3518 3662
… …
3522 $X = _to_pixel $X, $W, $self->{w}; 3666 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h}; 3667 $Y = _to_pixel $Y, $H, $self->{h};
3524 3668
3525 $child->configure ($X, $Y, $W, $H); 3669 $child->configure ($X, $Y, $W, $H);
3526 } 3670 }
3671
3672 1
3527} 3673}
3528 3674
3529sub coord2local { 3675sub coord2local {
3530 my ($self, $x, $y) = @_; 3676 my ($self, $x, $y) = @_;
3531 3677
… …
3616 3762
3617 delete $queue{$widget+0}; 3763 delete $queue{$widget+0};
3618 3764
3619 my ($w, $h) = $widget->size_request; 3765 my ($w, $h) = $widget->size_request;
3620 3766
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3767 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3768 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3769
3770 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3771 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623 3772
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 3773 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 3774 $h = $widget->{force_h} if exists $widget->{force_h};
3626 3775
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3776 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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