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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines