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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.319 by root, Sun Jul 2 21:07:26 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
… …
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);
1179 # HACK: the next line is required to enforce placement 1208 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1181 }; 1210 };
1182 } else { 1211 } else {
1183 return 0; 1212 return 0;
1184 } 1213 }
1185 1214
1186 1 1215 1
1187} 1216}
1188 1217
1189sub button_up { 1218sub invoke_button_up {
1190 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1191 1220
1192 !!delete $self->{motion} 1221 ! ! delete $self->{motion}
1193} 1222}
1194 1223
1195sub mouse_motion { 1224sub invoke_mouse_motion {
1196 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1197 1226
1198 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199 1228
1200 !!$self->{motion} 1229 ! ! $self->{motion}
1201} 1230}
1202 1231
1203sub _draw { 1232sub _draw {
1204 my ($self) = @_; 1233 my ($self) = @_;
1205 1234
… …
1231 1260
1232 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1233 1262
1234 $child->draw; 1263 $child->draw;
1235 1264
1236 if ($self->{title}) { 1265 if ($self->{title_widget}) {
1237 glTranslate 0, $border - $self->{h}; 1266 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw; 1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1239 } 1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1240} 1274}
1241 1275
1242############################################################################# 1276#############################################################################
1243 1277
1244package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1267 1301
1268 $child->set_parent ($self); 1302 $child->set_parent ($self);
1269 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1270 1304
1271 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1272} 1312}
1273 1313
1274# 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?
1275sub clear { 1315sub clear {
1276 my ($self) = @_; 1316 my ($self) = @_;
… …
1317 (sum @$ws), 1357 (sum @$ws),
1318 (sum @$hs), 1358 (sum @$hs),
1319 ) 1359 )
1320} 1360}
1321 1361
1322sub size_allocate { 1362sub invoke_size_allocate {
1323 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1324 1364
1325 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1326 1366
1327 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1359 } 1399 }
1360 1400
1361 $y += $row_h; 1401 $y += $row_h;
1362 } 1402 }
1363 1403
1404 1
1364} 1405}
1365 1406
1366sub find_widget { 1407sub find_widget {
1367 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1368 1409
… …
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 ) 1448 )
1408} 1449}
1409 1450
1410sub size_allocate { 1451sub invoke_size_allocate {
1411 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1412 1453
1413 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1414 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1415 1456
1416 my @req; 1457 my @req;
1417 1458
1418 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1419 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1420 } else { 1461 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1422 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1423 1464
1424 if ($req > $space) { 1465 if ($req > $space) {
1425 # ah well, not enough space 1466 # ah well, not enough space
1426 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1427 } else { 1468 } else {
1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1429 1470
1430 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1431 1472
1432 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1433 for 0 .. $#$children; 1474 for 0 .. $#children;
1434 } 1475 }
1435 } 1476 }
1436 1477
1437 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1438 1479
1439 my $pos = 0; 1480 my $pos = 0;
1440 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1441 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1442 $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));
1443 1484
1444 $pos += $alloc; 1485 $pos += $alloc;
1445 } 1486 }
1446 1487
1447 1 1488 1
… …
1537 1578
1538 delete $self->{texture}; 1579 delete $self->{texture};
1539 $self->SUPER::update; 1580 $self->SUPER::update;
1540} 1581}
1541 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1542sub set_text { 1590sub set_text {
1543 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1544 1592
1545 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1546 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1547 1595
1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1549 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1550 1598
1599 delete $self->{size_req};
1551 $self->realloc; 1600 $self->realloc;
1552 $self->update; 1601 $self->update;
1553} 1602}
1554 1603
1555sub set_markup { 1604sub set_markup {
… …
1561 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1610 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1562 1611
1563 $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;
1564 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1565 1614
1615 delete $self->{size_req};
1566 $self->realloc; 1616 $self->realloc;
1567 $self->update; 1617 $self->update;
1568} 1618}
1569 1619
1570sub size_request { 1620sub size_request {
1571 my ($self) = @_; 1621 my ($self) = @_;
1572 1622
1623 $self->{size_req} ||= do {
1573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1574 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1578 1629
1579 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1580 1631
1581 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1582 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1583 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1584 1635
1585 my ($w2, $h2) = $self->{template}->size; 1636 my ($w2, $h2) = $self->{template}->size;
1586 1637
1587 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1588 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1640 }
1641
1642 [$w, $h]
1589 } 1643 };
1590 1644
1591 ($w, $h) 1645 @{ $self->{size_req} }
1592} 1646}
1593 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1594sub size_allocate { 1652sub invoke_size_allocate {
1595 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1596 1654
1597 delete $self->{ox}; 1655 delete $self->{ox};
1598 1656
1599 delete $self->{texture} 1657 delete $self->{texture}
1600 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
1601} 1661}
1602 1662
1603sub set_fontsize { 1663sub set_fontsize {
1604 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1605 1665
1606 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1607 delete $self->{texture}; 1668 delete $self->{texture};
1608 1669
1609 $self->realloc; 1670 $self->realloc;
1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1610} 1679}
1611 1680
1612sub _draw { 1681sub _draw {
1613 my ($self) = @_; 1682 my ($self) = @_;
1614 1683
… …
1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1635 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1636 }; 1705 };
1637 1706
1638 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1639 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};
1640 1711
1641 if ($tex->{format} == GL_ALPHA) { 1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1642 glColor @{$self->{fg}}; 1714 glColor @{$self->{fg}};
1643 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1644 } else { 1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1646 } 1719 }
1647 1720
1648 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1649} 1722}
1650 1723
… …
1667 can_hover => 1, 1740 can_hover => 1,
1668 can_focus => 1, 1741 can_focus => 1,
1669 valign => 0, 1742 valign => 0,
1670 can_events => 1, 1743 can_events => 1,
1671 #text => ... 1744 #text => ...
1745 #hidden => "*",
1672 @_ 1746 @_
1673 ) 1747 )
1674} 1748}
1675 1749
1676sub _set_text { 1750sub _set_text {
… …
1683 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 1758 $self->{text} = $text;
1685 1759
1686 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1762 delete $self->{size_req};
1688 1763
1689 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1765
1766 $self->realloc;
1690 $self->update; 1767 $self->update;
1691} 1768}
1692 1769
1693sub set_text { 1770sub set_text {
1694 my ($self, $text) = @_; 1771 my ($self, $text) = @_;
1695 1772
1696 $self->{cursor} = length $text; 1773 $self->{cursor} = length $text;
1697 $self->_set_text ($text); 1774 $self->_set_text ($text);
1698
1699 $self->realloc;
1700} 1775}
1701 1776
1702sub get_text { 1777sub get_text {
1703 $_[0]{text} 1778 $_[0]{text}
1704} 1779}
… …
1709 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1710 1785
1711 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1712} 1787}
1713 1788
1714sub key_down { 1789sub invoke_key_down {
1715 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1716 1791
1717 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1718 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1719 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
… …
1731 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1732 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1733 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1734 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1735 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1736 $self->_emit ('escape'); 1811 $self->emit ('escape');
1737 } elsif ($uni) { 1812 } elsif ($uni) {
1738 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else { 1814 } else {
1740 return 0; 1815 return 0;
1741 } 1816 }
… …
1745 $self->realloc; 1820 $self->realloc;
1746 1821
1747 1 1822 1
1748} 1823}
1749 1824
1750sub focus_in { 1825sub invoke_focus_in {
1751 my ($self) = @_; 1826 my ($self) = @_;
1752 1827
1753 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1754 1829
1755 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1756} 1831}
1757 1832
1758sub button_down { 1833sub invoke_button_down {
1759 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1760 1835
1761 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1762 1837
1763 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1764 1839
1765 # byte-index to char-index 1840 # byte-index to char-index
1766 my $text = $self->{text}; 1841 my $text = $self->{text};
… …
1771 $self->update; 1846 $self->update;
1772 1847
1773 1 1848 1
1774} 1849}
1775 1850
1776sub mouse_motion { 1851sub invoke_mouse_motion {
1777 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1778# 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#
1779 1854
1780 0 1855 1
1781} 1856}
1782 1857
1783sub _draw { 1858sub _draw {
1784 my ($self) = @_; 1859 my ($self) = @_;
1785 1860
1786 local $self->{fg} = $self->{fg}; 1861 local $self->{fg} = $self->{fg};
1787 1862
1788 if ($FOCUS == $self) { 1863 if ($FOCUS == $self) {
1789 glColor @{$self->{active_bg}}; 1864 glColor_premultiply @{$self->{active_bg}};
1790 $self->{fg} = $self->{active_fg}; 1865 $self->{fg} = $self->{active_fg};
1791 } else { 1866 } else {
1792 glColor @{$self->{bg}}; 1867 glColor_premultiply @{$self->{bg}};
1793 } 1868 }
1794 1869
1795 glEnable GL_BLEND; 1870 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1871 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1797 glBegin GL_QUADS; 1872 glBegin GL_QUADS;
1798 glVertex 0 , 0; 1873 glVertex 0 , 0;
1799 glVertex 0 , $self->{h}; 1874 glVertex 0 , $self->{h};
1800 glVertex $self->{w}, $self->{h}; 1875 glVertex $self->{w}, $self->{h};
1801 glVertex $self->{w}, 0; 1876 glVertex $self->{w}, 0;
… …
1826 1901
1827our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1828 1903
1829use CFClient::OpenGL; 1904use CFClient::OpenGL;
1830 1905
1831sub key_down { 1906sub invoke_key_down {
1832 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1833 1908
1834 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1835 1910
1836 if ($sym == 13) { 1911 if ($sym == 13) {
1837 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1838 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1839 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1840 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1841 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1842 $self->update; 1918 $self->update;
1843 1919
1844 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1845 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1846 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
… …
1862 } else { 1938 } else {
1863 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1864 } 1940 }
1865 1941
1866 } else { 1942 } else {
1867 return $self->SUPER::key_down ($ev) 1943 return $self->SUPER::invoke_key_down ($ev)
1868 } 1944 }
1869 1945
1870 1 1946 1
1871} 1947}
1872 1948
… …
1896 can_events => 1, 1972 can_events => 1,
1897 @_ 1973 @_
1898 ) 1974 )
1899} 1975}
1900 1976
1901sub activate { }
1902
1903sub button_up { 1977sub invoke_button_up {
1904 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1905 1979
1906 $self->emit ("activate") 1980 $self->emit ("activate")
1907 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1908 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
… …
1911} 1985}
1912 1986
1913sub _draw { 1987sub _draw {
1914 my ($self) = @_; 1988 my ($self) = @_;
1915 1989
1916 local $self->{fg} = $self->{fg}; 1990 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1917
1918 if ($GRAB == $self) {
1919 $self->{fg} = $self->{active_fg};
1920 }
1921 1991
1922 glEnable GL_TEXTURE_2D; 1992 glEnable GL_TEXTURE_2D;
1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924 glColor 0, 0, 0, 1; 1994 glColor 0, 0, 0, 1;
1925 1995
1926 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1927 1997
1928 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1929 1999
1930 $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
1931} 2037}
1932 2038
1933############################################################################# 2039#############################################################################
1934 2040
1935package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
… …
1962 my ($self) = @_; 2068 my ($self) = @_;
1963 2069
1964 (6) x 2 2070 (6) x 2
1965} 2071}
1966 2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
1967sub button_down { 2081sub invoke_button_down {
1968 my ($self, $ev, $x, $y) = @_; 2082 my ($self, $ev, $x, $y) = @_;
1969 2083
1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1972 $self->{state} = !$self->{state}; 2086 $self->toggle;
1973 $self->_emit (changed => $self->{state});
1974 } else { 2087 } else {
1975 return 0 2088 return 0
1976 } 2089 }
1977 2090
1978 1 2091 1
… …
2003package CFClient::UI::Image; 2116package CFClient::UI::Image;
2004 2117
2005our @ISA = CFClient::UI::Base::; 2118our @ISA = CFClient::UI::Base::;
2006 2119
2007use CFClient::OpenGL; 2120use CFClient::OpenGL;
2008use Carp qw/confess/;
2009 2121
2010our %loaded_images; 2122our %texture_cache;
2011 2123
2012sub new { 2124sub new {
2013 my $class = shift; 2125 my $class = shift;
2014 2126
2015 my $self = $class->SUPER::new (can_events => 0, @_); 2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
2016 2131
2017 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
2018 2134
2019 $loaded_images{$self->{image}} ||= 2135 $self->{tex} = $texture_cache{$self->{path}} ||=
2020 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2021 2137
2022 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2138 Scalar::Util::weaken $texture_cache{$self->{path}};
2023 2139
2024 Scalar::Util::weaken $loaded_images{$self->{image}}; 2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2025
2026 $self->{aspect} = $tex->{w} / $tex->{h};
2027 2141
2028 $self 2142 $self
2029} 2143}
2030 2144
2031sub size_request { 2145sub size_request {
2032 my ($self) = @_; 2146 my ($self) = @_;
2033 2147
2034 ($self->{tex}->{w}, $self->{tex}->{h}) 2148 ($self->{tex}{w}, $self->{tex}{h})
2035} 2149}
2036 2150
2037sub _draw { 2151sub _draw {
2038 my ($self) = @_; 2152 my ($self) = @_;
2039 2153
… …
2148 my $ycut1 = max 0, min 1, $ycut; 2262 my $ycut1 = max 0, min 1, $ycut;
2149 my $ycut2 = max 0, min 1, $ycut - 1; 2263 my $ycut2 = max 0, min 1, $ycut - 1;
2150 2264
2151 my $h1 = $self->{h} * (1 - $ycut1); 2265 my $h1 = $self->{h} * (1 - $ycut1);
2152 my $h2 = $self->{h} * (1 - $ycut2); 2266 my $h2 = $self->{h} * (1 - $ycut2);
2267 my $h3 = $self->{h};
2268
2269 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2153 2270
2154 glEnable GL_BLEND; 2271 glEnable GL_BLEND;
2155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2272 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2273 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2156 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 2276
2159 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2277 glBindTexture GL_TEXTURE_2D, $t1->{name};
2160 glBegin GL_QUADS; 2278 glBegin GL_QUADS;
… …
2175 2293
2176 if ($t3) { 2294 if ($t3) {
2177 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2295 glBindTexture GL_TEXTURE_2D, $t3->{name};
2178 glBegin GL_QUADS; 2296 glBegin GL_QUADS;
2179 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2297 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2180 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2298 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2181 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2299 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2182 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2300 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2183 glEnd; 2301 glEnd;
2184 } 2302 }
2185 2303
2186 glDisable GL_BLEND; 2304 glDisable GL_BLEND;
… …
2274 $self->update; 2392 $self->update;
2275 2393
2276 $self 2394 $self
2277} 2395}
2278 2396
2279sub changed { }
2280
2281sub set_range { 2397sub set_range {
2282 my ($self, $range) = @_; 2398 my ($self, $range) = @_;
2283 2399
2284 ($range, $self->{range}) = ($self->{range}, $range); 2400 ($range, $self->{range}) = ($self->{range}, $range);
2285 2401
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}"; 2402 if ("@$range" ne "@{$self->{range}}") {
2403 $self->update;
2404 $self->set_value ($self->{range}[0]);
2405 }
2288} 2406}
2289 2407
2290sub set_value { 2408sub set_value {
2291 my ($self, $value) = @_; 2409 my ($self, $value) = @_;
2292 2410
… …
2303 if $unit; 2421 if $unit;
2304 2422
2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2423 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2306 2424
2307 if ($value != $old_value) { 2425 if ($value != $old_value) {
2308 $self->_emit (changed => $value); 2426 $self->emit (changed => $value);
2309 $self->update; 2427 $self->update;
2310 } 2428 }
2311} 2429}
2312 2430
2313sub size_request { 2431sub size_request {
2314 my ($self) = @_; 2432 my ($self) = @_;
2315 2433
2316 ($self->{req_w}, $self->{req_h}) 2434 ($self->{req_w}, $self->{req_h})
2317} 2435}
2318 2436
2319sub button_down { 2437sub invoke_button_down {
2320 my ($self, $ev, $x, $y) = @_; 2438 my ($self, $ev, $x, $y) = @_;
2321 2439
2322 $self->SUPER::button_down ($ev, $x, $y); 2440 $self->SUPER::invoke_button_down ($ev, $x, $y);
2323 2441
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2442 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325 2443
2326 $self->mouse_motion ($ev, $x, $y) 2444 $self->invoke_mouse_motion ($ev, $x, $y)
2327} 2445}
2328 2446
2329sub mouse_motion { 2447sub invoke_mouse_motion {
2330 my ($self, $ev, $x, $y) = @_; 2448 my ($self, $ev, $x, $y) = @_;
2331 2449
2332 if ($GRAB == $self) { 2450 if ($GRAB == $self) {
2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2451 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2334 2452
… …
2439sub set_range { shift->{slider}->set_range (@_) } 2557sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) } 2558sub set_value { shift->{slider}->set_value (@_) }
2441 2559
2442############################################################################# 2560#############################################################################
2443 2561
2444package CFClient::UI::TextView; 2562package CFClient::UI::TextScroller;
2445 2563
2446our @ISA = CFClient::UI::HBox::; 2564our @ISA = CFClient::UI::HBox::;
2447 2565
2448use CFClient::OpenGL; 2566use CFClient::OpenGL;
2449 2567
… …
2451 my $class = shift; 2569 my $class = shift;
2452 2570
2453 my $self = $class->SUPER::new ( 2571 my $self = $class->SUPER::new (
2454 fontsize => 1, 2572 fontsize => 1,
2455 can_events => 0, 2573 can_events => 0,
2574 indent => 0,
2456 #font => default_font 2575 #font => default_font
2457 @_, 2576 @_,
2458 2577
2459 layout => (new CFClient::Layout 1), 2578 layout => (new CFClient::Layout 1),
2460 par => [], 2579 par => [],
… …
2475 2594
2476 $self->{fontsize} = $fontsize; 2595 $self->{fontsize} = $fontsize;
2477 $self->reflow; 2596 $self->reflow;
2478} 2597}
2479 2598
2599sub size_request {
2600 my ($self) = @_;
2601
2602 my ($empty, $slider) = @{ $self->{children} };
2603
2604 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request
2606}
2607
2480sub size_allocate { 2608sub invoke_size_allocate {
2481 my ($self, $w, $h) = @_; 2609 my ($self, $w, $h) = @_;
2482 2610
2483 $self->SUPER::size_allocate ($w, $h); 2611 my ($empty, $slider, @other) = @{ $self->{children} };
2612 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2484 2613
2485 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2614 $self->{layout}->set_font ($self->{font}) if $self->{font};
2486 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $self->{layout}->set_width ($self->{children}[0]{w}); 2616 $self->{layout}->set_width ($empty->{w});
2617 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 2618
2489 $self->reflow; 2619 $self->reflow;
2490}
2491 2620
2492sub text_size { 2621 local $self->{children} = [$empty, $slider];
2493 my ($self, $text, $indent) = @_; 2622 $self->SUPER::invoke_size_allocate ($w, $h)
2623}
2624
2625sub get_layout {
2626 my ($self, $para) = @_;
2494 2627
2495 my $layout = $self->{layout}; 2628 my $layout = $self->{layout};
2496 2629
2630 $layout->set_font ($self->{font}) if $self->{font};
2631 $layout->set_foreground (@{$para->{fg}});
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2632 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $layout->set_width ($self->{children}[0]{w} - $indent); 2633 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2634 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 $layout->set_markup ($text); 2635 $layout->set_markup ($para->{markup});
2636
2637 $layout->set_shapes (
2638 map
2639 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2640 @{$para->{widget}}
2500 2641 );
2642
2501 $layout->size 2643 $layout
2502} 2644}
2503 2645
2504sub reflow { 2646sub reflow {
2505 my ($self) = @_; 2647 my ($self) = @_;
2506 2648
… …
2515 $self->{children}[1]->set_value ($offset); 2657 $self->{children}[1]->set_value ($offset);
2516} 2658}
2517 2659
2518sub clear { 2660sub clear {
2519 my ($self) = @_; 2661 my ($self) = @_;
2662
2663 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other;
2520 2665
2521 $self->{par} = []; 2666 $self->{par} = [];
2522 $self->{height} = 0; 2667 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524} 2669}
2525 2670
2526sub add_paragraph { 2671sub add_paragraph {
2527 my ($self, $color, $text, $indent) = @_; 2672 my ($self, $color, $para, $indent) = @_;
2528 2673
2529 for my $line (split /\n/, $text) { 2674 my ($text, @w) = ref $para ? @$para : $para;
2530 my ($w, $h) = $self->text_size ($line); 2675
2531 $self->{height} += $h; 2676 $para = {
2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2677 w => 1e10,
2678 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2533 } 2683 };
2534 2684
2535 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2685 $self->add (@w) if @w;
2686 push @{$self->{par}}, $para;
2687
2688 $self->{need_reflow}++;
2689 $self->update;
2690}
2691
2692sub scroll_to_bottom {
2693 my ($self) = @_;
2694
2695 $self->{scroll_to_bottom} = 1;
2696 $self->update;
2536} 2697}
2537 2698
2538sub update { 2699sub update {
2539 my ($self) = @_; 2700 my ($self) = @_;
2540 2701
… …
2542 2703
2543 return unless $self->{h} > 0; 2704 return unless $self->{h} > 0;
2544 2705
2545 delete $self->{texture}; 2706 delete $self->{texture};
2546 2707
2547 $ROOT->on_post_alloc ($self, sub { 2708 $ROOT->on_post_alloc ($self => sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549 2710
2550 if (delete $self->{need_reflow}) { 2711 if (delete $self->{need_reflow}) {
2551 my $height = 0; 2712 my $height = 0;
2552 2713
2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2557 for (@{$self->{par}}) { 2714 for my $para (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2559 $layout->set_width ($W - $_->[3]); 2716 my $layout = $self->get_layout ($para);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size; 2717 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3]; 2718
2563 $_->[1] = $h; 2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2564 } 2722 }
2565 2723
2566 $height += $_->[1]; 2724 $height += $para->{h};
2567 } 2725 }
2568 2726
2569 $self->{height} = $height; 2727 $self->{height} = $height;
2570 2728
2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2572 2730
2573 delete $self->{texture}; 2731 delete $self->{texture};
2574 } 2732 }
2575 2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2577 glClearColor 0.5, 0.5, 0.5, 0; 2739 glClearColor 0, 0, 0, 0;
2578 glClear GL_COLOR_BUFFER_BIT; 2740 glClear GL_COLOR_BUFFER_BIT;
2579 2741
2580 my $top = int $self->{children}[1]{range}[0]; 2742 my $top = int $self->{children}[1]{range}[0];
2581 2743
2582 my $y0 = $top; 2744 my $y0 = $top;
2583 my $y1 = $top + $H; 2745 my $y1 = $top + $H;
2584 2746
2585 my $y = 0; 2747 my $y = 0;
2586
2587 my $layout = $self->{layout};
2588
2589 $layout->set_font ($self->{font}) if $self->{font};
2590 2748
2591 glEnable GL_BLEND; 2749 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off 2750 #TODO# not correct in windows where rgba is forced off
2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2594 2752
2595 for my $par (@{$self->{par}}) { 2753 for my $para (@{$self->{par}}) {
2596 my $h = $par->[1]; 2754 my $h = $para->{h};
2597 2755
2598 if ($y0 < $y + $h && $y < $y1) { 2756 if ($y0 < $y + $h && $y < $y1) {
2599 $layout->set_foreground (@{ $par->[2] }); 2757
2600 $layout->set_width ($W - $par->[3]); 2758 my $layout = $self->get_layout ($para);
2601 $layout->set_markup ($par->[4]);
2602 2759
2603 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2604 2761
2605 glRasterPos $par->[3], $y - $y0; 2762 glRasterPos $para->{indent}, $y - $y0;
2606 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764
2765 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes;
2767
2768 glDisable GL_BLEND;
2769 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, ();
2771
2772 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0;
2774
2775 $_->draw;
2776 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 }
2607 } 2780 }
2608 2781
2609 $y += $h; 2782 $y += $h;
2610 } 2783 }
2611 2784
2612 glDisable GL_BLEND; 2785 glDisable GL_BLEND;
2613 }; 2786 };
2614 }); 2787 });
2615} 2788}
2616 2789
2790sub reconfigure {
2791 my ($self) = @_;
2792
2793 $self->SUPER::reconfigure;
2794
2795 $_->{w} = 1e10 for @{ $self->{par} };
2796 $self->reflow;
2797}
2798
2617sub _draw { 2799sub _draw {
2618 my ($self) = @_; 2800 my ($self) = @_;
2619 2801
2620 glEnable GL_TEXTURE_2D; 2802 glEnable GL_TEXTURE_2D;
2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2622 glColor 1, 1, 1, 1; 2804 glColor 0, 0, 0, 1;
2623 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2805 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2624 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2625 2807
2626 $self->{children}[1]->draw; 2808 $self->{children}[1]->draw;
2627
2628} 2809}
2629 2810
2630############################################################################# 2811#############################################################################
2631 2812
2632package CFClient::UI::Animator; 2813package CFClient::UI::Animator;
… …
2719 $tooltip .= "\n\n" . (ref $widget) . "\n" 2900 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2901 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n" 2902 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}"; 2903 . "visible $widget->{visible}";
2723 } 2904 }
2905
2906 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//;
2724 2908
2725 $self->add (new CFClient::UI::Label 2909 $self->add (new CFClient::UI::Label
2726 markup => $tooltip, 2910 markup => $tooltip,
2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2728 fontsize => 0.8, 2912 fontsize => 0.8,
… …
2738 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2739 2923
2740 ($w + 4, $h + 4) 2924 ($w + 4, $h + 4)
2741} 2925}
2742 2926
2743sub size_allocate { 2927sub invoke_size_allocate {
2744 my ($self, $w, $h) = @_; 2928 my ($self, $w, $h) = @_;
2745 2929
2746 $self->SUPER::size_allocate ($w - 4, $h - 4); 2930 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2747} 2931}
2748 2932
2749sub visibility_change { 2933sub invoke_visibility_change {
2750 my ($self, $visible) = @_; 2934 my ($self, $visible) = @_;
2751 2935
2752 return unless $visible; 2936 return unless $visible;
2753 2937
2754 $self->{root}->on_post_alloc ("move_$self" => sub { 2938 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2756 or return; 2940 or return;
2757 2941
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759 2943
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH; 2945 if $x + $self->{w} > $self->{root}{w};
2762 2946
2763 $self->move_abs ($x, $y); 2947 $self->move_abs ($x, $y);
2764 }); 2948 });
2765} 2949}
2766 2950
… …
2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3039 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2856 3040
2857 if ($tex) { 3041 if ($tex) {
2858 glEnable GL_TEXTURE_2D; 3042 glEnable GL_TEXTURE_2D;
2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2860 glColor 1, 1, 1, 1; 3044 glColor 0, 0, 0, 1;
2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3045 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2862 glDisable GL_TEXTURE_2D; 3046 glDisable GL_TEXTURE_2D;
2863 } 3047 }
2864} 3048}
2865 3049
2866sub DESTROY { 3050sub destroy {
2867 my ($self) = @_; 3051 my ($self) = @_;
2868 3052
2869 $self->{timer}->cancel 3053 $self->{timer}->cancel
2870 if $self->{timer}; 3054 if $self->{timer};
2871 3055
2872 $self->SUPER::DESTROY; 3056 $self->SUPER::destroy;
2873} 3057}
2874 3058
2875############################################################################# 3059#############################################################################
2876 3060
2877package CFClient::UI::Buttonbar; 3061package CFClient::UI::Buttonbar;
… …
2898 ); 3082 );
2899 3083
2900 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3084 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2901 3085
2902 for my $item (@{ $self->{items} }) { 3086 for my $item (@{ $self->{items} }) {
2903 my ($widget, $cb) = @$item; 3087 my ($widget, $cb, $tooltip) = @$item;
2904 3088
2905 # handle various types of items, only text for now 3089 # handle various types of items, only text for now
2906 if (!ref $widget) { 3090 if (!ref $widget) {
2907 $widget = new CFClient::UI::Label 3091 $widget = new CFClient::UI::Label
2908 can_hover => 1, 3092 can_hover => 1,
2909 can_events => 1, 3093 can_events => 1,
2910 text => $widget; 3094 markup => $widget,
3095 tooltip => $tooltip
2911 } 3096 }
2912 3097
2913 $self->{item}{$widget} = $item; 3098 $self->{item}{$widget} = $item;
2914 3099
2915 $self->{vbox}->add ($widget); 3100 $self->{vbox}->add ($widget);
… …
2920 3105
2921# popup given the event (must be a mouse button down event currently) 3106# popup given the event (must be a mouse button down event currently)
2922sub popup { 3107sub popup {
2923 my ($self, $ev) = @_; 3108 my ($self, $ev) = @_;
2924 3109
2925 $self->_emit ("popdown"); 3110 $self->emit ("popdown");
2926 3111
2927 # maybe save $GRAB? must be careful about events... 3112 # maybe save $GRAB? must be careful about events...
2928 $GRAB = $self; 3113 $GRAB = $self;
2929 $self->{button} = $ev->{button}; 3114 $self->{button} = $ev->{button};
2930 3115
2931 $self->show; 3116 $self->show;
2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3117 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2933} 3118}
2934 3119
2935sub mouse_motion { 3120sub invoke_mouse_motion {
2936 my ($self, $ev, $x, $y) = @_; 3121 my ($self, $ev, $x, $y) = @_;
2937 3122
2938 # TODO: should use vbox->find_widget or so 3123 # TODO: should use vbox->find_widget or so
2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3124 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2940 $self->{hover} = $self->{item}{$HOVER}; 3125 $self->{hover} = $self->{item}{$HOVER};
2941 3126
2942 0 3127 0
2943} 3128}
2944 3129
2945sub button_up { 3130sub invoke_button_up {
2946 my ($self, $ev, $x, $y) = @_; 3131 my ($self, $ev, $x, $y) = @_;
2947 3132
2948 if ($ev->{button} == $self->{button}) { 3133 if ($ev->{button} == $self->{button}) {
2949 undef $GRAB; 3134 undef $GRAB;
2950 $self->hide; 3135 $self->hide;
2951 3136
2952 $self->_emit ("popdown"); 3137 $self->emit ("popdown");
2953 $self->{hover}[1]->() if $self->{hover}; 3138 $self->{hover}[1]->() if $self->{hover};
2954 } else { 3139 } else {
2955 return 0 3140 return 0
2956 } 3141 }
2957 3142
… …
2984 3169
2985 $self->{current} = $self->{children}[0] 3170 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} }; 3171 if @{ $self->{children} };
2987} 3172}
2988 3173
3174sub get_current_page {
3175 my ($self) = @_;
3176
3177 $self->{current}
3178}
3179
2989sub set_current_page { 3180sub set_current_page {
2990 my ($self, $page_or_widget) = @_; 3181 my ($self, $page_or_widget) = @_;
2991 3182
2992 my $widget = ref $page_or_widget 3183 my $widget = ref $page_or_widget
2993 ? $page_or_widget 3184 ? $page_or_widget
2994 : $self->{children}[$page_or_widget]; 3185 : $self->{children}[$page_or_widget];
2995 3186
2996 $self->{current} = $widget; 3187 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3188 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998 3189
2999 $self->_emit (page_changed => $self->{current}); 3190 $self->emit (page_changed => $self->{current});
3000 3191
3001 $self->realloc; 3192 $self->realloc;
3002} 3193}
3003 3194
3004sub visible_children { 3195sub visible_children {
… …
3009 my ($self) = @_; 3200 my ($self) = @_;
3010 3201
3011 $self->{current}->size_request 3202 $self->{current}->size_request
3012} 3203}
3013 3204
3014sub size_allocate { 3205sub invoke_size_allocate {
3015 my ($self, $w, $h) = @_; 3206 my ($self, $w, $h) = @_;
3016 3207
3017 $self->{current}->configure (0, 0, $w, $h); 3208 $self->{current}->configure (0, 0, $w, $h);
3209
3210 1
3018} 3211}
3019 3212
3020sub _draw { 3213sub _draw {
3021 my ($self) = @_; 3214 my ($self) = @_;
3022 3215
… …
3057 ); 3250 );
3058 3251
3059 $self->{multiplexer}->add ($widget); 3252 $self->{multiplexer}->add ($widget);
3060} 3253}
3061 3254
3255sub get_current_page {
3256 my ($self) = @_;
3257
3258 $self->{multiplexer}->get_current_page
3259}
3260
3062sub set_current_page { 3261sub set_current_page {
3063 my ($self, $page) = @_; 3262 my ($self, $page) = @_;
3064 3263
3065 $self->{multiplexer}->set_current_page ($page); 3264 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current}); 3265 $self->emit (page_changed => $self->{multiplexer}{current});
3067} 3266}
3068 3267
3069############################################################################# 3268#############################################################################
3070 3269
3071package CFClient::UI::Statusbox; 3270package CFClient::UI::Combobox;
3072 3271
3272use utf8;
3273
3073our @ISA = CFClient::UI::VBox::; 3274our @ISA = CFClient::UI::Button::;
3074 3275
3075sub new { 3276sub new {
3076 my $class = shift; 3277 my $class = shift;
3077 3278
3078 $class->SUPER::new ( 3279 my $self = $class->SUPER::new (
3280 options => [], # [value, title, longdesc], ...
3281 value => undef,
3282 @_,
3283 );
3284
3285 $self->_set_value ($self->{value});
3286
3287 $self
3288}
3289
3290sub invoke_button_down {
3291 my ($self, $ev) = @_;
3292
3293 my @menu_items;
3294
3295 for (@{ $self->{options} }) {
3296 my ($value, $title, $tooltip) = @$_;
3297
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 }
3300
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302}
3303
3304sub _set_value {
3305 my ($self, $value) = @_;
3306
3307 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3308 or return;
3309
3310 $self->{value} = $item->[0];
3311 $self->set_markup ("$item->[1] ⇓");
3312 $self->set_tooltip ($item->[2]);
3313}
3314
3315sub set_value {
3316 my ($self, $value) = @_;
3317
3318 return unless $self->{value} ne $value;
3319
3320 $self->_set_value ($value);
3321 $self->emit (changed => $value);
3322}
3323
3324#############################################################################
3325
3326package CFClient::UI::Statusbox;
3327
3328our @ISA = CFClient::UI::VBox::;
3329
3330sub new {
3331 my $class = shift;
3332
3333 my $self = $class->SUPER::new (
3079 fontsize => 0.8, 3334 fontsize => 0.8,
3080 @_, 3335 @_,
3081 ) 3336 );
3337
3338 Scalar::Util::weaken (my $this = $self);
3339
3340 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341
3342 $self
3082} 3343}
3083 3344
3084sub reorder { 3345sub reorder {
3085 my ($self) = @_; 3346 my ($self) = @_;
3086 my $NOW = time; 3347 my $NOW = Time::HiRes::time;
3348
3349 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} };
3087 3353
3088 while (my ($k, $v) = each %{ $self->{item} }) { 3354 while (my ($k, $v) = each %{ $self->{item} }) {
3089 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3355 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090 } 3356 }
3091 3357
… …
3094 my @items = sort { 3360 my @items = sort {
3095 $a->{pri} <=> $b->{pri} 3361 $a->{pri} <=> $b->{pri}
3096 or $b->{id} <=> $a->{id} 3362 or $b->{id} <=> $a->{id}
3097 } values %{ $self->{item} }; 3363 } values %{ $self->{item} };
3098 3364
3365 $self->{timer}->interval (1);
3366
3099 my $count = 10 + 1; 3367 my $count = 10 + 1;
3100 for my $item (@items) { 3368 for my $item (@items) {
3101 last unless --$count; 3369 last unless --$count;
3102 3370
3103 push @widgets, $item->{label} ||= do { 3371 my $label = $item->{label} ||= do {
3104 # TODO: doesn't handle markup well (read as: at all) 3372 # TODO: doesn't handle markup well (read as: at all)
3105 my $short = $item->{count} > 1 3373 my $short = $item->{count} > 1
3106 ? "<b>$item->{count} ×</b> $item->{text}" 3374 ? "<b>$item->{count} ×</b> $item->{text}"
3107 : $item->{text}; 3375 : $item->{text};
3108 3376
… …
3116 tooltip => $item->{tooltip}, 3384 tooltip => $item->{tooltip},
3117 tooltip_font => $::FONT_PROP, 3385 tooltip_font => $::FONT_PROP,
3118 tooltip_width => 0.67, 3386 tooltip_width => 0.67,
3119 fontsize => $item->{fontsize} || $self->{fontsize}, 3387 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44, 3388 max_w => $::WIDTH * 0.44,
3121 fg => $item->{fg}, 3389 fg => [@{ $item->{fg} }],
3122 can_events => 1, 3390 can_events => 1,
3123 can_hover => 1 3391 can_hover => 1
3124 }; 3392 };
3393
3394 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3395 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3396 $label->update;
3397 $label->set_max_size (undef, $label->{req_h} * $diff)
3398 if $diff < 1;
3399 $self->{timer}->interval (1/30);
3400 } else {
3401 $label->{fg}[3] = $item->{fg}[3] || 1;
3402 }
3403
3404 push @widgets, $label;
3125 } 3405 }
3126 3406
3127 $self->clear; 3407 $self->clear;
3128 $self->SUPER::add (reverse @widgets); 3408 $self->SUPER::add (reverse @widgets);
3129} 3409}
… …
3134 $text =~ s/^\s+//; 3414 $text =~ s/^\s+//;
3135 $text =~ s/\s+$//; 3415 $text =~ s/\s+$//;
3136 3416
3137 return unless $text; 3417 return unless $text;
3138 3418
3139 my $timeout = time + ((delete $arg{timeout}) || 60); 3419 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3140 3420
3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3421 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142 3422
3143 if (my $item = $self->{item}{$group}) { 3423 if (my $item = $self->{item}{$group}) {
3144 if ($item->{text} eq $text) { 3424 if ($item->{text} eq $text) {
3145 $item->{count}++; 3425 $item->{count}++;
3146 } else { 3426 } else {
3147 $item->{count} = 1; 3427 $item->{count} = 1;
3148 $item->{text} = $item->{tooltip} = $text; 3428 $item->{text} = $item->{tooltip} = $text;
3149 } 3429 }
3150 $item->{id} = ++$self->{id}; 3430 $item->{id} += 0.2;#d#
3151 $item->{timeout} = $timeout; 3431 $item->{timeout} = $timeout;
3152 delete $item->{label}; 3432 delete $item->{label};
3153 } else { 3433 } else {
3154 $self->{item}{$group} = { 3434 $self->{item}{$group} = {
3155 id => ++$self->{id}, 3435 id => ++$self->{id},
… …
3161 count => 1, 3441 count => 1,
3162 %arg, 3442 %arg,
3163 }; 3443 };
3164 } 3444 }
3165 3445
3446 $ROOT->on_refresh (reorder => sub {
3166 $self->reorder; 3447 $self->reorder;
3448 });
3167} 3449}
3168 3450
3169sub reconfigure { 3451sub reconfigure {
3170 my ($self) = @_; 3452 my ($self) = @_;
3171 3453
… …
3174 3456
3175 $self->reorder; 3457 $self->reorder;
3176 $self->SUPER::reconfigure; 3458 $self->SUPER::reconfigure;
3177} 3459}
3178 3460
3461sub destroy {
3462 my ($self) = @_;
3463
3464 $self->{timer}->cancel;
3465
3466 $self->SUPER::destroy;
3467}
3468
3179############################################################################# 3469#############################################################################
3180 3470
3181package CFClient::UI::Inventory; 3471package CFClient::UI::Inventory;
3182 3472
3183our @ISA = CFClient::UI::ScrolledWindow::; 3473our @ISA = CFClient::UI::Table::;
3184 3474
3185sub new { 3475sub new {
3186 my $class = shift; 3476 my $class = shift;
3187 3477
3188 my $self = $class->SUPER::new ( 3478 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3479 col_expand => [0, 1, 0],
3190 @_, 3480 @_,
3191 ); 3481 );
3192 3482
3193 $self 3483 $self
3194} 3484}
3195 3485
3196sub set_items { 3486sub set_items {
3197 my ($self, $items) = @_; 3487 my ($self, $items) = @_;
3198 3488
3199 $self->{child}->clear; 3489 $self->clear;
3200 return unless $items; 3490 return unless $items;
3201 3491
3202 my @items = sort { 3492 my @items = sort {
3203 ($a->{type} <=> $b->{type}) 3493 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name}) 3494 or ($a->{name} cmp $b->{name})
3205 } @$items; 3495 } values %$items;
3206 3496
3207 $self->{real_items} = \@items; 3497 $self->{real_items} = \@items;
3208 3498
3209 my $row = 0; 3499 my $row = 0;
3210 for my $item (@items) { 3500 for my $item (@items) {
3211 CFClient::Item::update_widgets $item; 3501 CFClient::Item::update_widgets $item;
3212 3502
3213 $self->{child}->add (0, $row, $item->{face_widget}); 3503 $self->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget}); 3504 $self->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget}); 3505 $self->add (2, $row, $item->{weight_widget});
3216 3506
3217 $row++; 3507 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 } 3508 }
3416} 3509}
3417 3510
3418############################################################################# 3511#############################################################################
3419 3512
… …
3429 commands => [], 3522 commands => [],
3430 @_, 3523 @_,
3431 ) 3524 )
3432} 3525}
3433 3526
3434# XXX: Do sorting? Argl... 3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3435sub add_spell { 3612sub add_spell {
3436 my ($self, $spell) = @_; 3613 my ($self, $spell) = @_;
3614
3437 $self->{spells}->{$spell->{name}} = $spell; 3615 $self->{spell}->{$spell->{name}} = $spell;
3438 3616 $self->rebuild_spell_list;
3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466} 3617}
3467 3618
3468sub remove_spell { 3619sub remove_spell {
3469 my ($self, $spell) = @_; 3620 my ($self, $spell) = @_;
3621
3470 delete $self->{spells}->{$spell->{name}}; 3622 delete $self->{spell}->{$spell->{name}};
3471 $self->rebuild_spell_list; 3623 $self->rebuild_spell_list;
3472} 3624}
3473 3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3474############################################################################# 3633#############################################################################
3475 3634
3476package CFClient::UI::Root; 3635package CFClient::UI::Root;
3477 3636
3478our @ISA = CFClient::UI::Container::; 3637our @ISA = CFClient::UI::Container::;
3638
3639use List::Util qw(min max);
3479 3640
3480use CFClient::OpenGL; 3641use CFClient::OpenGL;
3481 3642
3482sub new { 3643sub new {
3483 my $class = shift; 3644 my $class = shift;
… …
3510 $coord = $max - $size if $coord > $max - $size; 3671 $coord = $max - $size if $coord > $max - $size;
3511 3672
3512 int $coord + 0.5 3673 int $coord + 0.5
3513} 3674}
3514 3675
3515sub size_allocate { 3676sub invoke_size_allocate {
3516 my ($self, $w, $h) = @_; 3677 my ($self, $w, $h) = @_;
3517 3678
3518 for my $child ($self->children) { 3679 for my $child ($self->children) {
3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3680 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3520 3681
… …
3524 $X = _to_pixel $X, $W, $self->{w}; 3685 $X = _to_pixel $X, $W, $self->{w};
3525 $Y = _to_pixel $Y, $H, $self->{h}; 3686 $Y = _to_pixel $Y, $H, $self->{h};
3526 3687
3527 $child->configure ($X, $Y, $W, $H); 3688 $child->configure ($X, $Y, $W, $H);
3528 } 3689 }
3690
3691 1
3529} 3692}
3530 3693
3531sub coord2local { 3694sub coord2local {
3532 my ($self, $x, $y) = @_; 3695 my ($self, $x, $y) = @_;
3533 3696
… …
3618 3781
3619 delete $queue{$widget+0}; 3782 delete $queue{$widget+0};
3620 3783
3621 my ($w, $h) = $widget->size_request; 3784 my ($w, $h) = $widget->size_request;
3622 3785
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3786 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3787 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3788
3789 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3790 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3625 3791
3626 $w = $widget->{force_w} if exists $widget->{force_w}; 3792 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h}; 3793 $h = $widget->{force_h} if exists $widget->{force_h};
3628 3794
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3795 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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