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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.319 by root, Sun Jul 2 21:07:26 2006 UTC

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

Diff Legend

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