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.316 by root, Sun Jul 2 13:57:58 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 my $focus = $FOCUS; $FOCUS = $self;
427 429
428 $self->_emit (focus_in => $focus);
429
430 $focus->update if $focus; 430 $focus->update if $focus;
431 $FOCUS->update; 431 $FOCUS->update;
432}
433 432
433 0
434}
435
434sub focus_out { 436sub invoke_focus_out {
435 my ($self) = @_; 437 my ($self) = @_;
436 438
437 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
438 440
439 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
440 442
441 $self->_emit (focus_out => $focus);
442
443 $focus->update if $focus; #? 443 $focus->update if $focus; #?
444 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 446 unless $FOCUS;
447}
448 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
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->hide };
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;
1135 1151
1136 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1137}
1138 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1139sub button_down { 1160sub invoke_button_down {
1140 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1141 1162
1142 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1143 my $border = $self->border; 1164 my $border = $self->border;
1144 1165
… …
1175 1196
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1198
1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1179 # HACK: the next line is required to enforce placement 1200 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1181 }; 1202 };
1182 } else { 1203 } else {
1183 return 0; 1204 return 0;
1184 } 1205 }
1185 1206
1186 1 1207 1
1187} 1208}
1188 1209
1189sub button_up { 1210sub invoke_button_up {
1190 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1191 1212
1192 !!delete $self->{motion} 1213 ! ! delete $self->{motion}
1193} 1214}
1194 1215
1195sub mouse_motion { 1216sub invoke_mouse_motion {
1196 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1197 1218
1198 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199 1220
1200 !!$self->{motion} 1221 ! ! $self->{motion}
1201} 1222}
1202 1223
1203sub _draw { 1224sub _draw {
1204 my ($self) = @_; 1225 my ($self) = @_;
1205 1226
… …
1231 1252
1232 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1233 1254
1234 $child->draw; 1255 $child->draw;
1235 1256
1236 if ($self->{title}) { 1257 if ($self->{title_widget}) {
1237 glTranslate 0, $border - $self->{h}; 1258 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw; 1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1239 } 1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1240} 1266}
1241 1267
1242############################################################################# 1268#############################################################################
1243 1269
1244package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1267 1293
1268 $child->set_parent ($self); 1294 $child->set_parent ($self);
1269 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1270 1296
1271 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1272} 1304}
1273 1305
1274# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1275sub clear { 1307sub clear {
1276 my ($self) = @_; 1308 my ($self) = @_;
… …
1317 (sum @$ws), 1349 (sum @$ws),
1318 (sum @$hs), 1350 (sum @$hs),
1319 ) 1351 )
1320} 1352}
1321 1353
1322sub size_allocate { 1354sub invoke_size_allocate {
1323 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1324 1356
1325 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1326 1358
1327 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
… …
1359 } 1391 }
1360 1392
1361 $y += $row_h; 1393 $y += $row_h;
1362 } 1394 }
1363 1395
1396 1
1364} 1397}
1365 1398
1366sub find_widget { 1399sub find_widget {
1367 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1368 1401
… …
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 ) 1440 )
1408} 1441}
1409 1442
1410sub size_allocate { 1443sub invoke_size_allocate {
1411 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1412 1445
1413 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1414 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1415 1448
1416 my @req; 1449 my @req;
1417 1450
1418 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1419 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1420 } else { 1453 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1422 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1423 1456
1424 if ($req > $space) { 1457 if ($req > $space) {
1425 # ah well, not enough space 1458 # ah well, not enough space
1426 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1427 } else { 1460 } else {
1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1429 1462
1430 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1431 1464
1432 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1433 for 0 .. $#$children; 1466 for 0 .. $#children;
1434 } 1467 }
1435 } 1468 }
1436 1469
1437 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1438 1471
1439 my $pos = 0; 1472 my $pos = 0;
1440 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1441 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1443 1476
1444 $pos += $alloc; 1477 $pos += $alloc;
1445 } 1478 }
1446 1479
1447 1 1480 1
… …
1537 1570
1538 delete $self->{texture}; 1571 delete $self->{texture};
1539 $self->SUPER::update; 1572 $self->SUPER::update;
1540} 1573}
1541 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1542sub set_text { 1582sub set_text {
1543 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1544 1584
1545 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1546 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1547 1587
1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1549 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1550 1590
1591 delete $self->{size_req};
1551 $self->realloc; 1592 $self->realloc;
1552 $self->update; 1593 $self->update;
1553} 1594}
1554 1595
1555sub set_markup { 1596sub set_markup {
… …
1561 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1562 1603
1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1564 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1565 1606
1607 delete $self->{size_req};
1566 $self->realloc; 1608 $self->realloc;
1567 $self->update; 1609 $self->update;
1568} 1610}
1569 1611
1570sub size_request { 1612sub size_request {
1571 my ($self) = @_; 1613 my ($self) = @_;
1572 1614
1615 $self->{size_req} ||= do {
1573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1574 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1578 1621
1579 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1580 1623
1581 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1582 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1583 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1584 1627
1585 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1586 1629
1587 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1588 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1589 } 1635 };
1590 1636
1591 ($w, $h) 1637 @{ $self->{size_req} }
1592} 1638}
1593 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1594sub size_allocate { 1644sub invoke_size_allocate {
1595 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1596 1646
1597 delete $self->{ox}; 1647 delete $self->{ox};
1598 1648
1599 delete $self->{texture} 1649 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1601} 1653}
1602 1654
1603sub set_fontsize { 1655sub set_fontsize {
1604 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1605 1657
1606 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1659 delete $self->{size_req};
1607 delete $self->{texture}; 1660 delete $self->{texture};
1608 1661
1609 $self->realloc; 1662 $self->realloc;
1663}
1664
1665sub reconfigure {
1666 my ($self) = @_;
1667
1668 delete $self->{size_req};
1669
1670 $self->SUPER::reconfigure;
1610} 1671}
1611 1672
1612sub _draw { 1673sub _draw {
1613 my ($self) = @_; 1674 my ($self) = @_;
1614 1675
… …
1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1635 : ($self->{h} - $tex->{h}) * 0.5); 1696 : ($self->{h} - $tex->{h}) * 0.5);
1636 }; 1697 };
1637 1698
1638 glEnable GL_TEXTURE_2D; 1699 glEnable GL_TEXTURE_2D;
1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1640 1703
1641 if ($tex->{format} == GL_ALPHA) { 1704 if ($tex->{format} == GL_ALPHA) {
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1642 glColor @{$self->{fg}}; 1706 glColor @{$self->{fg}};
1643 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1644 } else { 1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1646 } 1711 }
1647 1712
1648 glDisable GL_TEXTURE_2D; 1713 glDisable GL_TEXTURE_2D;
1649} 1714}
1650 1715
… …
1667 can_hover => 1, 1732 can_hover => 1,
1668 can_focus => 1, 1733 can_focus => 1,
1669 valign => 0, 1734 valign => 0,
1670 can_events => 1, 1735 can_events => 1,
1671 #text => ... 1736 #text => ...
1737 #hidden => "*",
1672 @_ 1738 @_
1673 ) 1739 )
1674} 1740}
1675 1741
1676sub _set_text { 1742sub _set_text {
… …
1683 $self->{last_activity} = $::NOW; 1749 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 1750 $self->{text} = $text;
1685 1751
1686 $text =~ s/./*/g if $self->{hidden}; 1752 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 1753 $self->{layout}->set_text ("$text ");
1754 delete $self->{size_req};
1688 1755
1689 $self->_emit (changed => $self->{text}); 1756 $self->emit (changed => $self->{text});
1757
1758 $self->realloc;
1690 $self->update; 1759 $self->update;
1691} 1760}
1692 1761
1693sub set_text { 1762sub set_text {
1694 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1695 1764
1696 $self->{cursor} = length $text; 1765 $self->{cursor} = length $text;
1697 $self->_set_text ($text); 1766 $self->_set_text ($text);
1698
1699 $self->realloc;
1700} 1767}
1701 1768
1702sub get_text { 1769sub get_text {
1703 $_[0]{text} 1770 $_[0]{text}
1704} 1771}
… …
1709 my ($w, $h) = $self->SUPER::size_request; 1776 my ($w, $h) = $self->SUPER::size_request;
1710 1777
1711 ($w + 1, $h) # add 1 for cursor 1778 ($w + 1, $h) # add 1 for cursor
1712} 1779}
1713 1780
1714sub key_down { 1781sub invoke_key_down {
1715 my ($self, $ev) = @_; 1782 my ($self, $ev) = @_;
1716 1783
1717 my $mod = $ev->{mod}; 1784 my $mod = $ev->{mod};
1718 my $sym = $ev->{sym}; 1785 my $sym = $ev->{sym};
1719 my $uni = $ev->{unicode}; 1786 my $uni = $ev->{unicode};
… …
1731 } elsif ($sym == CFClient::SDLK_HOME) { 1798 } elsif ($sym == CFClient::SDLK_HOME) {
1732 $self->{cursor} = 0; 1799 $self->{cursor} = 0;
1733 } elsif ($sym == CFClient::SDLK_END) { 1800 } elsif ($sym == CFClient::SDLK_END) {
1734 $self->{cursor} = length $text; 1801 $self->{cursor} = length $text;
1735 } elsif ($uni == 27) { 1802 } elsif ($uni == 27) {
1736 $self->_emit ('escape'); 1803 $self->emit ('escape');
1737 } elsif ($uni) { 1804 } elsif ($uni) {
1738 substr $text, $self->{cursor}++, 0, chr $uni; 1805 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else { 1806 } else {
1740 return 0; 1807 return 0;
1741 } 1808 }
… …
1745 $self->realloc; 1812 $self->realloc;
1746 1813
1747 1 1814 1
1748} 1815}
1749 1816
1750sub focus_in { 1817sub invoke_focus_in {
1751 my ($self) = @_; 1818 my ($self) = @_;
1752 1819
1753 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1754 1821
1755 $self->SUPER::focus_in; 1822 $self->SUPER::invoke_focus_in
1756} 1823}
1757 1824
1758sub button_down { 1825sub invoke_button_down {
1759 my ($self, $ev, $x, $y) = @_; 1826 my ($self, $ev, $x, $y) = @_;
1760 1827
1761 $self->SUPER::button_down ($ev, $x, $y); 1828 $self->SUPER::invoke_button_down ($ev, $x, $y);
1762 1829
1763 my $idx = $self->{layout}->xy_to_index ($x, $y); 1830 my $idx = $self->{layout}->xy_to_index ($x, $y);
1764 1831
1765 # byte-index to char-index 1832 # byte-index to char-index
1766 my $text = $self->{text}; 1833 my $text = $self->{text};
… …
1771 $self->update; 1838 $self->update;
1772 1839
1773 1 1840 1
1774} 1841}
1775 1842
1776sub mouse_motion { 1843sub invoke_mouse_motion {
1777 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1845# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779 1846
1780 0 1847 1
1781} 1848}
1782 1849
1783sub _draw { 1850sub _draw {
1784 my ($self) = @_; 1851 my ($self) = @_;
1785 1852
1786 local $self->{fg} = $self->{fg}; 1853 local $self->{fg} = $self->{fg};
1787 1854
1788 if ($FOCUS == $self) { 1855 if ($FOCUS == $self) {
1789 glColor @{$self->{active_bg}}; 1856 glColor_premultiply @{$self->{active_bg}};
1790 $self->{fg} = $self->{active_fg}; 1857 $self->{fg} = $self->{active_fg};
1791 } else { 1858 } else {
1792 glColor @{$self->{bg}}; 1859 glColor_premultiply @{$self->{bg}};
1793 } 1860 }
1794 1861
1795 glEnable GL_BLEND; 1862 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1863 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1797 glBegin GL_QUADS; 1864 glBegin GL_QUADS;
1798 glVertex 0 , 0; 1865 glVertex 0 , 0;
1799 glVertex 0 , $self->{h}; 1866 glVertex 0 , $self->{h};
1800 glVertex $self->{w}, $self->{h}; 1867 glVertex $self->{w}, $self->{h};
1801 glVertex $self->{w}, 0; 1868 glVertex $self->{w}, 0;
… …
1826 1893
1827our @ISA = CFClient::UI::EntryBase::; 1894our @ISA = CFClient::UI::EntryBase::;
1828 1895
1829use CFClient::OpenGL; 1896use CFClient::OpenGL;
1830 1897
1831sub key_down { 1898sub invoke_key_down {
1832 my ($self, $ev) = @_; 1899 my ($self, $ev) = @_;
1833 1900
1834 my $sym = $ev->{sym}; 1901 my $sym = $ev->{sym};
1835 1902
1836 if ($sym == 13) { 1903 if ($sym == 13) {
1837 unshift @{$self->{history}}, 1904 unshift @{$self->{history}},
1838 my $txt = $self->get_text; 1905 my $txt = $self->get_text;
1906
1839 $self->{history_pointer} = -1; 1907 $self->{history_pointer} = -1;
1840 $self->{history_saveback} = ''; 1908 $self->{history_saveback} = '';
1841 $self->_emit (activate => $txt); 1909 $self->emit (activate => $txt);
1842 $self->update; 1910 $self->update;
1843 1911
1844 } elsif ($sym == CFClient::SDLK_UP) { 1912 } elsif ($sym == CFClient::SDLK_UP) {
1845 if ($self->{history_pointer} < 0) { 1913 if ($self->{history_pointer} < 0) {
1846 $self->{history_saveback} = $self->get_text; 1914 $self->{history_saveback} = $self->get_text;
… …
1862 } else { 1930 } else {
1863 $self->set_text ($self->{history_saveback}); 1931 $self->set_text ($self->{history_saveback});
1864 } 1932 }
1865 1933
1866 } else { 1934 } else {
1867 return $self->SUPER::key_down ($ev) 1935 return $self->SUPER::invoke_key_down ($ev)
1868 } 1936 }
1869 1937
1870 1 1938 1
1871} 1939}
1872 1940
… …
1896 can_events => 1, 1964 can_events => 1,
1897 @_ 1965 @_
1898 ) 1966 )
1899} 1967}
1900 1968
1901sub activate { }
1902
1903sub button_up { 1969sub invoke_button_up {
1904 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1905 1971
1906 $self->emit ("activate") 1972 $self->emit ("activate")
1907 if $x >= 0 && $x < $self->{w} 1973 if $x >= 0 && $x < $self->{w}
1908 && $y >= 0 && $y < $self->{h}; 1974 && $y >= 0 && $y < $self->{h};
… …
1911} 1977}
1912 1978
1913sub _draw { 1979sub _draw {
1914 my ($self) = @_; 1980 my ($self) = @_;
1915 1981
1916 local $self->{fg} = $self->{fg}; 1982 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1917
1918 if ($GRAB == $self) {
1919 $self->{fg} = $self->{active_fg};
1920 }
1921 1983
1922 glEnable GL_TEXTURE_2D; 1984 glEnable GL_TEXTURE_2D;
1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924 glColor 0, 0, 0, 1; 1986 glColor 0, 0, 0, 1;
1925 1987
1926 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1988 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1927 1989
1928 glDisable GL_TEXTURE_2D; 1990 glDisable GL_TEXTURE_2D;
1929 1991
1930 $self->SUPER::_draw; 1992 $self->SUPER::_draw;
1993}
1994
1995#############################################################################
1996
1997package CFClient::UI::ImageButton;
1998
1999our @ISA = CFClient::UI::Image::;
2000
2001use CFClient::OpenGL;
2002
2003my %textures;
2004
2005sub new {
2006 my $class = shift;
2007
2008 my $self = $class->SUPER::new (
2009 padding_x => 4,
2010 padding_y => 4,
2011 fg => [1, 1, 1],
2012 active_fg => [0, 0, 1],
2013 can_hover => 1,
2014 align => 0,
2015 valign => 0,
2016 can_events => 1,
2017 @_
2018 );
2019}
2020
2021sub invoke_button_up {
2022 my ($self, $ev, $x, $y) = @_;
2023
2024 $self->emit ("activate")
2025 if $x >= 0 && $x < $self->{w}
2026 && $y >= 0 && $y < $self->{h};
2027
2028 1
1931} 2029}
1932 2030
1933############################################################################# 2031#############################################################################
1934 2032
1935package CFClient::UI::CheckBox; 2033package CFClient::UI::CheckBox;
… …
1962 my ($self) = @_; 2060 my ($self) = @_;
1963 2061
1964 (6) x 2 2062 (6) x 2
1965} 2063}
1966 2064
1967sub button_down { 2065sub invoke_button_down {
1968 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1969 2067
1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1972 $self->{state} = !$self->{state}; 2070 $self->{state} = !$self->{state};
1973 $self->_emit (changed => $self->{state}); 2071 $self->emit (changed => $self->{state});
1974 } else { 2072 } else {
1975 return 0 2073 return 0
1976 } 2074 }
1977 2075
1978 1 2076 1
… …
2003package CFClient::UI::Image; 2101package CFClient::UI::Image;
2004 2102
2005our @ISA = CFClient::UI::Base::; 2103our @ISA = CFClient::UI::Base::;
2006 2104
2007use CFClient::OpenGL; 2105use CFClient::OpenGL;
2008use Carp qw/confess/;
2009 2106
2010our %loaded_images; 2107our %texture_cache;
2011 2108
2012sub new { 2109sub new {
2013 my $class = shift; 2110 my $class = shift;
2014 2111
2015 my $self = $class->SUPER::new (can_events => 0, @_); 2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2016 2116
2017 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
2018 2119
2019 $loaded_images{$self->{image}} ||= 2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2020 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2021 2122
2022 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2023 2124
2024 Scalar::Util::weaken $loaded_images{$self->{image}}; 2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2025
2026 $self->{aspect} = $tex->{w} / $tex->{h};
2027 2126
2028 $self 2127 $self
2029} 2128}
2030 2129
2031sub size_request { 2130sub size_request {
2032 my ($self) = @_; 2131 my ($self) = @_;
2033 2132
2034 ($self->{tex}->{w}, $self->{tex}->{h}) 2133 ($self->{tex}{w}, $self->{tex}{h})
2035} 2134}
2036 2135
2037sub _draw { 2136sub _draw {
2038 my ($self) = @_; 2137 my ($self) = @_;
2039 2138
… …
2150 2249
2151 my $h1 = $self->{h} * (1 - $ycut1); 2250 my $h1 = $self->{h} * (1 - $ycut1);
2152 my $h2 = $self->{h} * (1 - $ycut2); 2251 my $h2 = $self->{h} * (1 - $ycut2);
2153 2252
2154 glEnable GL_BLEND; 2253 glEnable GL_BLEND;
2155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2156 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 2258
2159 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2259 glBindTexture GL_TEXTURE_2D, $t1->{name};
2160 glBegin GL_QUADS; 2260 glBegin GL_QUADS;
… …
2274 $self->update; 2374 $self->update;
2275 2375
2276 $self 2376 $self
2277} 2377}
2278 2378
2279sub changed { }
2280
2281sub set_range { 2379sub set_range {
2282 my ($self, $range) = @_; 2380 my ($self, $range) = @_;
2283 2381
2284 ($range, $self->{range}) = ($self->{range}, $range); 2382 ($range, $self->{range}) = ($self->{range}, $range);
2285 2383
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}"; 2384 if ("@$range" ne "@{$self->{range}}") {
2385 $self->update;
2386 $self->set_value ($self->{range}[0]);
2387 }
2288} 2388}
2289 2389
2290sub set_value { 2390sub set_value {
2291 my ($self, $value) = @_; 2391 my ($self, $value) = @_;
2292 2392
… …
2303 if $unit; 2403 if $unit;
2304 2404
2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2405 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2306 2406
2307 if ($value != $old_value) { 2407 if ($value != $old_value) {
2308 $self->_emit (changed => $value); 2408 $self->emit (changed => $value);
2309 $self->update; 2409 $self->update;
2310 } 2410 }
2311} 2411}
2312 2412
2313sub size_request { 2413sub size_request {
2314 my ($self) = @_; 2414 my ($self) = @_;
2315 2415
2316 ($self->{req_w}, $self->{req_h}) 2416 ($self->{req_w}, $self->{req_h})
2317} 2417}
2318 2418
2319sub button_down { 2419sub invoke_button_down {
2320 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2321 2421
2322 $self->SUPER::button_down ($ev, $x, $y); 2422 $self->SUPER::invoke_button_down ($ev, $x, $y);
2323 2423
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325 2425
2326 $self->mouse_motion ($ev, $x, $y) 2426 $self->invoke_mouse_motion ($ev, $x, $y)
2327} 2427}
2328 2428
2329sub mouse_motion { 2429sub invoke_mouse_motion {
2330 my ($self, $ev, $x, $y) = @_; 2430 my ($self, $ev, $x, $y) = @_;
2331 2431
2332 if ($GRAB == $self) { 2432 if ($GRAB == $self) {
2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2433 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2334 2434
… …
2439sub set_range { shift->{slider}->set_range (@_) } 2539sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) } 2540sub set_value { shift->{slider}->set_value (@_) }
2441 2541
2442############################################################################# 2542#############################################################################
2443 2543
2444package CFClient::UI::TextView; 2544package CFClient::UI::TextScroller;
2445 2545
2446our @ISA = CFClient::UI::HBox::; 2546our @ISA = CFClient::UI::HBox::;
2447 2547
2448use CFClient::OpenGL; 2548use CFClient::OpenGL;
2449 2549
… …
2451 my $class = shift; 2551 my $class = shift;
2452 2552
2453 my $self = $class->SUPER::new ( 2553 my $self = $class->SUPER::new (
2454 fontsize => 1, 2554 fontsize => 1,
2455 can_events => 0, 2555 can_events => 0,
2556 indent => 0,
2456 #font => default_font 2557 #font => default_font
2457 @_, 2558 @_,
2458 2559
2459 layout => (new CFClient::Layout 1), 2560 layout => (new CFClient::Layout 1),
2460 par => [], 2561 par => [],
… …
2475 2576
2476 $self->{fontsize} = $fontsize; 2577 $self->{fontsize} = $fontsize;
2477 $self->reflow; 2578 $self->reflow;
2478} 2579}
2479 2580
2581sub size_request {
2582 my ($self) = @_;
2583
2584 my ($empty, $slider) = @{ $self->{children} };
2585
2586 local $self->{children} = [$empty, $slider];
2587 $self->SUPER::size_request
2588}
2589
2480sub size_allocate { 2590sub invoke_size_allocate {
2481 my ($self, $w, $h) = @_; 2591 my ($self, $w, $h) = @_;
2482 2592
2483 $self->SUPER::size_allocate ($w, $h); 2593 my ($empty, $slider, @other) = @{ $self->{children} };
2594 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2484 2595
2485 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2596 $self->{layout}->set_font ($self->{font}) if $self->{font};
2486 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $self->{layout}->set_width ($self->{children}[0]{w}); 2598 $self->{layout}->set_width ($empty->{w});
2599 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 2600
2489 $self->reflow; 2601 $self->reflow;
2490}
2491 2602
2492sub text_size { 2603 local $self->{children} = [$empty, $slider];
2493 my ($self, $text, $indent) = @_; 2604 $self->SUPER::invoke_size_allocate ($w, $h)
2605}
2606
2607sub get_layout {
2608 my ($self, $para) = @_;
2494 2609
2495 my $layout = $self->{layout}; 2610 my $layout = $self->{layout};
2496 2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613 $layout->set_foreground (@{$para->{fg}});
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2614 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $layout->set_width ($self->{children}[0]{w} - $indent); 2615 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2616 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 $layout->set_markup ($text); 2617 $layout->set_markup ($para->{markup});
2618
2619 $layout->set_shapes (
2620 map
2621 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2622 @{$para->{widget}}
2500 2623 );
2624
2501 $layout->size 2625 $layout
2502} 2626}
2503 2627
2504sub reflow { 2628sub reflow {
2505 my ($self) = @_; 2629 my ($self) = @_;
2506 2630
… …
2515 $self->{children}[1]->set_value ($offset); 2639 $self->{children}[1]->set_value ($offset);
2516} 2640}
2517 2641
2518sub clear { 2642sub clear {
2519 my ($self) = @_; 2643 my ($self) = @_;
2644
2645 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other;
2520 2647
2521 $self->{par} = []; 2648 $self->{par} = [];
2522 $self->{height} = 0; 2649 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524} 2651}
2525 2652
2526sub add_paragraph { 2653sub add_paragraph {
2527 my ($self, $color, $text, $indent) = @_; 2654 my ($self, $color, $para, $indent) = @_;
2528 2655
2529 for my $line (split /\n/, $text) { 2656 my ($text, @w) = ref $para ? @$para : $para;
2530 my ($w, $h) = $self->text_size ($line); 2657
2531 $self->{height} += $h; 2658 $para = {
2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2659 w => 1e10,
2660 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2533 } 2665 };
2534 2666
2535 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2667 $self->add (@w) if @w;
2668 push @{$self->{par}}, $para;
2669
2670 $self->{need_reflow}++;
2671 $self->update;
2672}
2673
2674sub scroll_to_bottom {
2675 my ($self) = @_;
2676
2677 $self->{scroll_to_bottom} = 1;
2678 $self->update;
2536} 2679}
2537 2680
2538sub update { 2681sub update {
2539 my ($self) = @_; 2682 my ($self) = @_;
2540 2683
… …
2542 2685
2543 return unless $self->{h} > 0; 2686 return unless $self->{h} > 0;
2544 2687
2545 delete $self->{texture}; 2688 delete $self->{texture};
2546 2689
2547 $ROOT->on_post_alloc ($self, sub { 2690 $ROOT->on_post_alloc ($self => sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549 2692
2550 if (delete $self->{need_reflow}) { 2693 if (delete $self->{need_reflow}) {
2551 my $height = 0; 2694 my $height = 0;
2552 2695
2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2557 for (@{$self->{par}}) { 2696 for my $para (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2559 $layout->set_width ($W - $_->[3]); 2698 my $layout = $self->get_layout ($para);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size; 2699 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3]; 2700
2563 $_->[1] = $h; 2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2564 } 2704 }
2565 2705
2566 $height += $_->[1]; 2706 $height += $para->{h};
2567 } 2707 }
2568 2708
2569 $self->{height} = $height; 2709 $self->{height} = $height;
2570 2710
2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2572 2712
2573 delete $self->{texture}; 2713 delete $self->{texture};
2574 } 2714 }
2575 2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2718 }
2719
2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2577 glClearColor 0.5, 0.5, 0.5, 0; 2721 glClearColor 0, 0, 0, 0;
2578 glClear GL_COLOR_BUFFER_BIT; 2722 glClear GL_COLOR_BUFFER_BIT;
2579 2723
2580 my $top = int $self->{children}[1]{range}[0]; 2724 my $top = int $self->{children}[1]{range}[0];
2581 2725
2582 my $y0 = $top; 2726 my $y0 = $top;
2583 my $y1 = $top + $H; 2727 my $y1 = $top + $H;
2584 2728
2585 my $y = 0; 2729 my $y = 0;
2586
2587 my $layout = $self->{layout};
2588
2589 $layout->set_font ($self->{font}) if $self->{font};
2590 2730
2591 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off 2732 #TODO# not correct in windows where rgba is forced off
2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2594 2734
2595 for my $par (@{$self->{par}}) { 2735 for my $para (@{$self->{par}}) {
2596 my $h = $par->[1]; 2736 my $h = $para->{h};
2597 2737
2598 if ($y0 < $y + $h && $y < $y1) { 2738 if ($y0 < $y + $h && $y < $y1) {
2599 $layout->set_foreground (@{ $par->[2] }); 2739
2600 $layout->set_width ($W - $par->[3]); 2740 my $layout = $self->get_layout ($para);
2601 $layout->set_markup ($par->[4]);
2602 2741
2603 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2604 2743
2605 glRasterPos $par->[3], $y - $y0; 2744 glRasterPos $para->{indent}, $y - $y0;
2606 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 glDisable GL_BLEND;
2751 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, ();
2753
2754 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0;
2756
2757 $_->draw;
2758 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 }
2607 } 2762 }
2608 2763
2609 $y += $h; 2764 $y += $h;
2610 } 2765 }
2611 2766
2612 glDisable GL_BLEND; 2767 glDisable GL_BLEND;
2613 }; 2768 };
2614 }); 2769 });
2615} 2770}
2616 2771
2772sub reconfigure {
2773 my ($self) = @_;
2774
2775 $self->SUPER::reconfigure;
2776
2777 $_->{w} = 1e10 for @{ $self->{par} };
2778 $self->reflow;
2779}
2780
2617sub _draw { 2781sub _draw {
2618 my ($self) = @_; 2782 my ($self) = @_;
2619 2783
2620 glEnable GL_TEXTURE_2D; 2784 glEnable GL_TEXTURE_2D;
2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2622 glColor 1, 1, 1, 1; 2786 glColor 0, 0, 0, 1;
2623 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2787 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2624 glDisable GL_TEXTURE_2D; 2788 glDisable GL_TEXTURE_2D;
2625 2789
2626 $self->{children}[1]->draw; 2790 $self->{children}[1]->draw;
2627
2628} 2791}
2629 2792
2630############################################################################# 2793#############################################################################
2631 2794
2632package CFClient::UI::Animator; 2795package CFClient::UI::Animator;
… …
2719 $tooltip .= "\n\n" . (ref $widget) . "\n" 2882 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2883 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n" 2884 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}"; 2885 . "visible $widget->{visible}";
2723 } 2886 }
2887
2888 $tooltip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//;
2724 2890
2725 $self->add (new CFClient::UI::Label 2891 $self->add (new CFClient::UI::Label
2726 markup => $tooltip, 2892 markup => $tooltip,
2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2728 fontsize => 0.8, 2894 fontsize => 0.8,
… …
2738 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2904 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2739 2905
2740 ($w + 4, $h + 4) 2906 ($w + 4, $h + 4)
2741} 2907}
2742 2908
2743sub size_allocate { 2909sub invoke_size_allocate {
2744 my ($self, $w, $h) = @_; 2910 my ($self, $w, $h) = @_;
2745 2911
2746 $self->SUPER::size_allocate ($w - 4, $h - 4); 2912 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2747} 2913}
2748 2914
2749sub visibility_change { 2915sub invoke_visibility_change {
2750 my ($self, $visible) = @_; 2916 my ($self, $visible) = @_;
2751 2917
2752 return unless $visible; 2918 return unless $visible;
2753 2919
2754 $self->{root}->on_post_alloc ("move_$self" => sub { 2920 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2756 or return; 2922 or return;
2757 2923
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759 2925
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH; 2927 if $x + $self->{w} > $self->{root}{w};
2762 2928
2763 $self->move_abs ($x, $y); 2929 $self->move_abs ($x, $y);
2764 }); 2930 });
2765} 2931}
2766 2932
… …
2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3021 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2856 3022
2857 if ($tex) { 3023 if ($tex) {
2858 glEnable GL_TEXTURE_2D; 3024 glEnable GL_TEXTURE_2D;
2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2860 glColor 1, 1, 1, 1; 3026 glColor 0, 0, 0, 1;
2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3027 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2862 glDisable GL_TEXTURE_2D; 3028 glDisable GL_TEXTURE_2D;
2863 } 3029 }
2864} 3030}
2865 3031
2866sub DESTROY { 3032sub destroy {
2867 my ($self) = @_; 3033 my ($self) = @_;
2868 3034
2869 $self->{timer}->cancel 3035 $self->{timer}->cancel
2870 if $self->{timer}; 3036 if $self->{timer};
2871 3037
2872 $self->SUPER::DESTROY; 3038 $self->SUPER::destroy;
2873} 3039}
2874 3040
2875############################################################################# 3041#############################################################################
2876 3042
2877package CFClient::UI::Buttonbar; 3043package CFClient::UI::Buttonbar;
… …
2898 ); 3064 );
2899 3065
2900 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3066 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2901 3067
2902 for my $item (@{ $self->{items} }) { 3068 for my $item (@{ $self->{items} }) {
2903 my ($widget, $cb) = @$item; 3069 my ($widget, $cb, $tooltip) = @$item;
2904 3070
2905 # handle various types of items, only text for now 3071 # handle various types of items, only text for now
2906 if (!ref $widget) { 3072 if (!ref $widget) {
2907 $widget = new CFClient::UI::Label 3073 $widget = new CFClient::UI::Label
2908 can_hover => 1, 3074 can_hover => 1,
2909 can_events => 1, 3075 can_events => 1,
2910 text => $widget; 3076 markup => $widget,
3077 tooltip => $tooltip
2911 } 3078 }
2912 3079
2913 $self->{item}{$widget} = $item; 3080 $self->{item}{$widget} = $item;
2914 3081
2915 $self->{vbox}->add ($widget); 3082 $self->{vbox}->add ($widget);
… …
2920 3087
2921# popup given the event (must be a mouse button down event currently) 3088# popup given the event (must be a mouse button down event currently)
2922sub popup { 3089sub popup {
2923 my ($self, $ev) = @_; 3090 my ($self, $ev) = @_;
2924 3091
2925 $self->_emit ("popdown"); 3092 $self->emit ("popdown");
2926 3093
2927 # maybe save $GRAB? must be careful about events... 3094 # maybe save $GRAB? must be careful about events...
2928 $GRAB = $self; 3095 $GRAB = $self;
2929 $self->{button} = $ev->{button}; 3096 $self->{button} = $ev->{button};
2930 3097
2931 $self->show; 3098 $self->show;
2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3099 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2933} 3100}
2934 3101
2935sub mouse_motion { 3102sub invoke_mouse_motion {
2936 my ($self, $ev, $x, $y) = @_; 3103 my ($self, $ev, $x, $y) = @_;
2937 3104
2938 # TODO: should use vbox->find_widget or so 3105 # TODO: should use vbox->find_widget or so
2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3106 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2940 $self->{hover} = $self->{item}{$HOVER}; 3107 $self->{hover} = $self->{item}{$HOVER};
2941 3108
2942 0 3109 0
2943} 3110}
2944 3111
2945sub button_up { 3112sub invoke_button_up {
2946 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2947 3114
2948 if ($ev->{button} == $self->{button}) { 3115 if ($ev->{button} == $self->{button}) {
2949 undef $GRAB; 3116 undef $GRAB;
2950 $self->hide; 3117 $self->hide;
2951 3118
2952 $self->_emit ("popdown"); 3119 $self->emit ("popdown");
2953 $self->{hover}[1]->() if $self->{hover}; 3120 $self->{hover}[1]->() if $self->{hover};
2954 } else { 3121 } else {
2955 return 0 3122 return 0
2956 } 3123 }
2957 3124
… …
2994 : $self->{children}[$page_or_widget]; 3161 : $self->{children}[$page_or_widget];
2995 3162
2996 $self->{current} = $widget; 3163 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998 3165
2999 $self->_emit (page_changed => $self->{current}); 3166 $self->emit (page_changed => $self->{current});
3000 3167
3001 $self->realloc; 3168 $self->realloc;
3002} 3169}
3003 3170
3004sub visible_children { 3171sub visible_children {
… …
3009 my ($self) = @_; 3176 my ($self) = @_;
3010 3177
3011 $self->{current}->size_request 3178 $self->{current}->size_request
3012} 3179}
3013 3180
3014sub size_allocate { 3181sub invoke_size_allocate {
3015 my ($self, $w, $h) = @_; 3182 my ($self, $w, $h) = @_;
3016 3183
3017 $self->{current}->configure (0, 0, $w, $h); 3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3018} 3187}
3019 3188
3020sub _draw { 3189sub _draw {
3021 my ($self) = @_; 3190 my ($self) = @_;
3022 3191
… …
3061 3230
3062sub set_current_page { 3231sub set_current_page {
3063 my ($self, $page) = @_; 3232 my ($self, $page) = @_;
3064 3233
3065 $self->{multiplexer}->set_current_page ($page); 3234 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current}); 3235 $self->emit (page_changed => $self->{multiplexer}{current});
3067} 3236}
3068 3237
3069############################################################################# 3238#############################################################################
3070 3239
3071package CFClient::UI::Statusbox; 3240package CFClient::UI::Combobox;
3072 3241
3242use utf8;
3243
3073our @ISA = CFClient::UI::VBox::; 3244our @ISA = CFClient::UI::Button::;
3074 3245
3075sub new { 3246sub new {
3076 my $class = shift; 3247 my $class = shift;
3077 3248
3078 $class->SUPER::new ( 3249 my $self = $class->SUPER::new (
3250 options => [], # [value, title, longdesc], ...
3251 value => undef,
3252 @_,
3253 );
3254
3255 $self->_set_value ($self->{value});
3256
3257 $self
3258}
3259
3260sub invoke_button_down {
3261 my ($self, $ev) = @_;
3262
3263 my @menu_items;
3264
3265 for (@{ $self->{options} }) {
3266 my ($value, $title, $tooltip) = @$_;
3267
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 }
3270
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272}
3273
3274sub _set_value {
3275 my ($self, $value) = @_;
3276
3277 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3278 or return;
3279
3280 $self->{value} = $item->[0];
3281 $self->set_markup ("$item->[1] ⇓");
3282 $self->set_tooltip ($item->[2]);
3283}
3284
3285sub set_value {
3286 my ($self, $value) = @_;
3287
3288 return unless $self->{value} ne $value;
3289
3290 $self->_set_value ($value);
3291 $self->emit (changed => $value);
3292}
3293
3294#############################################################################
3295
3296package CFClient::UI::Statusbox;
3297
3298our @ISA = CFClient::UI::VBox::;
3299
3300sub new {
3301 my $class = shift;
3302
3303 my $self = $class->SUPER::new (
3079 fontsize => 0.8, 3304 fontsize => 0.8,
3080 @_, 3305 @_,
3081 ) 3306 );
3307
3308 Scalar::Util::weaken (my $this = $self);
3309
3310 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311
3312 $self
3082} 3313}
3083 3314
3084sub reorder { 3315sub reorder {
3085 my ($self) = @_; 3316 my ($self) = @_;
3086 my $NOW = time; 3317 my $NOW = Time::HiRes::time;
3318
3319 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} };
3087 3323
3088 while (my ($k, $v) = each %{ $self->{item} }) { 3324 while (my ($k, $v) = each %{ $self->{item} }) {
3089 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3325 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090 } 3326 }
3091 3327
… …
3094 my @items = sort { 3330 my @items = sort {
3095 $a->{pri} <=> $b->{pri} 3331 $a->{pri} <=> $b->{pri}
3096 or $b->{id} <=> $a->{id} 3332 or $b->{id} <=> $a->{id}
3097 } values %{ $self->{item} }; 3333 } values %{ $self->{item} };
3098 3334
3335 $self->{timer}->interval (1);
3336
3099 my $count = 10 + 1; 3337 my $count = 10 + 1;
3100 for my $item (@items) { 3338 for my $item (@items) {
3101 last unless --$count; 3339 last unless --$count;
3102 3340
3103 push @widgets, $item->{label} ||= do { 3341 my $label = $item->{label} ||= do {
3104 # TODO: doesn't handle markup well (read as: at all) 3342 # TODO: doesn't handle markup well (read as: at all)
3105 my $short = $item->{count} > 1 3343 my $short = $item->{count} > 1
3106 ? "<b>$item->{count} ×</b> $item->{text}" 3344 ? "<b>$item->{count} ×</b> $item->{text}"
3107 : $item->{text}; 3345 : $item->{text};
3108 3346
… …
3116 tooltip => $item->{tooltip}, 3354 tooltip => $item->{tooltip},
3117 tooltip_font => $::FONT_PROP, 3355 tooltip_font => $::FONT_PROP,
3118 tooltip_width => 0.67, 3356 tooltip_width => 0.67,
3119 fontsize => $item->{fontsize} || $self->{fontsize}, 3357 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44, 3358 max_w => $::WIDTH * 0.44,
3121 fg => $item->{fg}, 3359 fg => [@{ $item->{fg} }],
3122 can_events => 1, 3360 can_events => 1,
3123 can_hover => 1 3361 can_hover => 1
3124 }; 3362 };
3363
3364 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3365 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3366 $label->update;
3367 $label->set_max_size (undef, $label->{req_h} * $diff)
3368 if $diff < 1;
3369 $self->{timer}->interval (1/30);
3370 } else {
3371 $label->{fg}[3] = $item->{fg}[3] || 1;
3372 }
3373
3374 push @widgets, $label;
3125 } 3375 }
3126 3376
3127 $self->clear; 3377 $self->clear;
3128 $self->SUPER::add (reverse @widgets); 3378 $self->SUPER::add (reverse @widgets);
3129} 3379}
… …
3134 $text =~ s/^\s+//; 3384 $text =~ s/^\s+//;
3135 $text =~ s/\s+$//; 3385 $text =~ s/\s+$//;
3136 3386
3137 return unless $text; 3387 return unless $text;
3138 3388
3139 my $timeout = time + ((delete $arg{timeout}) || 60); 3389 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3140 3390
3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3391 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142 3392
3143 if (my $item = $self->{item}{$group}) { 3393 if (my $item = $self->{item}{$group}) {
3144 if ($item->{text} eq $text) { 3394 if ($item->{text} eq $text) {
3145 $item->{count}++; 3395 $item->{count}++;
3146 } else { 3396 } else {
3147 $item->{count} = 1; 3397 $item->{count} = 1;
3148 $item->{text} = $item->{tooltip} = $text; 3398 $item->{text} = $item->{tooltip} = $text;
3149 } 3399 }
3150 $item->{id} = ++$self->{id}; 3400 $item->{id} += 0.2;#d#
3151 $item->{timeout} = $timeout; 3401 $item->{timeout} = $timeout;
3152 delete $item->{label}; 3402 delete $item->{label};
3153 } else { 3403 } else {
3154 $self->{item}{$group} = { 3404 $self->{item}{$group} = {
3155 id => ++$self->{id}, 3405 id => ++$self->{id},
… …
3161 count => 1, 3411 count => 1,
3162 %arg, 3412 %arg,
3163 }; 3413 };
3164 } 3414 }
3165 3415
3416 $ROOT->on_refresh (reorder => sub {
3166 $self->reorder; 3417 $self->reorder;
3418 });
3167} 3419}
3168 3420
3169sub reconfigure { 3421sub reconfigure {
3170 my ($self) = @_; 3422 my ($self) = @_;
3171 3423
3172 delete $_->{label} 3424 delete $_->{label}
3173 for values %{ $self->{item} || {} }; 3425 for values %{ $self->{item} || {} };
3174 3426
3175 $self->reorder; 3427 $self->reorder;
3176 $self->SUPER::reconfigure; 3428 $self->SUPER::reconfigure;
3429}
3430
3431sub destroy {
3432 my ($self) = @_;
3433
3434 $self->{timer}->cancel;
3435
3436 $self->SUPER::destroy;
3177} 3437}
3178 3438
3179############################################################################# 3439#############################################################################
3180 3440
3181package CFClient::UI::Inventory; 3441package CFClient::UI::Inventory;
… …
3200 return unless $items; 3460 return unless $items;
3201 3461
3202 my @items = sort { 3462 my @items = sort {
3203 ($a->{type} <=> $b->{type}) 3463 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name}) 3464 or ($a->{name} cmp $b->{name})
3205 } @$items; 3465 } values %$items;
3206 3466
3207 $self->{real_items} = \@items; 3467 $self->{real_items} = \@items;
3208 3468
3209 my $row = 0; 3469 my $row = 0;
3210 for my $item (@items) { 3470 for my $item (@items) {
… …
3213 $self->{child}->add (0, $row, $item->{face_widget}); 3473 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget}); 3474 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget}); 3475 $self->{child}->add (2, $row, $item->{weight_widget});
3216 3476
3217 $row++; 3477 $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 } 3478 }
3416} 3479}
3417 3480
3418############################################################################# 3481#############################################################################
3419 3482
… …
3429 commands => [], 3492 commands => [],
3430 @_, 3493 @_,
3431 ) 3494 )
3432} 3495}
3433 3496
3434# XXX: Do sorting? Argl... 3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3435sub add_spell { 3582sub add_spell {
3436 my ($self, $spell) = @_; 3583 my ($self, $spell) = @_;
3584
3437 $self->{spells}->{$spell->{name}} = $spell; 3585 $self->{spell}->{$spell->{name}} = $spell;
3438 3586 $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} 3587}
3467 3588
3468sub remove_spell { 3589sub remove_spell {
3469 my ($self, $spell) = @_; 3590 my ($self, $spell) = @_;
3591
3470 delete $self->{spells}->{$spell->{name}}; 3592 delete $self->{spell}->{$spell->{name}};
3471 $self->rebuild_spell_list; 3593 $self->rebuild_spell_list;
3472} 3594}
3473 3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3474############################################################################# 3603#############################################################################
3475 3604
3476package CFClient::UI::Root; 3605package CFClient::UI::Root;
3477 3606
3478our @ISA = CFClient::UI::Container::; 3607our @ISA = CFClient::UI::Container::;
3608
3609use List::Util qw(min max);
3479 3610
3480use CFClient::OpenGL; 3611use CFClient::OpenGL;
3481 3612
3482sub new { 3613sub new {
3483 my $class = shift; 3614 my $class = shift;
… …
3510 $coord = $max - $size if $coord > $max - $size; 3641 $coord = $max - $size if $coord > $max - $size;
3511 3642
3512 int $coord + 0.5 3643 int $coord + 0.5
3513} 3644}
3514 3645
3515sub size_allocate { 3646sub invoke_size_allocate {
3516 my ($self, $w, $h) = @_; 3647 my ($self, $w, $h) = @_;
3517 3648
3518 for my $child ($self->children) { 3649 for my $child ($self->children) {
3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3650 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3520 3651
… …
3524 $X = _to_pixel $X, $W, $self->{w}; 3655 $X = _to_pixel $X, $W, $self->{w};
3525 $Y = _to_pixel $Y, $H, $self->{h}; 3656 $Y = _to_pixel $Y, $H, $self->{h};
3526 3657
3527 $child->configure ($X, $Y, $W, $H); 3658 $child->configure ($X, $Y, $W, $H);
3528 } 3659 }
3660
3661 1
3529} 3662}
3530 3663
3531sub coord2local { 3664sub coord2local {
3532 my ($self, $x, $y) = @_; 3665 my ($self, $x, $y) = @_;
3533 3666
… …
3618 3751
3619 delete $queue{$widget+0}; 3752 delete $queue{$widget+0};
3620 3753
3621 my ($w, $h) = $widget->size_request; 3754 my ($w, $h) = $widget->size_request;
3622 3755
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3756 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3757 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3758
3759 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3760 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3625 3761
3626 $w = $widget->{force_w} if exists $widget->{force_w}; 3762 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h}; 3763 $h = $widget->{force_h} if exists $widget->{force_h};
3628 3764
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3765 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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