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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines