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