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.305 by root, Sun Jun 18 17:13:12 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
366 366
367 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
368 } 368 }
369} 369}
370 370
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 371sub children {
376 # nop 372 # nop
377} 373}
378 374
379sub visible_children { 375sub visible_children {
381} 377}
382 378
383sub set_max_size { 379sub set_max_size {
384 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
385 381
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
388} 386}
389 387
390sub set_tooltip { 388sub set_tooltip {
391 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
392 390
397 395
398 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
399 397
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 401 }
404} 402}
405 403
406# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
407sub coord2local { 405sub coord2local {
415 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
416 414
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 416}
419 417
420sub focus_in { 418sub invoke_focus_in {
421 my ($self) = @_; 419 my ($self) = @_;
422 420
423 return if $FOCUS == $self; 421 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
425 423
426 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
427 425
428 $self->_emit (focus_in => $focus);
429
430 $focus->update if $focus; 426 $focus->update if $focus;
431 $FOCUS->update; 427 $FOCUS->update;
432}
433 428
429 0
430}
431
434sub focus_out { 432sub invoke_focus_out {
435 my ($self) = @_; 433 my ($self) = @_;
436 434
437 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
438 436
439 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
440 438
441 $self->_emit (focus_out => $focus);
442
443 $focus->update if $focus; #? 439 $focus->update if $focus; #?
444 440
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 442 unless $FOCUS;
447}
448 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
449sub mouse_motion { 0 } 453sub invoke_mouse_motion { 1 }
450sub button_up { 0 } 454sub invoke_button_up { 1 }
451sub key_down { 0 } 455sub invoke_key_down { 1 }
452sub key_up { 0 } 456sub invoke_key_up { 1 }
453 457
454sub button_down { 458sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
456 460
457 $self->focus_in; 461 $self->grab_focus;
458 462
459 0 463 1
464}
465
466sub connect {
467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 478}
461 479
462sub find_widget { 480sub find_widget {
463 my ($self, $x, $y) = @_; 481 my ($self, $x, $y) = @_;
464 482
474sub set_parent { 492sub set_parent {
475 my ($self, $parent) = @_; 493 my ($self, $parent) = @_;
476 494
477 Scalar::Util::weaken ($self->{parent} = $parent); 495 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 496 $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} 497}
503 498
504sub realloc { 499sub realloc {
505 my ($self) = @_; 500 my ($self) = @_;
506 501
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 545
551 glPushMatrix; 546 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 548
556 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 551 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 553 glBegin GL_QUADS;
563 glVertex $x , $y; 554 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
567 glEnd; 558 glEnd;
568 glDisable GL_BLEND; 559 glDisable GL_BLEND;
569 } 560 }
570 561
571 if ($ENV{CFPLUS_DEBUG} & 1) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 563 glPushMatrix;
573 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 567 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
580 glEnd; 571 glEnd;
581 glPopMatrix; 572 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
584} 578}
585 579
586sub _draw { 580sub _draw {
587 my ($self) = @_; 581 my ($self) = @_;
588 582
591 585
592sub DESTROY { 586sub DESTROY {
593 my ($self) = @_; 587 my ($self) = @_;
594 588
595 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
596 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 593}
598 594
599############################################################################# 595#############################################################################
600 596
601package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
626 622
627 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
629 625
630 glEnable GL_BLEND; 626 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 628 glColor_premultiply @$color;
633 629
634 glBegin GL_QUADS; 630 glBegin GL_QUADS;
635 glVertex 0 , 0; 631 glVertex 0 , 0;
636 glVertex 0 , $h; 632 glVertex 0 , $h;
637 glVertex $w, $h; 633 glVertex $w, $h;
766} 762}
767 763
768sub add { 764sub add {
769 my ($self, $child) = @_; 765 my ($self, $child) = @_;
770 766
771 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
774} 769}
775 770
776sub remove { 771sub remove {
777 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
786 781
787sub size_request { 782sub size_request {
788 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
789} 784}
790 785
791sub size_allocate { 786sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
793 788
794 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
795} 792}
796 793
797############################################################################# 794#############################################################################
795
796# back-buffered drawing area
798 797
799package CFClient::UI::Window; 798package CFClient::UI::Window;
800 799
801our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
802 801
813 812
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 814 $self->SUPER::update;
816} 815}
817 816
818sub size_allocate { 817sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
820 819
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
823} 823}
824 824
825sub _render { 825sub _render {
826 my ($self) = @_; 826 my ($self) = @_;
827 827
854 my $tex = $self->{texture} 854 my $tex = $self->{texture}
855 or return; 855 or return;
856 856
857 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
860 860
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 862
863 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
864} 864}
888 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
889 889
890 ($w, $h) 890 ($w, $h)
891} 891}
892 892
893sub size_allocate { 893sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
895 895
896 my $child = $self->child; 896 my $child = $self->child;
897 897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 900
901 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
902 $self->update; 902 $self->update;
903
904 1
903} 905}
904 906
905sub set_offset { 907sub set_offset {
906 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
907 909
997 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
998 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1000} 1002}
1001 1003
1002sub size_allocate { 1004sub invoke_size_allocate {
1003 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
1004
1005 $self->SUPER::size_allocate ($w, $h);
1006 1006
1007 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
1009} 1011}
1010 1012
1011#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll 1014# update viewport offset on scroll
1013 1015
1033 1035
1034 if ($self->{bg}) { 1036 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
1036 1038
1037 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
1040 1042
1041 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
1042 glVertex 0 , 0; 1044 glVertex 0 , 0;
1043 glVertex 0 , $h; 1045 glVertex 0 , $h;
1044 glVertex $w, $h; 1046 glVertex $w, $h;
1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 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); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1069 1071
1070sub new { 1072sub new {
1071 my ($class, %arg) = @_; 1073 my ($class, %arg) = @_;
1072
1073 my $title = delete $arg{title};
1074 1074
1075 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1078 border => 0.6,
1080 min_w => 16, 1080 min_w => 16,
1081 min_h => 16, 1081 min_h => 16,
1082 %arg, 1082 %arg,
1083 ); 1083 );
1084 1084
1085 $self->{title} = new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1086 align => 0, 1086 align => 0,
1087 valign => 1, 1087 valign => 1,
1088 text => $title, 1088 text => $self->{title},
1089 fontsize => $self->{border} 1089 fontsize => $self->{border},
1090 if defined $title; 1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
1091 1100
1092 $self 1101 $self
1093} 1102}
1094 1103
1095sub add { 1104sub add {
1096 my ($self, @widgets) = @_; 1105 my ($self, @widgets) = @_;
1097 1106
1098 $self->SUPER::add (@widgets); 1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1100} 1110}
1101 1111
1102sub border { 1112sub border {
1103 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1104} 1114}
1105 1115
1106sub size_request { 1116sub size_request {
1107 my ($self) = @_; 1117 my ($self) = @_;
1108 1118
1109 $self->{title}->size_request 1119 $self->{title_widget}->size_request
1110 if $self->{title}; 1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
1111 1124
1112 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1113 1126
1114 ( 1127 (
1115 $w + $self->border * 2, 1128 $w + $self->border * 2,
1116 $h + $self->border * 2, 1129 $h + $self->border * 2,
1117 ) 1130 )
1118} 1131}
1119 1132
1120sub size_allocate { 1133sub invoke_size_allocate {
1121 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
1122 1135
1123 if ($self->{title}) { 1136 if ($self->{title_widget}) {
1124 $self->{title}{w} = $w; 1137 $self->{title_widget}{w} = $w;
1125 $self->{title}{h} = $h; 1138 $self->{title_widget}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h); 1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1127 } 1140 }
1128 1141
1129 my $border = $self->border; 1142 my $border = $self->border;
1130 1143
1131 $h -= List::Util::max 0, $border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1132 $w -= List::Util::max 0, $border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1133 1146
1134 $self->child->configure ($border, $border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1135}
1136 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1137sub button_down { 1155sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1139 1157
1140 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1141 my $border = $self->border; 1159 my $border = $self->border;
1142 1160
1158 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1159 1177
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1180
1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1182 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1183 };
1166 1184
1167 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
1172 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1173 1191
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1193
1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1195 # HACK: the next line is required to enforce placement
1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1177 }; 1197 };
1178 } else { 1198 } else {
1179 return 0; 1199 return 0;
1180 } 1200 }
1181 1201
1182 1 1202 1
1183} 1203}
1184 1204
1185sub button_up { 1205sub invoke_button_up {
1186 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1187 1207
1188 !!delete $self->{motion} 1208 ! ! delete $self->{motion}
1189} 1209}
1190 1210
1191sub mouse_motion { 1211sub invoke_mouse_motion {
1192 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1193 1213
1194 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195 1215
1196 !!$self->{motion} 1216 ! ! $self->{motion}
1197} 1217}
1198 1218
1199sub _draw { 1219sub _draw {
1200 my ($self) = @_; 1220 my ($self) = @_;
1201 1221
1227 1247
1228 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1229 1249
1230 $child->draw; 1250 $child->draw;
1231 1251
1232 if ($self->{title}) { 1252 if ($self->{title_widget}) {
1233 glTranslate 0, $border - $self->{h}; 1253 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw; 1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1235 } 1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1236} 1261}
1237 1262
1238############################################################################# 1263#############################################################################
1239 1264
1240package CFClient::UI::Table; 1265package CFClient::UI::Table;
1263 1288
1264 $child->set_parent ($self); 1289 $child->set_parent ($self);
1265 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1266 1291
1267 $self->realloc; 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1268} 1299}
1269 1300
1270# TODO: move to container class maybe? send children a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1271sub clear { 1302sub clear {
1272 my ($self) = @_; 1303 my ($self) = @_;
1313 (sum @$ws), 1344 (sum @$ws),
1314 (sum @$hs), 1345 (sum @$hs),
1315 ) 1346 )
1316} 1347}
1317 1348
1318sub size_allocate { 1349sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1320 1351
1321 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1322 1353
1323 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
1355 } 1386 }
1356 1387
1357 $y += $row_h; 1388 $y += $row_h;
1358 } 1389 }
1359 1390
1391 1
1360} 1392}
1361 1393
1362sub find_widget { 1394sub find_widget {
1363 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1364 1396
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 ) 1435 )
1404} 1436}
1405 1437
1406sub size_allocate { 1438sub invoke_size_allocate {
1407 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1408 1440
1409 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1410 my $children = $self->{children}; 1442 my $children = $self->{children};
1411 1443
1533 1565
1534 delete $self->{texture}; 1566 delete $self->{texture};
1535 $self->SUPER::update; 1567 $self->SUPER::update;
1536} 1568}
1537 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1538sub set_text { 1577sub set_text {
1539 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1540 1579
1541 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1543 1582
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1546 1585
1586 delete $self->{size_req};
1547 $self->realloc; 1587 $self->realloc;
1548 $self->update; 1588 $self->update;
1549} 1589}
1550 1590
1551sub set_markup { 1591sub set_markup {
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1598
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1560 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1561 1601
1602 delete $self->{size_req};
1562 $self->realloc; 1603 $self->realloc;
1563 $self->update; 1604 $self->update;
1564} 1605}
1565 1606
1566sub size_request { 1607sub size_request {
1567 my ($self) = @_; 1608 my ($self) = @_;
1568 1609
1610 $self->{size_req} ||= do {
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1616
1575 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1576 1618
1577 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1578 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1622
1581 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1582 1624
1583 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1585 } 1630 };
1586 1631
1587 ($w, $h) 1632 @{ $self->{size_req} }
1588} 1633}
1589 1634
1590sub size_allocate { 1635sub invoke_size_allocate {
1591 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1592 1637
1593 delete $self->{ox}; 1638 delete $self->{ox};
1594 1639
1595 delete $self->{texture} 1640 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1597} 1644}
1598 1645
1599sub set_fontsize { 1646sub set_fontsize {
1600 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1601 1648
1602 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1603 delete $self->{texture}; 1650 delete $self->{texture};
1604 1651
1605 $self->realloc; 1652 $self->realloc;
1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1606} 1661}
1607 1662
1608sub _draw { 1663sub _draw {
1609 my ($self) = @_; 1664 my ($self) = @_;
1610 1665
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1632 }; 1687 };
1633 1688
1634 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1636 1693
1637 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1638 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1640 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1642 } 1701 }
1643 1702
1644 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1645} 1704}
1646 1705
1663 can_hover => 1, 1722 can_hover => 1,
1664 can_focus => 1, 1723 can_focus => 1,
1665 valign => 0, 1724 valign => 0,
1666 can_events => 1, 1725 can_events => 1,
1667 #text => ... 1726 #text => ...
1727 #hidden => "*",
1668 @_ 1728 @_
1669 ) 1729 )
1670} 1730}
1671 1731
1672sub _set_text { 1732sub _set_text {
1674 1734
1675 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1676 1736
1677 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1678 1738
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1740 $self->{text} = $text;
1683 1741
1684 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1686 1745
1687 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1688} 1750}
1689 1751
1690sub set_text { 1752sub set_text {
1691 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1692 1754
1693 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1756 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1757}
1698 1758
1699sub get_text { 1759sub get_text {
1700 $_[0]{text} 1760 $_[0]{text}
1701} 1761}
1706 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1707 1767
1708 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1709} 1769}
1710 1770
1711sub key_down { 1771sub invoke_key_down {
1712 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1713 1773
1714 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1793 $self->emit ('escape');
1734 } elsif ($uni) { 1794 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1796 } else {
1737 return 0; 1797 return 0;
1738 } 1798 }
1742 $self->realloc; 1802 $self->realloc;
1743 1803
1744 1 1804 1
1745} 1805}
1746 1806
1747sub focus_in { 1807sub invoke_focus_in {
1748 my ($self) = @_; 1808 my ($self) = @_;
1749 1809
1750 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1751 1811
1752 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1753} 1813}
1754 1814
1755sub button_down { 1815sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1757 1817
1758 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1819
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1821
1762 # byte-index to char-index 1822 # byte-index to char-index
1763 my $text = $self->{text}; 1823 my $text = $self->{text};
1768 $self->update; 1828 $self->update;
1769 1829
1770 1 1830 1
1771} 1831}
1772 1832
1773sub mouse_motion { 1833sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776 1836
1777 0 1837 1
1778} 1838}
1779 1839
1780sub _draw { 1840sub _draw {
1781 my ($self) = @_; 1841 my ($self) = @_;
1782 1842
1783 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1784 1844
1785 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1788 } else { 1848 } else {
1789 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1790 } 1850 }
1791 1851
1792 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1795 glVertex 0 , 0; 1855 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
1823 1883
1824our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1825 1885
1826use CFClient::OpenGL; 1886use CFClient::OpenGL;
1827 1887
1828sub key_down { 1888sub invoke_key_down {
1829 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1830 1890
1831 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1832 1892
1833 if ($sym == 13) { 1893 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1836 $self->{history_pointer} = -1; 1896 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1897 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1898 $self->emit (activate => $txt);
1839 $self->update; 1899 $self->update;
1840 1900
1841 } elsif ($sym == CFClient::SDLK_UP) { 1901 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1902 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1903 $self->{history_saveback} = $self->get_text;
1859 } else { 1919 } else {
1860 $self->set_text ($self->{history_saveback}); 1920 $self->set_text ($self->{history_saveback});
1861 } 1921 }
1862 1922
1863 } else { 1923 } else {
1864 return $self->SUPER::key_down ($ev) 1924 return $self->SUPER::invoke_key_down ($ev)
1865 } 1925 }
1866 1926
1867 1 1927 1
1868} 1928}
1869 1929
1893 can_events => 1, 1953 can_events => 1,
1894 @_ 1954 @_
1895 ) 1955 )
1896} 1956}
1897 1957
1898sub activate { }
1899
1900sub button_up { 1958sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 1959 my ($self, $ev, $x, $y) = @_;
1902 1960
1903 $self->emit ("activate") 1961 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 1962 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 1963 && $y >= 0 && $y < $self->{h};
1908} 1966}
1909 1967
1910sub _draw { 1968sub _draw {
1911 my ($self) = @_; 1969 my ($self) = @_;
1912 1970
1913 local $self->{fg} = $self->{fg}; 1971 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 1972
1919 glEnable GL_TEXTURE_2D; 1973 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1974 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 1975 glColor 0, 0, 0, 1;
1922 1976
1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1977 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1924 1978
1925 glDisable GL_TEXTURE_2D; 1979 glDisable GL_TEXTURE_2D;
1926 1980
1927 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1982}
1983
1984#############################################################################
1985
1986package CFClient::UI::ImageButton;
1987
1988our @ISA = CFClient::UI::Image::;
1989
1990use CFClient::OpenGL;
1991
1992my %textures;
1993
1994sub new {
1995 my $class = shift;
1996
1997 my $self = $class->SUPER::new (
1998 padding_x => 4,
1999 padding_y => 4,
2000 fg => [1, 1, 1],
2001 active_fg => [0, 0, 1],
2002 can_hover => 1,
2003 align => 0,
2004 valign => 0,
2005 can_events => 1,
2006 @_
2007 );
2008}
2009
2010sub invoke_button_up {
2011 my ($self, $ev, $x, $y) = @_;
2012
2013 $self->emit ("activate")
2014 if $x >= 0 && $x < $self->{w}
2015 && $y >= 0 && $y < $self->{h};
2016
2017 1
1928} 2018}
1929 2019
1930############################################################################# 2020#############################################################################
1931 2021
1932package CFClient::UI::CheckBox; 2022package CFClient::UI::CheckBox;
1959 my ($self) = @_; 2049 my ($self) = @_;
1960 2050
1961 (6) x 2 2051 (6) x 2
1962} 2052}
1963 2053
1964sub button_down { 2054sub invoke_button_down {
1965 my ($self, $ev, $x, $y) = @_; 2055 my ($self, $ev, $x, $y) = @_;
1966 2056
1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1969 $self->{state} = !$self->{state}; 2059 $self->{state} = !$self->{state};
1970 $self->_emit (changed => $self->{state}); 2060 $self->emit (changed => $self->{state});
1971 } else { 2061 } else {
1972 return 0 2062 return 0
1973 } 2063 }
1974 2064
1975 1 2065 1
2147 2237
2148 my $h1 = $self->{h} * (1 - $ycut1); 2238 my $h1 = $self->{h} * (1 - $ycut1);
2149 my $h2 = $self->{h} * (1 - $ycut2); 2239 my $h2 = $self->{h} * (1 - $ycut2);
2150 2240
2151 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2242 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153 glEnable GL_TEXTURE_2D; 2244 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2246
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2247 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2248 glBegin GL_QUADS;
2271 $self->update; 2362 $self->update;
2272 2363
2273 $self 2364 $self
2274} 2365}
2275 2366
2276sub changed { }
2277
2278sub set_range { 2367sub set_range {
2279 my ($self, $range) = @_; 2368 my ($self, $range) = @_;
2280 2369
2281 ($range, $self->{range}) = ($self->{range}, $range); 2370 ($range, $self->{range}) = ($self->{range}, $range);
2282 2371
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 2372 if ("@$range" ne "@{$self->{range}}") {
2373 $self->update;
2374 $self->set_value ($self->{range}[0]);
2375 }
2285} 2376}
2286 2377
2287sub set_value { 2378sub set_value {
2288 my ($self, $value) = @_; 2379 my ($self, $value) = @_;
2289 2380
2300 if $unit; 2391 if $unit;
2301 2392
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2393 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303 2394
2304 if ($value != $old_value) { 2395 if ($value != $old_value) {
2305 $self->_emit (changed => $value); 2396 $self->emit (changed => $value);
2306 $self->update; 2397 $self->update;
2307 } 2398 }
2308} 2399}
2309 2400
2310sub size_request { 2401sub size_request {
2311 my ($self) = @_; 2402 my ($self) = @_;
2312 2403
2313 ($self->{req_w}, $self->{req_h}) 2404 ($self->{req_w}, $self->{req_h})
2314} 2405}
2315 2406
2316sub button_down { 2407sub invoke_button_down {
2317 my ($self, $ev, $x, $y) = @_; 2408 my ($self, $ev, $x, $y) = @_;
2318 2409
2319 $self->SUPER::button_down ($ev, $x, $y); 2410 $self->SUPER::invoke_button_down ($ev, $x, $y);
2320 2411
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322 2413
2323 $self->mouse_motion ($ev, $x, $y) 2414 $self->mouse_motion ($ev, $x, $y)
2324} 2415}
2325 2416
2326sub mouse_motion { 2417sub invoke_mouse_motion {
2327 my ($self, $ev, $x, $y) = @_; 2418 my ($self, $ev, $x, $y) = @_;
2328 2419
2329 if ($GRAB == $self) { 2420 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2421 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331 2422
2342} 2433}
2343 2434
2344sub update { 2435sub update {
2345 my ($self) = @_; 2436 my ($self) = @_;
2346 2437
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2438 delete $self->{knob_w};
2439 $self->SUPER::update;
2440}
2441
2442sub _draw {
2443 my ($self) = @_;
2444
2445 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 2446 $self->set_value ($self->{range}[0]);
2349 2447
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2448 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2449 my $range = ($hi - $page - $lo) || 1e-100;
2352 2450
2358 $value = ($value - $lo) / $range; 2456 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2457 $value = $value * $self->{scale} + $self->{offset};
2360 2458
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2459 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2460 $self->{knob_w} = $knob_w;
2363 }); 2461 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2462
2371 $self->SUPER::_draw (); 2463 $self->SUPER::_draw ();
2372 2464
2373 glScale $self->{w}, $self->{h}; 2465 glScale $self->{w}, $self->{h};
2374 2466
2435sub set_range { shift->{slider}->set_range (@_) } 2527sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2528sub set_value { shift->{slider}->set_value (@_) }
2437 2529
2438############################################################################# 2530#############################################################################
2439 2531
2440package CFClient::UI::TextView; 2532package CFClient::UI::TextScroller;
2441 2533
2442our @ISA = CFClient::UI::HBox::; 2534our @ISA = CFClient::UI::HBox::;
2443 2535
2444use CFClient::OpenGL; 2536use CFClient::OpenGL;
2445 2537
2447 my $class = shift; 2539 my $class = shift;
2448 2540
2449 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2450 fontsize => 1, 2542 fontsize => 1,
2451 can_events => 0, 2543 can_events => 0,
2544 indent => 0,
2452 #font => default_font 2545 #font => default_font
2453 @_, 2546 @_,
2454 2547
2455 layout => (new CFClient::Layout 1), 2548 layout => (new CFClient::Layout 1),
2456 par => [], 2549 par => [],
2471 2564
2472 $self->{fontsize} = $fontsize; 2565 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2566 $self->reflow;
2474} 2567}
2475 2568
2476sub size_allocate { 2569sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2570 my ($self, $w, $h) = @_;
2478
2479 $self->SUPER::size_allocate ($w, $h);
2480 2571
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2572 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2574 $self->{layout}->set_width ($self->{children}[0]{w});
2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2576
2485 $self->reflow; 2577 $self->reflow;
2578
2579 $self->SUPER::invoke_size_allocate ($w, $h)
2486} 2580}
2487 2581
2488sub text_size { 2582sub text_size {
2489 my ($self, $text, $indent) = @_; 2583 my ($self, $text, $indent) = @_;
2490 2584
2491 my $layout = $self->{layout}; 2585 my $layout = $self->{layout};
2492 2586
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2588 $layout->set_width ($self->{children}[0]{w} - $indent);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2590 $layout->set_markup ($text);
2496 2591
2497 $layout->size 2592 $layout->size
2498} 2593}
2499 2594
2538 2633
2539 return unless $self->{h} > 0; 2634 return unless $self->{h} > 0;
2540 2635
2541 delete $self->{texture}; 2636 delete $self->{texture};
2542 2637
2543 $ROOT->on_post_alloc ($self, sub { 2638 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2640
2546 if (delete $self->{need_reflow}) { 2641 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2642 my $height = 0;
2548 2643
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552 2647
2553 for (@{$self->{par}}) { 2648 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]); 2650 $layout->set_width ($W - $_->[3]);
2651 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2556 $layout->set_markup ($_->[4]); 2652 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2653 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2654 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h; 2655 $_->[1] = $h;
2560 } 2656 }
2563 } 2659 }
2564 2660
2565 $self->{height} = $height; 2661 $self->{height} = $height;
2566 2662
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2568 2664
2569 delete $self->{texture}; 2665 delete $self->{texture};
2570 } 2666 }
2571 2667
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 2669 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2670 glClear GL_COLOR_BUFFER_BIT;
2575 2671
2576 my $top = int $self->{children}[1]{range}[0]; 2672 my $top = int $self->{children}[1]{range}[0];
2577 2673
2578 my $y0 = $top; 2674 my $y0 = $top;
2592 my $h = $par->[1]; 2688 my $h = $par->[1];
2593 2689
2594 if ($y0 < $y + $h && $y < $y1) { 2690 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 2691 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]); 2692 $layout->set_width ($W - $par->[3]);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($par->[4]); 2694 $layout->set_markup ($par->[4]);
2598 2695
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2696 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2600 2697
2601 glRasterPos $par->[3], $y - $y0; 2698 glRasterPos $par->[3], $y - $y0;
2613sub _draw { 2710sub _draw {
2614 my ($self) = @_; 2711 my ($self) = @_;
2615 2712
2616 glEnable GL_TEXTURE_2D; 2713 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 2715 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2716 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2621 2718
2622 $self->{children}[1]->draw; 2719 $self->{children}[1]->draw;
2623 2720
2624} 2721}
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2812 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2813 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2814 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2815 . "visible $widget->{visible}";
2719 } 2816 }
2817
2818 $tooltip =~ s/^\n+//;
2819 $tooltip =~ s/\n+$//;
2720 2820
2721 $self->add (new CFClient::UI::Label 2821 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2822 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2823 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2824 fontsize => 0.8,
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2834 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2835
2736 ($w + 4, $h + 4) 2836 ($w + 4, $h + 4)
2737} 2837}
2738 2838
2739sub size_allocate { 2839sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 2840 my ($self, $w, $h) = @_;
2741 2841
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 2842 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 2843}
2744 2844
2745sub visibility_change { 2845sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 2846 my ($self, $visible) = @_;
2747 2847
2748 return unless $visible; 2848 return unless $visible;
2749 2849
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 2850 $self->{root}->on_post_alloc ("move_$self" => sub {
2752 or return; 2852 or return;
2753 2853
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2854 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2855
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2856 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2857 if $x + $self->{w} > $self->{root}{w};
2758 2858
2759 $self->move_abs ($x, $y); 2859 $self->move_abs ($x, $y);
2760 }); 2860 });
2761} 2861}
2762 2862
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2951 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852 2952
2853 if ($tex) { 2953 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 2954 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 2956 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2957 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 2958 glDisable GL_TEXTURE_2D;
2859 } 2959 }
2860} 2960}
2861 2961
2862sub DESTROY { 2962sub destroy {
2863 my ($self) = @_; 2963 my ($self) = @_;
2864 2964
2865 $self->{timer}->cancel 2965 $self->{timer}->cancel
2866 if $self->{timer}; 2966 if $self->{timer};
2867 2967
2868 $self->SUPER::DESTROY; 2968 $self->SUPER::destroy;
2869} 2969}
2870 2970
2871############################################################################# 2971#############################################################################
2872 2972
2873package CFClient::UI::Buttonbar; 2973package CFClient::UI::Buttonbar;
2894 ); 2994 );
2895 2995
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2996 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 2997
2898 for my $item (@{ $self->{items} }) { 2998 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 2999 my ($widget, $cb, $tooltip) = @$item;
2900 3000
2901 # handle various types of items, only text for now 3001 # handle various types of items, only text for now
2902 if (!ref $widget) { 3002 if (!ref $widget) {
2903 $widget = new CFClient::UI::Label 3003 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3004 can_hover => 1,
2905 can_events => 1, 3005 can_events => 1,
2906 text => $widget; 3006 markup => $widget,
3007 tooltip => $tooltip
2907 } 3008 }
2908 3009
2909 $self->{item}{$widget} = $item; 3010 $self->{item}{$widget} = $item;
2910 3011
2911 $self->{vbox}->add ($widget); 3012 $self->{vbox}->add ($widget);
2916 3017
2917# popup given the event (must be a mouse button down event currently) 3018# popup given the event (must be a mouse button down event currently)
2918sub popup { 3019sub popup {
2919 my ($self, $ev) = @_; 3020 my ($self, $ev) = @_;
2920 3021
2921 $self->_emit ("popdown"); 3022 $self->emit ("popdown");
2922 3023
2923 # maybe save $GRAB? must be careful about events... 3024 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3025 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3026 $self->{button} = $ev->{button};
2926 3027
2927 $self->show; 3028 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3029 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3030}
2930 3031
2931sub mouse_motion { 3032sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3033 my ($self, $ev, $x, $y) = @_;
2933 3034
2934 # TODO: should use vbox->find_widget or so 3035 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3036 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3037 $self->{hover} = $self->{item}{$HOVER};
2937 3038
2938 0 3039 0
2939} 3040}
2940 3041
2941sub button_up { 3042sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3043 my ($self, $ev, $x, $y) = @_;
2943 3044
2944 if ($ev->{button} == $self->{button}) { 3045 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3046 undef $GRAB;
2946 $self->hide; 3047 $self->hide;
2947 3048
2948 $self->_emit ("popdown"); 3049 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3050 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3051 } else {
2951 return 0 3052 return 0
2952 } 3053 }
2953 3054
2990 : $self->{children}[$page_or_widget]; 3091 : $self->{children}[$page_or_widget];
2991 3092
2992 $self->{current} = $widget; 3093 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3094 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3095
2995 $self->_emit (page_changed => $self->{current}); 3096 $self->emit (page_changed => $self->{current});
2996 3097
2997 $self->realloc; 3098 $self->realloc;
2998} 3099}
2999 3100
3000sub visible_children { 3101sub visible_children {
3005 my ($self) = @_; 3106 my ($self) = @_;
3006 3107
3007 $self->{current}->size_request 3108 $self->{current}->size_request
3008} 3109}
3009 3110
3010sub size_allocate { 3111sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3112 my ($self, $w, $h) = @_;
3012 3113
3013 $self->{current}->configure (0, 0, $w, $h); 3114 $self->{current}->configure (0, 0, $w, $h);
3115
3116 1
3014} 3117}
3015 3118
3016sub _draw { 3119sub _draw {
3017 my ($self) = @_; 3120 my ($self) = @_;
3018 3121
3057 3160
3058sub set_current_page { 3161sub set_current_page {
3059 my ($self, $page) = @_; 3162 my ($self, $page) = @_;
3060 3163
3061 $self->{multiplexer}->set_current_page ($page); 3164 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3165 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3166}
3064 3167
3065############################################################################# 3168#############################################################################
3066 3169
3067package CFClient::UI::Statusbox; 3170package CFClient::UI::Combobox;
3068 3171
3172use utf8;
3173
3069our @ISA = CFClient::UI::VBox::; 3174our @ISA = CFClient::UI::Button::;
3070 3175
3071sub new { 3176sub new {
3072 my $class = shift; 3177 my $class = shift;
3073 3178
3074 $class->SUPER::new ( 3179 my $self = $class->SUPER::new (
3180 options => [], # [value, title, longdesc], ...
3181 value => undef,
3182 @_,
3183 );
3184
3185 $self->_set_value ($self->{value});
3186
3187 $self
3188}
3189
3190sub invoke_button_down {
3191 my ($self, $ev) = @_;
3192
3193 my @menu_items;
3194
3195 for (@{ $self->{options} }) {
3196 my ($value, $title, $tooltip) = @$_;
3197
3198 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199 }
3200
3201 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202}
3203
3204sub _set_value {
3205 my ($self, $value) = @_;
3206
3207 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3208 or return;
3209
3210 $self->{value} = $item->[0];
3211 $self->set_markup ("$item->[1] ⇓");
3212 $self->set_tooltip ($item->[2]);
3213}
3214
3215sub set_value {
3216 my ($self, $value) = @_;
3217
3218 return unless $self->{value} ne $value;
3219
3220 $self->_set_value ($value);
3221 $self->emit (changed => $value);
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::Statusbox;
3227
3228our @ISA = CFClient::UI::VBox::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3234 fontsize => 0.8,
3076 @_, 3235 @_,
3077 ) 3236 );
3237
3238 Scalar::Util::weaken (my $this = $self);
3239
3240 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241
3242 $self
3078} 3243}
3079 3244
3080sub reorder { 3245sub reorder {
3081 my ($self) = @_; 3246 my ($self) = @_;
3082 my $NOW = time; 3247 my $NOW = Time::HiRes::time;
3248
3249 # freeze display when hovering over any label
3250 return if $CFClient::UI::TOOLTIP->{owner}
3251 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3252 values %{ $self->{item} };
3083 3253
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3254 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3255 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3256 }
3087 3257
3090 my @items = sort { 3260 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3261 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3262 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3263 } values %{ $self->{item} };
3094 3264
3265 $self->{timer}->interval (1);
3266
3095 my $count = 10 + 1; 3267 my $count = 10 + 1;
3096 for my $item (@items) { 3268 for my $item (@items) {
3097 last unless --$count; 3269 last unless --$count;
3098 3270
3099 push @widgets, $item->{label} ||= do { 3271 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3272 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3273 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3274 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3275 : $item->{text};
3104 3276
3112 tooltip => $item->{tooltip}, 3284 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3285 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3286 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3287 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3288 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3289 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3290 can_events => 1,
3119 can_hover => 1 3291 can_hover => 1
3120 }; 3292 };
3293
3294 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3295 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3296 $label->update;
3297 $label->set_max_size (undef, $label->{req_h} * $diff)
3298 if $diff < 1;
3299 $self->{timer}->interval (1/30);
3300 } else {
3301 $label->{fg}[3] = $item->{fg}[3] || 1;
3302 }
3303
3304 push @widgets, $label;
3121 } 3305 }
3122 3306
3123 $self->clear; 3307 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3308 $self->SUPER::add (reverse @widgets);
3125} 3309}
3130 $text =~ s/^\s+//; 3314 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3315 $text =~ s/\s+$//;
3132 3316
3133 return unless $text; 3317 return unless $text;
3134 3318
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3319 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3320
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3321 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3322
3139 if (my $item = $self->{item}{$group}) { 3323 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3324 if ($item->{text} eq $text) {
3141 $item->{count}++; 3325 $item->{count}++;
3142 } else { 3326 } else {
3143 $item->{count} = 1; 3327 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text; 3328 $item->{text} = $item->{tooltip} = $text;
3145 } 3329 }
3146 $item->{id} = ++$self->{id}; 3330 $item->{id} += 0.2;#d#
3147 $item->{timeout} = $timeout; 3331 $item->{timeout} = $timeout;
3148 delete $item->{label}; 3332 delete $item->{label};
3149 } else { 3333 } else {
3150 $self->{item}{$group} = { 3334 $self->{item}{$group} = {
3151 id => ++$self->{id}, 3335 id => ++$self->{id},
3170 3354
3171 $self->reorder; 3355 $self->reorder;
3172 $self->SUPER::reconfigure; 3356 $self->SUPER::reconfigure;
3173} 3357}
3174 3358
3359sub destroy {
3360 my ($self) = @_;
3361
3362 $self->{timer}->cancel;
3363
3364 $self->SUPER::destroy;
3365}
3366
3175############################################################################# 3367#############################################################################
3176 3368
3177package CFClient::UI::Inventory; 3369package CFClient::UI::Inventory;
3178 3370
3179our @ISA = CFClient::UI::ScrolledWindow::; 3371our @ISA = CFClient::UI::ScrolledWindow::;
3321 my ($self) = @_; 3513 my ($self) = @_;
3322 $self->ask_for_bind (1); 3514 $self->ask_for_bind (1);
3323} 3515}
3324 3516
3325sub ask_for_bind { 3517sub ask_for_bind {
3326 my ($self, $commit) = @_; 3518 my ($self, $commit, $end_cb) = @_;
3327 3519
3328 CFClient::Binder::open_binding_dialog (sub { 3520 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_; 3521 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3522 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets; 3523 $self->update_binding_widgets;
3332 $self->commit if $commit; 3524 $self->commit if $commit;
3525 $end_cb->() if $end_cb;
3333 }); 3526 });
3334} 3527}
3335 3528
3336# $mod and $sym are the modifiers and key symbol 3529# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands) 3530# $cmds is a array ref of strings (the commands)
3355} 3548}
3356 3549
3357# this is a shortcut method that asks for a binding 3550# this is a shortcut method that asks for a binding
3358# and then just binds it. 3551# and then just binds it.
3359sub do_quick_binding { 3552sub do_quick_binding {
3360 my ($self, $cmds) = @_; 3553 my ($self, $cmds, $end_cb) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub { 3554 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3555 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 }); 3556 });
3364 $self->ask_for_bind (1); 3557 $self->ask_for_bind (1, $end_cb);
3365} 3558}
3366 3559
3367sub update_binding_widgets { 3560sub update_binding_widgets {
3368 my ($self) = @_; 3561 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding; 3562 my ($mod, $sym, $cmds) = $self->get_binding;
3425 commands => [], 3618 commands => [],
3426 @_, 3619 @_,
3427 ) 3620 )
3428} 3621}
3429 3622
3430# XXX: Do sorting? Argl... 3623my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3624
3625my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3626 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3627my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3629my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3633my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3635
3636sub rebuild_spell_list {
3637 my ($self) = @_;
3638
3639 $CFClient::UI::ROOT->on_refresh ($self => sub {
3640 $self->clear;
3641
3642 return unless $::CONN;
3643
3644 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649
3650 my $row = 0;
3651
3652 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653 my $spell = $self->{spell}{$_};
3654
3655 $row++;
3656
3657 my $spell_cb = sub {
3658 my ($widget, $ev) = @_;
3659
3660 if ($ev->{button} == 1) {
3661 $::CONN->user_send ("cast $spell->{name}");
3662 } elsif ($ev->{button} == 2) {
3663 $::CONN->user_send ("invoke $spell->{name}");
3664 } elsif ($ev->{button} == 3) {
3665 (new CFClient::UI::Menu
3666 items => [
3667 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669 ],
3670 )->popup ($ev);
3671 } else {
3672 return 0;
3673 }
3674
3675 1
3676 };
3677
3678 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679
3680 #TODO: add path info to tooltip
3681 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3682
3683 $self->add (0, $row, new CFClient::UI::Face
3684 face => $spell->{face},
3685 can_hover => 1,
3686 can_events => 1,
3687 tooltip => $tooltip,
3688 on_button_down => $spell_cb,
3689 );
3690
3691 $self->add (1, $row, new CFClient::UI::Label
3692 expand => 1,
3693 text => $spell->{name},
3694 can_hover => 1,
3695 can_events => 1,
3696 tooltip => $tooltip,
3697 on_button_down => $spell_cb,
3698 );
3699
3700 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704 }
3705 });
3706}
3707
3431sub add_spell { 3708sub add_spell {
3432 my ($self, $spell) = @_; 3709 my ($self, $spell) = @_;
3710
3433 $self->{spells}->{$spell->{name}} = $spell; 3711 $self->{spell}->{$spell->{name}} = $spell;
3434 3712 $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} 3713}
3463 3714
3464sub remove_spell { 3715sub remove_spell {
3465 my ($self, $spell) = @_; 3716 my ($self, $spell) = @_;
3717
3466 delete $self->{spells}->{$spell->{name}}; 3718 delete $self->{spell}->{$spell->{name}};
3467 $self->rebuild_spell_list; 3719 $self->rebuild_spell_list;
3468} 3720}
3469 3721
3722sub clear_spells {
3723 my ($self) = @_;
3724
3725 $self->{spell} = {};
3726 $self->rebuild_spell_list;
3727}
3728
3470############################################################################# 3729#############################################################################
3471 3730
3472package CFClient::UI::Root; 3731package CFClient::UI::Root;
3473 3732
3474our @ISA = CFClient::UI::Container::; 3733our @ISA = CFClient::UI::Container::;
3734
3735use List::Util qw(min max);
3475 3736
3476use CFClient::OpenGL; 3737use CFClient::OpenGL;
3477 3738
3478sub new { 3739sub new {
3479 my $class = shift; 3740 my $class = shift;
3506 $coord = $max - $size if $coord > $max - $size; 3767 $coord = $max - $size if $coord > $max - $size;
3507 3768
3508 int $coord + 0.5 3769 int $coord + 0.5
3509} 3770}
3510 3771
3511sub size_allocate { 3772sub invoke_size_allocate {
3512 my ($self, $w, $h) = @_; 3773 my ($self, $w, $h) = @_;
3513 3774
3514 for my $child ($self->children) { 3775 for my $child ($self->children) {
3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3776 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3516 3777
3520 $X = _to_pixel $X, $W, $self->{w}; 3781 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h}; 3782 $Y = _to_pixel $Y, $H, $self->{h};
3522 3783
3523 $child->configure ($X, $Y, $W, $H); 3784 $child->configure ($X, $Y, $W, $H);
3524 } 3785 }
3786
3787 1
3525} 3788}
3526 3789
3527sub coord2local { 3790sub coord2local {
3528 my ($self, $x, $y) = @_; 3791 my ($self, $x, $y) = @_;
3529 3792
3614 3877
3615 delete $queue{$widget+0}; 3878 delete $queue{$widget+0};
3616 3879
3617 my ($w, $h) = $widget->size_request; 3880 my ($w, $h) = $widget->size_request;
3618 3881
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3882 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3883 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621 3887
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 3888 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 3889 $h = $widget->{force_h} if exists $widget->{force_h};
3624 3890
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3891 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines