ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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