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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28: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 #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#############################################################################
796
797# back-buffered drawing area
798 798
799package CFClient::UI::Window; 799package CFClient::UI::Window;
800 800
801our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
802 802
… …
813 813
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 815 $self->SUPER::update;
816} 816}
817 817
818sub size_allocate { 818sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
820 820
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
823} 824}
824 825
825sub _render { 826sub _render {
826 my ($self) = @_; 827 my ($self) = @_;
827 828
… …
854 my $tex = $self->{texture} 855 my $tex = $self->{texture}
855 or return; 856 or return;
856 857
857 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
860 861
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 863
863 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
864} 865}
… …
888 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
889 890
890 ($w, $h) 891 ($w, $h)
891} 892}
892 893
893sub size_allocate { 894sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
895 896
896 my $child = $self->child; 897 my $child = $self->child;
897 898
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 901
901 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
902 $self->update; 903 $self->update;
904
905 1
903} 906}
904 907
905sub set_offset { 908sub set_offset {
906 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
907 910
… …
997 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
998 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
999 $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]);
1000} 1003}
1001 1004
1002sub size_allocate { 1005sub invoke_size_allocate {
1003 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
1004
1005 $self->SUPER::size_allocate ($w, $h);
1006 1007
1007 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
1008 $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)
1009} 1012}
1010 1013
1011#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll 1015# update viewport offset on scroll
1013 1016
… …
1033 1036
1034 if ($self->{bg}) { 1037 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
1036 1039
1037 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
1040 1043
1041 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1042 glVertex 0 , 0; 1045 glVertex 0 , 0;
1043 glVertex 0 , $h; 1046 glVertex 0 , $h;
1044 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1069 1072
1070sub new { 1073sub new {
1071 my ($class, %arg) = @_; 1074 my ($class, %arg) = @_;
1072
1073 my $title = delete $arg{title};
1074 1075
1075 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1079 border => 0.6,
… …
1080 min_w => 16, 1081 min_w => 16,
1081 min_h => 16, 1082 min_h => 16,
1082 %arg, 1083 %arg,
1083 ); 1084 );
1084 1085
1085 $self->{title} = new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1086 align => 0, 1087 align => 0,
1087 valign => 1, 1088 valign => 1,
1088 text => $title, 1089 text => $self->{title},
1089 fontsize => $self->{border} 1090 fontsize => $self->{border},
1090 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 path => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1091 1101
1092 $self 1102 $self
1093} 1103}
1094 1104
1095sub add { 1105sub add {
1096 my ($self, @widgets) = @_; 1106 my ($self, @widgets) = @_;
1097 1107
1098 $self->SUPER::add (@widgets); 1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1100} 1111}
1101 1112
1102sub border { 1113sub border {
1103 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1104} 1115}
1105 1116
1106sub size_request { 1117sub size_request {
1107 my ($self) = @_; 1118 my ($self) = @_;
1108 1119
1109 $self->{title}->size_request 1120 $self->{title_widget}->size_request
1110 if $self->{title}; 1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1111 1125
1112 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1113 1127
1114 ( 1128 (
1115 $w + $self->border * 2, 1129 $w + $self->border * 2,
1116 $h + $self->border * 2, 1130 $h + $self->border * 2,
1117 ) 1131 )
1118} 1132}
1119 1133
1120sub size_allocate { 1134sub invoke_size_allocate {
1121 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1122 1136
1123 if ($self->{title}) { 1137 if ($self->{title_widget}) {
1124 $self->{title}{w} = $w; 1138 $self->{title_widget}{w} = $w;
1125 $self->{title}{h} = $h; 1139 $self->{title_widget}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h); 1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1127 } 1141 }
1128 1142
1129 my $border = $self->border; 1143 my $border = $self->border;
1130 1144
1131 $h -= List::Util::max 0, $border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1132 $w -= List::Util::max 0, $border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1133 1147
1134 $self->child->configure ($border, $border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1135}
1136 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1137sub button_down { 1156sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1139 1158
1140 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1141 my $border = $self->border; 1160 my $border = $self->border;
1142 1161
… …
1158 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1159 1178
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1183 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1184 };
1166 1185
1167 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1173 1192
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1194
1176 $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});
1177 }; 1198 };
1178 } else { 1199 } else {
1179 return 0; 1200 return 0;
1180 } 1201 }
1181 1202
1182 1 1203 1
1183} 1204}
1184 1205
1185sub button_up { 1206sub invoke_button_up {
1186 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1187 1208
1188 !!delete $self->{motion} 1209 ! ! delete $self->{motion}
1189} 1210}
1190 1211
1191sub mouse_motion { 1212sub invoke_mouse_motion {
1192 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1193 1214
1194 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195 1216
1196 !!$self->{motion} 1217 ! ! $self->{motion}
1197} 1218}
1198 1219
1199sub _draw { 1220sub _draw {
1200 my ($self) = @_; 1221 my ($self) = @_;
1201 1222
… …
1227 1248
1228 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1229 1250
1230 $child->draw; 1251 $child->draw;
1231 1252
1232 if ($self->{title}) { 1253 if ($self->{title_widget}) {
1233 glTranslate 0, $border - $self->{h}; 1254 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw; 1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1235 } 1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1236} 1262}
1237 1263
1238############################################################################# 1264#############################################################################
1239 1265
1240package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1263 1289
1264 $child->set_parent ($self); 1290 $child->set_parent ($self);
1265 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1266 1292
1267 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1268} 1300}
1269 1301
1270# 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?
1271sub clear { 1303sub clear {
1272 my ($self) = @_; 1304 my ($self) = @_;
… …
1313 (sum @$ws), 1345 (sum @$ws),
1314 (sum @$hs), 1346 (sum @$hs),
1315 ) 1347 )
1316} 1348}
1317 1349
1318sub size_allocate { 1350sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1320 1352
1321 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1322 1354
1323 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1355 } 1387 }
1356 1388
1357 $y += $row_h; 1389 $y += $row_h;
1358 } 1390 }
1359 1391
1392 1
1360} 1393}
1361 1394
1362sub find_widget { 1395sub find_widget {
1363 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1364 1397
… …
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 ) 1436 )
1404} 1437}
1405 1438
1406sub size_allocate { 1439sub invoke_size_allocate {
1407 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1408 1441
1409 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1410 my $children = $self->{children}; 1443 my @children = $self->visible_children;
1411 1444
1412 my @req; 1445 my @req;
1413 1446
1414 if ($self->{homogeneous}) { 1447 if ($self->{homogeneous}) {
1415 @req = ($space / (@$children || 1)) x @$children; 1448 @req = ($space / (@children || 1)) x @children;
1416 } else { 1449 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1418 my $req = List::Util::sum @req; 1451 my $req = List::Util::sum @req;
1419 1452
1420 if ($req > $space) { 1453 if ($req > $space) {
1421 # ah well, not enough space 1454 # ah well, not enough space
1422 $_ *= $space / $req for @req; 1455 $_ *= $space / $req for @req;
1423 } else { 1456 } else {
1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1457 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1425 1458
1426 $space = ($space - $req) / $expand; # remaining space to give away 1459 $space = ($space - $req) / $expand; # remaining space to give away
1427 1460
1428 $req[$_] += $space * $children->[$_]{expand} 1461 $req[$_] += $space * $children[$_]{expand}
1429 for 0 .. $#$children; 1462 for 0 .. $#children;
1430 } 1463 }
1431 } 1464 }
1432 1465
1433 CFClient::UI::harmonize \@req; 1466 CFClient::UI::harmonize \@req;
1434 1467
1435 my $pos = 0; 1468 my $pos = 0;
1436 for (0 .. $#$children) { 1469 for (0 .. $#children) {
1437 my $alloc = $req[$_]; 1470 my $alloc = $req[$_];
1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1439 1472
1440 $pos += $alloc; 1473 $pos += $alloc;
1441 } 1474 }
1442 1475
1443 1 1476 1
… …
1533 1566
1534 delete $self->{texture}; 1567 delete $self->{texture};
1535 $self->SUPER::update; 1568 $self->SUPER::update;
1536} 1569}
1537 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1538sub set_text { 1578sub set_text {
1539 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1540 1580
1541 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1543 1583
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1546 1586
1587 delete $self->{size_req};
1547 $self->realloc; 1588 $self->realloc;
1548 $self->update; 1589 $self->update;
1549} 1590}
1550 1591
1551sub set_markup { 1592sub set_markup {
… …
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1599
1559 $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;
1560 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1561 1602
1603 delete $self->{size_req};
1562 $self->realloc; 1604 $self->realloc;
1563 $self->update; 1605 $self->update;
1564} 1606}
1565 1607
1566sub size_request { 1608sub size_request {
1567 my ($self) = @_; 1609 my ($self) = @_;
1568 1610
1611 $self->{size_req} ||= do {
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1617
1575 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1576 1619
1577 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1578 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1623
1581 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1582 1625
1583 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1585 } 1631 };
1586 1632
1587 ($w, $h) 1633 @{ $self->{size_req} }
1588} 1634}
1589 1635
1590sub size_allocate { 1636sub invoke_size_allocate {
1591 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1592 1638
1593 delete $self->{ox}; 1639 delete $self->{ox};
1594 1640
1595 delete $self->{texture} 1641 delete $self->{texture}
1596 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
1597} 1645}
1598 1646
1599sub set_fontsize { 1647sub set_fontsize {
1600 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1601 1649
1602 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1603 delete $self->{texture}; 1651 delete $self->{texture};
1604 1652
1605 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1606} 1662}
1607 1663
1608sub _draw { 1664sub _draw {
1609 my ($self) = @_; 1665 my ($self) = @_;
1610 1666
… …
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1632 }; 1688 };
1633 1689
1634 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1635 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};
1636 1694
1637 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1638 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1640 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1642 } 1702 }
1643 1703
1644 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1645} 1705}
1646 1706
… …
1663 can_hover => 1, 1723 can_hover => 1,
1664 can_focus => 1, 1724 can_focus => 1,
1665 valign => 0, 1725 valign => 0,
1666 can_events => 1, 1726 can_events => 1,
1667 #text => ... 1727 #text => ...
1728 #hidden => "*",
1668 @_ 1729 @_
1669 ) 1730 )
1670} 1731}
1671 1732
1672sub _set_text { 1733sub _set_text {
… …
1674 1735
1675 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1676 1737
1677 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1678 1739
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1741 $self->{text} = $text;
1683 1742
1684 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1686 1746
1687 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1688} 1751}
1689 1752
1690sub set_text { 1753sub set_text {
1691 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1692 1755
1693 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1757 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1758}
1698 1759
1699sub get_text { 1760sub get_text {
1700 $_[0]{text} 1761 $_[0]{text}
1701} 1762}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1707 1768
1708 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1709} 1770}
1710 1771
1711sub key_down { 1772sub invoke_key_down {
1712 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1713 1774
1714 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1794 $self->emit ('escape');
1734 } elsif ($uni) { 1795 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1797 } else {
1737 return 0; 1798 return 0;
1738 } 1799 }
… …
1742 $self->realloc; 1803 $self->realloc;
1743 1804
1744 1 1805 1
1745} 1806}
1746 1807
1747sub focus_in { 1808sub invoke_focus_in {
1748 my ($self) = @_; 1809 my ($self) = @_;
1749 1810
1750 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1751 1812
1752 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1753} 1814}
1754 1815
1755sub button_down { 1816sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1757 1818
1758 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1820
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1822
1762 # byte-index to char-index 1823 # byte-index to char-index
1763 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1768 $self->update; 1829 $self->update;
1769 1830
1770 1 1831 1
1771} 1832}
1772 1833
1773sub mouse_motion { 1834sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1775# 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#
1776 1837
1777 0 1838 1
1778} 1839}
1779 1840
1780sub _draw { 1841sub _draw {
1781 my ($self) = @_; 1842 my ($self) = @_;
1782 1843
1783 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1784 1845
1785 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1788 } else { 1849 } else {
1789 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1790 } 1851 }
1791 1852
1792 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1795 glVertex 0 , 0; 1856 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1823 1884
1824our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1825 1886
1826use CFClient::OpenGL; 1887use CFClient::OpenGL;
1827 1888
1828sub key_down { 1889sub invoke_key_down {
1829 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1830 1891
1831 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1832 1893
1833 if ($sym == 13) { 1894 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1836 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1839 $self->update; 1901 $self->update;
1840 1902
1841 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1921 } else {
1860 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1861 } 1923 }
1862 1924
1863 } else { 1925 } else {
1864 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1865 } 1927 }
1866 1928
1867 1 1929 1
1868} 1930}
1869 1931
… …
1893 can_events => 1, 1955 can_events => 1,
1894 @_ 1956 @_
1895 ) 1957 )
1896} 1958}
1897 1959
1898sub activate { }
1899
1900sub button_up { 1960sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1902 1962
1903 $self->emit ("activate") 1963 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
1908} 1968}
1909 1969
1910sub _draw { 1970sub _draw {
1911 my ($self) = @_; 1971 my ($self) = @_;
1912 1972
1913 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 1974
1919 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1922 1978
1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1924 1980
1925 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1926 1982
1927 $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
1928} 2020}
1929 2021
1930############################################################################# 2022#############################################################################
1931 2023
1932package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1959 my ($self) = @_; 2051 my ($self) = @_;
1960 2052
1961 (6) x 2 2053 (6) x 2
1962} 2054}
1963 2055
1964sub button_down { 2056sub invoke_button_down {
1965 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1966 2058
1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1969 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1970 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
1971 } else { 2063 } else {
1972 return 0 2064 return 0
1973 } 2065 }
1974 2066
1975 1 2067 1
… …
2000package CFClient::UI::Image; 2092package CFClient::UI::Image;
2001 2093
2002our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
2003 2095
2004use CFClient::OpenGL; 2096use CFClient::OpenGL;
2005use Carp qw/confess/;
2006 2097
2007our %loaded_images; 2098our %texture_cache;
2008 2099
2009sub new { 2100sub new {
2010 my $class = shift; 2101 my $class = shift;
2011 2102
2012 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
2013 2107
2014 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
2015 2110
2016 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
2017 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2018 2113
2019 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
2020 2115
2021 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2022
2023 $self->{aspect} = $tex->{w} / $tex->{h};
2024 2117
2025 $self 2118 $self
2026} 2119}
2027 2120
2028sub size_request { 2121sub size_request {
2029 my ($self) = @_; 2122 my ($self) = @_;
2030 2123
2031 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
2032} 2125}
2033 2126
2034sub _draw { 2127sub _draw {
2035 my ($self) = @_; 2128 my ($self) = @_;
2036 2129
… …
2147 2240
2148 my $h1 = $self->{h} * (1 - $ycut1); 2241 my $h1 = $self->{h} * (1 - $ycut1);
2149 my $h2 = $self->{h} * (1 - $ycut2); 2242 my $h2 = $self->{h} * (1 - $ycut2);
2150 2243
2151 glEnable GL_BLEND; 2244 glEnable GL_BLEND;
2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153 glEnable GL_TEXTURE_2D; 2247 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2248 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2249
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2250 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2251 glBegin GL_QUADS;
… …
2271 $self->update; 2365 $self->update;
2272 2366
2273 $self 2367 $self
2274} 2368}
2275 2369
2276sub changed { }
2277
2278sub set_range { 2370sub set_range {
2279 my ($self, $range) = @_; 2371 my ($self, $range) = @_;
2280 2372
2281 ($range, $self->{range}) = ($self->{range}, $range); 2373 ($range, $self->{range}) = ($self->{range}, $range);
2282 2374
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 2375 if ("@$range" ne "@{$self->{range}}") {
2376 $self->update;
2377 $self->set_value ($self->{range}[0]);
2378 }
2285} 2379}
2286 2380
2287sub set_value { 2381sub set_value {
2288 my ($self, $value) = @_; 2382 my ($self, $value) = @_;
2289 2383
… …
2300 if $unit; 2394 if $unit;
2301 2395
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303 2397
2304 if ($value != $old_value) { 2398 if ($value != $old_value) {
2305 $self->_emit (changed => $value); 2399 $self->emit (changed => $value);
2306 $self->update; 2400 $self->update;
2307 } 2401 }
2308} 2402}
2309 2403
2310sub size_request { 2404sub size_request {
2311 my ($self) = @_; 2405 my ($self) = @_;
2312 2406
2313 ($self->{req_w}, $self->{req_h}) 2407 ($self->{req_w}, $self->{req_h})
2314} 2408}
2315 2409
2316sub button_down { 2410sub invoke_button_down {
2317 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2318 2412
2319 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2320 2414
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322 2416
2323 $self->mouse_motion ($ev, $x, $y) 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2324} 2418}
2325 2419
2326sub mouse_motion { 2420sub invoke_mouse_motion {
2327 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2328 2422
2329 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331 2425
… …
2342} 2436}
2343 2437
2344sub update { 2438sub update {
2345 my ($self) = @_; 2439 my ($self) = @_;
2346 2440
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2441 delete $self->{knob_w};
2442 $self->SUPER::update;
2443}
2444
2445sub _draw {
2446 my ($self) = @_;
2447
2448 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 2449 $self->set_value ($self->{range}[0]);
2349 2450
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2451 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2452 my $range = ($hi - $page - $lo) || 1e-100;
2352 2453
… …
2358 $value = ($value - $lo) / $range; 2459 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2460 $value = $value * $self->{scale} + $self->{offset};
2360 2461
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2462 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2463 $self->{knob_w} = $knob_w;
2363 }); 2464 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2465
2371 $self->SUPER::_draw (); 2466 $self->SUPER::_draw ();
2372 2467
2373 glScale $self->{w}, $self->{h}; 2468 glScale $self->{w}, $self->{h};
2374 2469
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2530sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2531sub set_value { shift->{slider}->set_value (@_) }
2437 2532
2438############################################################################# 2533#############################################################################
2439 2534
2440package CFClient::UI::TextView; 2535package CFClient::UI::TextScroller;
2441 2536
2442our @ISA = CFClient::UI::HBox::; 2537our @ISA = CFClient::UI::HBox::;
2443 2538
2444use CFClient::OpenGL; 2539use CFClient::OpenGL;
2445 2540
… …
2447 my $class = shift; 2542 my $class = shift;
2448 2543
2449 my $self = $class->SUPER::new ( 2544 my $self = $class->SUPER::new (
2450 fontsize => 1, 2545 fontsize => 1,
2451 can_events => 0, 2546 can_events => 0,
2547 indent => 0,
2452 #font => default_font 2548 #font => default_font
2453 @_, 2549 @_,
2454 2550
2455 layout => (new CFClient::Layout 1), 2551 layout => (new CFClient::Layout 1),
2456 par => [], 2552 par => [],
… …
2471 2567
2472 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2569 $self->reflow;
2474} 2570}
2475 2571
2572sub visible_children {
2573 my ($self) = @_;
2574
2575 @{$self->{children}}[0,1]
2576}
2577
2476sub size_allocate { 2578sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2579 my ($self, $w, $h) = @_;
2478 2580
2479 $self->SUPER::size_allocate ($w, $h); 2581 my (undef, undef, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2583
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2586 $self->{layout}->set_width ($self->{children}[0]{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2588
2485 $self->reflow; 2589 $self->reflow;
2486}
2487 2590
2488sub text_size { 2591 $self->SUPER::invoke_size_allocate ($w, $h)
2489 my ($self, $text, $indent) = @_; 2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2490 2596
2491 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2492 2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2603 $layout->set_markup ($para->{markup});
2496 2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2497 $layout->size 2606 $layout
2498} 2607}
2499 2608
2500sub reflow { 2609sub reflow {
2501 my ($self) = @_; 2610 my ($self) = @_;
2502 2611
… …
2511 $self->{children}[1]->set_value ($offset); 2620 $self->{children}[1]->set_value ($offset);
2512} 2621}
2513 2622
2514sub clear { 2623sub clear {
2515 my ($self) = @_; 2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2516 2628
2517 $self->{par} = []; 2629 $self->{par} = [];
2518 $self->{height} = 0; 2630 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2632}
2521 2633
2522sub add_paragraph { 2634sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2524 2636
2525 for my $line (split /\n/, $text) { 2637 my ($text, @w) = ref $para ? @$para : $para;
2526 my ($w, $h) = $self->text_size ($line); 2638
2527 $self->{height} += $h; 2639 $para = {
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2640 w => 1e10,
2641 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2529 } 2646 };
2530 2647
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2648 $self->add (@w) if @w;
2649 push @{$self->{par}}, $para;
2650
2651 $self->{need_reflow}++;
2652 $self->update;
2653}
2654
2655sub scroll_to_bottom {
2656 my ($self) = @_;
2657
2658 $self->{scroll_to_bottom} = 1;
2659 $self->update;
2532} 2660}
2533 2661
2534sub update { 2662sub update {
2535 my ($self) = @_; 2663 my ($self) = @_;
2536 2664
… …
2538 2666
2539 return unless $self->{h} > 0; 2667 return unless $self->{h} > 0;
2540 2668
2541 delete $self->{texture}; 2669 delete $self->{texture};
2542 2670
2543 $ROOT->on_post_alloc ($self, sub { 2671 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2673
2546 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2675 my $height = 0;
2548 2676
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2677 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2679 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2680 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2681
2682 $para->{w} = $w + $para->{indent};
2559 $_->[1] = $h; 2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2560 } 2685 }
2561 2686
2562 $height += $_->[1]; 2687 $height += $para->{h};
2563 } 2688 }
2564 2689
2565 $self->{height} = $height; 2690 $self->{height} = $height;
2566 2691
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2568 2693
2569 delete $self->{texture}; 2694 delete $self->{texture};
2570 } 2695 }
2571 2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2699 }
2700
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 2702 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
2575 2704
2576 my $top = int $self->{children}[1]{range}[0]; 2705 my $top = int $self->{children}[1]{range}[0];
2577 2706
2578 my $y0 = $top; 2707 my $y0 = $top;
2579 my $y1 = $top + $H; 2708 my $y1 = $top + $H;
2580 2709
2581 my $y = 0; 2710 my $y = 0;
2582
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586 2711
2587 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off 2713 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590 2715
2591 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2717 my $h = $para->{h};
2593 2718
2594 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 2720
2596 $layout->set_width ($W - $par->[3]); 2721 my $layout = $self->get_layout ($para);
2597 $layout->set_markup ($par->[4]);
2598 2722
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2600 2724
2601 glRasterPos $par->[3], $y - $y0; 2725 glRasterPos $para->{indent}, $y - $y0;
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727
2728 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes;
2730
2731 for (@w) {
2732 my ($dx, $dy) = splice @s, 0, 2, ();
2733
2734 $_->{x} = $dx + $para->{indent};
2735 $_->{y} = $dy + $y - $y0;
2736
2737 $_->draw;
2738 }
2739 }
2603 } 2740 }
2604 2741
2605 $y += $h; 2742 $y += $h;
2606 } 2743 }
2607 2744
2608 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2609 }; 2746 };
2610 }); 2747 });
2611} 2748}
2612 2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2757}
2758
2613sub _draw { 2759sub _draw {
2614 my ($self) = @_; 2760 my ($self) = @_;
2615 2761
2616 glEnable GL_TEXTURE_2D; 2762 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 2764 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2765 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2621 2767
2622 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2623
2624} 2769}
2625 2770
2626############################################################################# 2771#############################################################################
2627 2772
2628package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2860 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2861 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2862 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2863 . "visible $widget->{visible}";
2719 } 2864 }
2865
2866 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//;
2720 2868
2721 $self->add (new CFClient::UI::Label 2869 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2870 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2872 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2883
2736 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2737} 2885}
2738 2886
2739sub size_allocate { 2887sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 2888 my ($self, $w, $h) = @_;
2741 2889
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 2890 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 2891}
2744 2892
2745sub visibility_change { 2893sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 2894 my ($self, $visible) = @_;
2747 2895
2748 return unless $visible; 2896 return unless $visible;
2749 2897
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 2898 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2752 or return; 2900 or return;
2753 2901
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2903
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2905 if $x + $self->{w} > $self->{root}{w};
2758 2906
2759 $self->move_abs ($x, $y); 2907 $self->move_abs ($x, $y);
2760 }); 2908 });
2761} 2909}
2762 2910
… …
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2999 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852 3000
2853 if ($tex) { 3001 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3002 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3003 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 3004 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3006 glDisable GL_TEXTURE_2D;
2859 } 3007 }
2860} 3008}
2861 3009
2862sub DESTROY { 3010sub destroy {
2863 my ($self) = @_; 3011 my ($self) = @_;
2864 3012
2865 $self->{timer}->cancel 3013 $self->{timer}->cancel
2866 if $self->{timer}; 3014 if $self->{timer};
2867 3015
2868 $self->SUPER::DESTROY; 3016 $self->SUPER::destroy;
2869} 3017}
2870 3018
2871############################################################################# 3019#############################################################################
2872 3020
2873package CFClient::UI::Buttonbar; 3021package CFClient::UI::Buttonbar;
… …
2894 ); 3042 );
2895 3043
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3044 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3045
2898 for my $item (@{ $self->{items} }) { 3046 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3047 my ($widget, $cb, $tooltip) = @$item;
2900 3048
2901 # handle various types of items, only text for now 3049 # handle various types of items, only text for now
2902 if (!ref $widget) { 3050 if (!ref $widget) {
2903 $widget = new CFClient::UI::Label 3051 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3052 can_hover => 1,
2905 can_events => 1, 3053 can_events => 1,
2906 text => $widget; 3054 markup => $widget,
3055 tooltip => $tooltip
2907 } 3056 }
2908 3057
2909 $self->{item}{$widget} = $item; 3058 $self->{item}{$widget} = $item;
2910 3059
2911 $self->{vbox}->add ($widget); 3060 $self->{vbox}->add ($widget);
… …
2916 3065
2917# popup given the event (must be a mouse button down event currently) 3066# popup given the event (must be a mouse button down event currently)
2918sub popup { 3067sub popup {
2919 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2920 3069
2921 $self->_emit ("popdown"); 3070 $self->emit ("popdown");
2922 3071
2923 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3073 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2926 3075
2927 $self->show; 3076 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3077 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3078}
2930 3079
2931sub mouse_motion { 3080sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2933 3082
2934 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2937 3086
2938 0 3087 0
2939} 3088}
2940 3089
2941sub button_up { 3090sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2943 3092
2944 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3094 undef $GRAB;
2946 $self->hide; 3095 $self->hide;
2947 3096
2948 $self->_emit ("popdown"); 3097 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3099 } else {
2951 return 0 3100 return 0
2952 } 3101 }
2953 3102
… …
2990 : $self->{children}[$page_or_widget]; 3139 : $self->{children}[$page_or_widget];
2991 3140
2992 $self->{current} = $widget; 3141 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3142 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3143
2995 $self->_emit (page_changed => $self->{current}); 3144 $self->emit (page_changed => $self->{current});
2996 3145
2997 $self->realloc; 3146 $self->realloc;
2998} 3147}
2999 3148
3000sub visible_children { 3149sub visible_children {
… …
3005 my ($self) = @_; 3154 my ($self) = @_;
3006 3155
3007 $self->{current}->size_request 3156 $self->{current}->size_request
3008} 3157}
3009 3158
3010sub size_allocate { 3159sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3160 my ($self, $w, $h) = @_;
3012 3161
3013 $self->{current}->configure (0, 0, $w, $h); 3162 $self->{current}->configure (0, 0, $w, $h);
3163
3164 1
3014} 3165}
3015 3166
3016sub _draw { 3167sub _draw {
3017 my ($self) = @_; 3168 my ($self) = @_;
3018 3169
… …
3057 3208
3058sub set_current_page { 3209sub set_current_page {
3059 my ($self, $page) = @_; 3210 my ($self, $page) = @_;
3060 3211
3061 $self->{multiplexer}->set_current_page ($page); 3212 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3213 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3214}
3064 3215
3065############################################################################# 3216#############################################################################
3066 3217
3067package CFClient::UI::Statusbox; 3218package CFClient::UI::Combobox;
3068 3219
3220use utf8;
3221
3069our @ISA = CFClient::UI::VBox::; 3222our @ISA = CFClient::UI::Button::;
3070 3223
3071sub new { 3224sub new {
3072 my $class = shift; 3225 my $class = shift;
3073 3226
3074 $class->SUPER::new ( 3227 my $self = $class->SUPER::new (
3228 options => [], # [value, title, longdesc], ...
3229 value => undef,
3230 @_,
3231 );
3232
3233 $self->_set_value ($self->{value});
3234
3235 $self
3236}
3237
3238sub invoke_button_down {
3239 my ($self, $ev) = @_;
3240
3241 my @menu_items;
3242
3243 for (@{ $self->{options} }) {
3244 my ($value, $title, $tooltip) = @$_;
3245
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 }
3248
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250}
3251
3252sub _set_value {
3253 my ($self, $value) = @_;
3254
3255 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3256 or return;
3257
3258 $self->{value} = $item->[0];
3259 $self->set_markup ("$item->[1] ⇓");
3260 $self->set_tooltip ($item->[2]);
3261}
3262
3263sub set_value {
3264 my ($self, $value) = @_;
3265
3266 return unless $self->{value} ne $value;
3267
3268 $self->_set_value ($value);
3269 $self->emit (changed => $value);
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::Statusbox;
3275
3276our @ISA = CFClient::UI::VBox::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3282 fontsize => 0.8,
3076 @_, 3283 @_,
3077 ) 3284 );
3285
3286 Scalar::Util::weaken (my $this = $self);
3287
3288 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289
3290 $self
3078} 3291}
3079 3292
3080sub reorder { 3293sub reorder {
3081 my ($self) = @_; 3294 my ($self) = @_;
3082 my $NOW = time; 3295 my $NOW = Time::HiRes::time;
3296
3297 # freeze display when hovering over any label
3298 return if $CFClient::UI::TOOLTIP->{owner}
3299 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3300 values %{ $self->{item} };
3083 3301
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3302 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3303 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3304 }
3087 3305
… …
3090 my @items = sort { 3308 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3309 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3310 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3311 } values %{ $self->{item} };
3094 3312
3313 $self->{timer}->interval (1);
3314
3095 my $count = 10 + 1; 3315 my $count = 10 + 1;
3096 for my $item (@items) { 3316 for my $item (@items) {
3097 last unless --$count; 3317 last unless --$count;
3098 3318
3099 push @widgets, $item->{label} ||= do { 3319 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3320 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3321 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3322 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3323 : $item->{text};
3104 3324
… …
3112 tooltip => $item->{tooltip}, 3332 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3333 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3334 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3335 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3336 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3337 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3338 can_events => 1,
3119 can_hover => 1 3339 can_hover => 1
3120 }; 3340 };
3341
3342 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3343 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3344 $label->update;
3345 $label->set_max_size (undef, $label->{req_h} * $diff)
3346 if $diff < 1;
3347 $self->{timer}->interval (1/30);
3348 } else {
3349 $label->{fg}[3] = $item->{fg}[3] || 1;
3350 }
3351
3352 push @widgets, $label;
3121 } 3353 }
3122 3354
3123 $self->clear; 3355 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3356 $self->SUPER::add (reverse @widgets);
3125} 3357}
… …
3130 $text =~ s/^\s+//; 3362 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3363 $text =~ s/\s+$//;
3132 3364
3133 return unless $text; 3365 return unless $text;
3134 3366
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3367 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3368
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3369 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3370
3139 if (my $item = $self->{item}{$group}) { 3371 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3372 if ($item->{text} eq $text) {
3141 $item->{count}++; 3373 $item->{count}++;
3142 } else { 3374 } else {
3143 $item->{count} = 1; 3375 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text; 3376 $item->{text} = $item->{tooltip} = $text;
3145 } 3377 }
3146 $item->{id} = ++$self->{id}; 3378 $item->{id} += 0.2;#d#
3147 $item->{timeout} = $timeout; 3379 $item->{timeout} = $timeout;
3148 delete $item->{label}; 3380 delete $item->{label};
3149 } else { 3381 } else {
3150 $self->{item}{$group} = { 3382 $self->{item}{$group} = {
3151 id => ++$self->{id}, 3383 id => ++$self->{id},
… …
3170 3402
3171 $self->reorder; 3403 $self->reorder;
3172 $self->SUPER::reconfigure; 3404 $self->SUPER::reconfigure;
3173} 3405}
3174 3406
3407sub destroy {
3408 my ($self) = @_;
3409
3410 $self->{timer}->cancel;
3411
3412 $self->SUPER::destroy;
3413}
3414
3175############################################################################# 3415#############################################################################
3176 3416
3177package CFClient::UI::Inventory; 3417package CFClient::UI::Inventory;
3178 3418
3179our @ISA = CFClient::UI::ScrolledWindow::; 3419our @ISA = CFClient::UI::ScrolledWindow::;
… …
3278 $self->update_binding_widgets; 3518 $self->update_binding_widgets;
3279 3519
3280 $self 3520 $self
3281} 3521}
3282 3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3283sub commit { 3535sub commit {
3284 my ($self) = @_; 3536 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding; 3537 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) { 3538 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3321 my ($self) = @_; 3573 my ($self) = @_;
3322 $self->ask_for_bind (1); 3574 $self->ask_for_bind (1);
3323} 3575}
3324 3576
3325sub ask_for_bind { 3577sub ask_for_bind {
3326 my ($self, $commit) = @_; 3578 my ($self, $commit, $end_cb) = @_;
3327 3579
3328 CFClient::Binder::open_binding_dialog (sub { 3580 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_; 3581 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets; 3583 $self->update_binding_widgets;
3332 $self->commit if $commit; 3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3333 }); 3586 });
3334} 3587}
3335 3588
3336# $mod and $sym are the modifiers and key symbol 3589# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands) 3590# $cmds is a array ref of strings (the commands)
… …
3355} 3608}
3356 3609
3357# this is a shortcut method that asks for a binding 3610# this is a shortcut method that asks for a binding
3358# and then just binds it. 3611# and then just binds it.
3359sub do_quick_binding { 3612sub do_quick_binding {
3360 my ($self, $cmds) = @_; 3613 my ($self, $cmds, $end_cb) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub { 3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1); 3615 $self->ask_for_bind (1, $end_cb);
3365} 3616}
3366 3617
3367sub update_binding_widgets { 3618sub update_binding_widgets {
3368 my ($self) = @_; 3619 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding; 3620 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3425 commands => [], 3676 commands => [],
3426 @_, 3677 @_,
3427 ) 3678 )
3428} 3679}
3429 3680
3430# XXX: Do sorting? Argl... 3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693
3694sub rebuild_spell_list {
3695 my ($self) = @_;
3696
3697 $CFClient::UI::ROOT->on_refresh ($self => sub {
3698 $self->clear;
3699
3700 return unless $::CONN;
3701
3702 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708 my $row = 0;
3709
3710 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711 my $spell = $self->{spell}{$_};
3712
3713 $row++;
3714
3715 my $spell_cb = sub {
3716 my ($widget, $ev) = @_;
3717
3718 if ($ev->{button} == 1) {
3719 $::CONN->user_send ("cast $spell->{name}");
3720 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu
3724 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ],
3728 )->popup ($ev);
3729 } else {
3730 return 0;
3731 }
3732
3733 1
3734 };
3735
3736 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738 #TODO: add path info to tooltip
3739 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741 $self->add (0, $row, new CFClient::UI::Face
3742 face => $spell->{face},
3743 can_hover => 1,
3744 can_events => 1,
3745 tooltip => $tooltip,
3746 on_button_down => $spell_cb,
3747 );
3748
3749 $self->add (1, $row, new CFClient::UI::Label
3750 expand => 1,
3751 text => $spell->{name},
3752 can_hover => 1,
3753 can_events => 1,
3754 tooltip => $tooltip,
3755 on_button_down => $spell_cb,
3756 );
3757
3758 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762 }
3763 });
3764}
3765
3431sub add_spell { 3766sub add_spell {
3432 my ($self, $spell) = @_; 3767 my ($self, $spell) = @_;
3768
3433 $self->{spells}->{$spell->{name}} = $spell; 3769 $self->{spell}->{$spell->{name}} = $spell;
3434 3770 $self->rebuild_spell_list;
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462} 3771}
3463 3772
3464sub remove_spell { 3773sub remove_spell {
3465 my ($self, $spell) = @_; 3774 my ($self, $spell) = @_;
3775
3466 delete $self->{spells}->{$spell->{name}}; 3776 delete $self->{spell}->{$spell->{name}};
3467 $self->rebuild_spell_list; 3777 $self->rebuild_spell_list;
3468} 3778}
3469 3779
3780sub clear_spells {
3781 my ($self) = @_;
3782
3783 $self->{spell} = {};
3784 $self->rebuild_spell_list;
3785}
3786
3470############################################################################# 3787#############################################################################
3471 3788
3472package CFClient::UI::Root; 3789package CFClient::UI::Root;
3473 3790
3474our @ISA = CFClient::UI::Container::; 3791our @ISA = CFClient::UI::Container::;
3792
3793use List::Util qw(min max);
3475 3794
3476use CFClient::OpenGL; 3795use CFClient::OpenGL;
3477 3796
3478sub new { 3797sub new {
3479 my $class = shift; 3798 my $class = shift;
… …
3506 $coord = $max - $size if $coord > $max - $size; 3825 $coord = $max - $size if $coord > $max - $size;
3507 3826
3508 int $coord + 0.5 3827 int $coord + 0.5
3509} 3828}
3510 3829
3511sub size_allocate { 3830sub invoke_size_allocate {
3512 my ($self, $w, $h) = @_; 3831 my ($self, $w, $h) = @_;
3513 3832
3514 for my $child ($self->children) { 3833 for my $child ($self->children) {
3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3834 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3516 3835
… …
3520 $X = _to_pixel $X, $W, $self->{w}; 3839 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h}; 3840 $Y = _to_pixel $Y, $H, $self->{h};
3522 3841
3523 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
3524 } 3843 }
3844
3845 1
3525} 3846}
3526 3847
3527sub coord2local { 3848sub coord2local {
3528 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
3529 3850
… …
3614 3935
3615 delete $queue{$widget+0}; 3936 delete $queue{$widget+0};
3616 3937
3617 my ($w, $h) = $widget->size_request; 3938 my ($w, $h) = $widget->size_request;
3618 3939
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3940 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3941 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3942
3943 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3944 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621 3945
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 3946 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 3947 $h = $widget->{force_h} if exists $widget->{force_h};
3624 3948
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3949 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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