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.312 by root, Fri Jun 23 23:54:30 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
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop 376 # nop
377} 377}
378 378
379sub visible_children { 379sub visible_children {
… …
381} 381}
382 382
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
388} 390}
389 391
390sub set_tooltip { 392sub set_tooltip {
391 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
392 394
… …
397 399
398 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
399 401
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 405 }
404} 406}
405 407
406# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
407sub coord2local { 409sub coord2local {
… …
415 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
416 418
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 420}
419 421
420sub focus_in { 422sub invoke_focus_in {
421 my ($self) = @_; 423 my ($self) = @_;
422 424
423 return if $FOCUS == $self; 425 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
425 427
426 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
427 429
428 $self->_emit (focus_in => $focus);
429
430 $focus->update if $focus; 430 $focus->update if $focus;
431 $FOCUS->update; 431 $FOCUS->update;
432}
433 432
433 0
434}
435
434sub focus_out { 436sub invoke_focus_out {
435 my ($self) = @_; 437 my ($self) = @_;
436 438
437 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
438 440
439 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
440 442
441 $self->_emit (focus_out => $focus);
442
443 $focus->update if $focus; #? 443 $focus->update if $focus; #?
444 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 446 unless $FOCUS;
447}
448 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
449sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
450sub button_up { 0 } 458sub invoke_button_up { 1 }
451sub key_down { 0 } 459sub invoke_key_down { 1 }
452sub key_up { 0 } 460sub invoke_key_up { 1 }
453 461
454sub button_down { 462sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
456 464
457 $self->focus_in; 465 $self->grab_focus;
458 466
459 0 467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 483}
461 484
462sub find_widget { 485sub find_widget {
463 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
464 487
… …
474sub set_parent { 497sub set_parent {
475 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
476 499
477 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 501 $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} 502}
503 503
504sub realloc { 504sub realloc {
505 my ($self) = @_; 505 my ($self) = @_;
506 506
… …
539 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540 540
541 # update screen rectangle 541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 544
547 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 548
551 glPushMatrix; 549 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 551
556 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 554 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 556 glBegin GL_QUADS;
563 glVertex $x , $y; 557 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
567 glEnd; 561 glEnd;
568 glDisable GL_BLEND; 562 glDisable GL_BLEND;
569 } 563 }
570 564
571 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 566 glPushMatrix;
573 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 570 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
580 glEnd; 574 glEnd;
581 glPopMatrix; 575 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
584} 581}
585 582
586sub _draw { 583sub _draw {
587 my ($self) = @_; 584 my ($self) = @_;
588 585
… …
591 588
592sub DESTROY { 589sub DESTROY {
593 my ($self) = @_; 590 my ($self) = @_;
594 591
595 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
596 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 596}
598 597
599############################################################################# 598#############################################################################
600 599
601package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
626 625
627 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
629 628
630 glEnable GL_BLEND; 629 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 631 glColor_premultiply @$color;
633 632
634 glBegin GL_QUADS; 633 glBegin GL_QUADS;
635 glVertex 0 , 0; 634 glVertex 0 , 0;
636 glVertex 0 , $h; 635 glVertex 0 , $h;
637 glVertex $w, $h; 636 glVertex $w, $h;
… …
766} 765}
767 766
768sub add { 767sub add {
769 my ($self, $child) = @_; 768 my ($self, $child) = @_;
770 769
771 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
774} 772}
775 773
776sub remove { 774sub remove {
777 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
786 784
787sub size_request { 785sub size_request {
788 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
789} 787}
790 788
791sub size_allocate { 789sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
793 791
794 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
795} 795}
796 796
797############################################################################# 797#############################################################################
798
799# back-buffered drawing area
798 800
799package CFClient::UI::Window; 801package CFClient::UI::Window;
800 802
801our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
802 804
… …
813 815
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 817 $self->SUPER::update;
816} 818}
817 819
818sub size_allocate { 820sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
820 822
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
823} 826}
824 827
825sub _render { 828sub _render {
826 my ($self) = @_; 829 my ($self) = @_;
827 830
… …
854 my $tex = $self->{texture} 857 my $tex = $self->{texture}
855 or return; 858 or return;
856 859
857 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
860 863
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 865
863 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
864} 867}
… …
888 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
889 892
890 ($w, $h) 893 ($w, $h)
891} 894}
892 895
893sub size_allocate { 896sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
895 898
896 my $child = $self->child; 899 my $child = $self->child;
897 900
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 903
901 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
902 $self->update; 905 $self->update;
906
907 1
903} 908}
904 909
905sub set_offset { 910sub set_offset {
906 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
907 912
… …
997 # todo: overwrite size_allocate of child 1002 # todo: overwrite size_allocate of child
998 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1000} 1005}
1001 1006
1002sub size_allocate { 1007sub invoke_size_allocate {
1003 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
1004
1005 $self->SUPER::size_allocate ($w, $h);
1006 1009
1007 my $child = $self->{vp}->child; 1010 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
1009} 1014}
1010 1015
1011#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll 1017# update viewport offset on scroll
1013 1018
… …
1033 1038
1034 if ($self->{bg}) { 1039 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
1036 1041
1037 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
1040 1045
1041 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1042 glVertex 0 , 0; 1047 glVertex 0 , 0;
1043 glVertex 0 , $h; 1048 glVertex 0 , $h;
1044 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 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); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1069 1074
1070sub new { 1075sub new {
1071 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1072
1073 my $title = delete $arg{title};
1074 1077
1075 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1081 border => 0.6,
… …
1080 min_w => 16, 1083 min_w => 16,
1081 min_h => 16, 1084 min_h => 16,
1082 %arg, 1085 %arg,
1083 ); 1086 );
1084 1087
1085 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1086 align => 0, 1089 align => 0,
1087 valign => 1, 1090 valign => 1,
1088 text => $title, 1091 text => $self->{title},
1089 fontsize => $self->{border} 1092 fontsize => $self->{border},
1090 if defined $title; 1093 if exists $self->{title};
1094
1095 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
1091 1103
1092 $self 1104 $self
1093} 1105}
1094 1106
1095sub add { 1107sub add {
1096 my ($self, @widgets) = @_; 1108 my ($self, @widgets) = @_;
1097 1109
1098 $self->SUPER::add (@widgets); 1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1100} 1113}
1101 1114
1102sub border { 1115sub border {
1103 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1104} 1117}
1105 1118
1106sub size_request { 1119sub size_request {
1107 my ($self) = @_; 1120 my ($self) = @_;
1108 1121
1109 $self->{title}->size_request 1122 $self->{title_widget}->size_request
1110 if $self->{title}; 1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
1111 1127
1112 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1113 1129
1114 ( 1130 (
1115 $w + $self->border * 2, 1131 $w + $self->border * 2,
1116 $h + $self->border * 2, 1132 $h + $self->border * 2,
1117 ) 1133 )
1118} 1134}
1119 1135
1120sub size_allocate { 1136sub invoke_size_allocate {
1121 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1122 1138
1123 if ($self->{title}) { 1139 if ($self->{title_widget}) {
1124 $self->{title}{w} = $w; 1140 $self->{title_widget}{w} = $w;
1125 $self->{title}{h} = $h; 1141 $self->{title_widget}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h); 1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1127 } 1143 }
1128 1144
1129 my $border = $self->border; 1145 my $border = $self->border;
1130 1146
1131 $h -= List::Util::max 0, $border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1132 $w -= List::Util::max 0, $border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1133 1149
1134 $self->child->configure ($border, $border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1135}
1136 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
1137sub button_down { 1158sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1139 1160
1140 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
1141 my $border = $self->border; 1162 my $border = $self->border;
1142 1163
… …
1158 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
1159 1180
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1183
1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1185 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1186 };
1166 1187
1167 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
1173 1194
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1196
1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1198 # HACK: the next line is required to enforce placement
1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1177 }; 1200 };
1178 } else { 1201 } else {
1179 return 0; 1202 return 0;
1180 } 1203 }
1181 1204
1182 1 1205 1
1183} 1206}
1184 1207
1185sub button_up { 1208sub invoke_button_up {
1186 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1187 1210
1188 !!delete $self->{motion} 1211 ! ! delete $self->{motion}
1189} 1212}
1190 1213
1191sub mouse_motion { 1214sub invoke_mouse_motion {
1192 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1193 1216
1194 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195 1218
1196 !!$self->{motion} 1219 ! ! $self->{motion}
1197} 1220}
1198 1221
1199sub _draw { 1222sub _draw {
1200 my ($self) = @_; 1223 my ($self) = @_;
1201 1224
… …
1227 1250
1228 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1229 1252
1230 $child->draw; 1253 $child->draw;
1231 1254
1232 if ($self->{title}) { 1255 if ($self->{title_widget}) {
1233 glTranslate 0, $border - $self->{h}; 1256 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw; 1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1235 } 1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
1236} 1264}
1237 1265
1238############################################################################# 1266#############################################################################
1239 1267
1240package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1263 1291
1264 $child->set_parent ($self); 1292 $child->set_parent ($self);
1265 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1266 1294
1267 $self->realloc; 1295 $self->realloc;
1296}
1297
1298sub remove {
1299 my ($self, $child) = @_;
1300
1301 # TODO: not yet implemented
1268} 1302}
1269 1303
1270# TODO: move to container class maybe? send children a signal on removal? 1304# TODO: move to container class maybe? send children a signal on removal?
1271sub clear { 1305sub clear {
1272 my ($self) = @_; 1306 my ($self) = @_;
… …
1313 (sum @$ws), 1347 (sum @$ws),
1314 (sum @$hs), 1348 (sum @$hs),
1315 ) 1349 )
1316} 1350}
1317 1351
1318sub size_allocate { 1352sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1320 1354
1321 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1322 1356
1323 my $req_w = (sum @$ws) || 1; 1357 my $req_w = (sum @$ws) || 1;
… …
1355 } 1389 }
1356 1390
1357 $y += $row_h; 1391 $y += $row_h;
1358 } 1392 }
1359 1393
1394 1
1360} 1395}
1361 1396
1362sub find_widget { 1397sub find_widget {
1363 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1364 1399
… …
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 ) 1438 )
1404} 1439}
1405 1440
1406sub size_allocate { 1441sub invoke_size_allocate {
1407 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1408 1443
1409 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1410 my $children = $self->{children}; 1445 my @children = $self->visible_children;
1411 1446
1412 my @req; 1447 my @req;
1413 1448
1414 if ($self->{homogeneous}) { 1449 if ($self->{homogeneous}) {
1415 @req = ($space / (@$children || 1)) x @$children; 1450 @req = ($space / (@children || 1)) x @children;
1416 } else { 1451 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1418 my $req = List::Util::sum @req; 1453 my $req = List::Util::sum @req;
1419 1454
1420 if ($req > $space) { 1455 if ($req > $space) {
1421 # ah well, not enough space 1456 # ah well, not enough space
1422 $_ *= $space / $req for @req; 1457 $_ *= $space / $req for @req;
1423 } else { 1458 } else {
1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1425 1460
1426 $space = ($space - $req) / $expand; # remaining space to give away 1461 $space = ($space - $req) / $expand; # remaining space to give away
1427 1462
1428 $req[$_] += $space * $children->[$_]{expand} 1463 $req[$_] += $space * $children[$_]{expand}
1429 for 0 .. $#$children; 1464 for 0 .. $#children;
1430 } 1465 }
1431 } 1466 }
1432 1467
1433 CFClient::UI::harmonize \@req; 1468 CFClient::UI::harmonize \@req;
1434 1469
1435 my $pos = 0; 1470 my $pos = 0;
1436 for (0 .. $#$children) { 1471 for (0 .. $#children) {
1437 my $alloc = $req[$_]; 1472 my $alloc = $req[$_];
1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1439 1474
1440 $pos += $alloc; 1475 $pos += $alloc;
1441 } 1476 }
1442 1477
1443 1 1478 1
… …
1533 1568
1534 delete $self->{texture}; 1569 delete $self->{texture};
1535 $self->SUPER::update; 1570 $self->SUPER::update;
1536} 1571}
1537 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1538sub set_text { 1580sub set_text {
1539 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1540 1582
1541 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1543 1585
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1546 1588
1589 delete $self->{size_req};
1547 $self->realloc; 1590 $self->realloc;
1548 $self->update; 1591 $self->update;
1549} 1592}
1550 1593
1551sub set_markup { 1594sub set_markup {
… …
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1601
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1560 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1561 1604
1605 delete $self->{size_req};
1562 $self->realloc; 1606 $self->realloc;
1563 $self->update; 1607 $self->update;
1564} 1608}
1565 1609
1566sub size_request { 1610sub size_request {
1567 my ($self) = @_; 1611 my ($self) = @_;
1568 1612
1613 $self->{size_req} ||= do {
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1619
1575 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1576 1621
1577 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1578 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1625
1581 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1582 1627
1583 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1585 } 1633 };
1586 1634
1587 ($w, $h) 1635 @{ $self->{size_req} }
1588} 1636}
1589 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1590sub size_allocate { 1642sub invoke_size_allocate {
1591 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1592 1644
1593 delete $self->{ox}; 1645 delete $self->{ox};
1594 1646
1595 delete $self->{texture} 1647 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1597} 1651}
1598 1652
1599sub set_fontsize { 1653sub set_fontsize {
1600 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1601 1655
1602 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1603 delete $self->{texture}; 1657 delete $self->{texture};
1604 1658
1605 $self->realloc; 1659 $self->realloc;
1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1606} 1668}
1607 1669
1608sub _draw { 1670sub _draw {
1609 my ($self) = @_; 1671 my ($self) = @_;
1610 1672
… …
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5); 1693 : ($self->{h} - $tex->{h}) * 0.5);
1632 }; 1694 };
1633 1695
1634 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1636 1700
1637 if ($tex->{format} == GL_ALPHA) { 1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1638 glColor @{$self->{fg}}; 1703 glColor @{$self->{fg}};
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1640 } else { 1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1642 } 1708 }
1643 1709
1644 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1645} 1711}
1646 1712
… …
1663 can_hover => 1, 1729 can_hover => 1,
1664 can_focus => 1, 1730 can_focus => 1,
1665 valign => 0, 1731 valign => 0,
1666 can_events => 1, 1732 can_events => 1,
1667 #text => ... 1733 #text => ...
1734 #hidden => "*",
1668 @_ 1735 @_
1669 ) 1736 )
1670} 1737}
1671 1738
1672sub _set_text { 1739sub _set_text {
… …
1674 1741
1675 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1676 1743
1677 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1678 1745
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1747 $self->{text} = $text;
1683 1748
1684 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1686 1752
1687 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1688} 1757}
1689 1758
1690sub set_text { 1759sub set_text {
1691 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1692 1761
1693 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1763 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1764}
1698 1765
1699sub get_text { 1766sub get_text {
1700 $_[0]{text} 1767 $_[0]{text}
1701} 1768}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1707 1774
1708 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1709} 1776}
1710 1777
1711sub key_down { 1778sub invoke_key_down {
1712 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1713 1780
1714 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1800 $self->emit ('escape');
1734 } elsif ($uni) { 1801 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1803 } else {
1737 return 0; 1804 return 0;
1738 } 1805 }
… …
1742 $self->realloc; 1809 $self->realloc;
1743 1810
1744 1 1811 1
1745} 1812}
1746 1813
1747sub focus_in { 1814sub invoke_focus_in {
1748 my ($self) = @_; 1815 my ($self) = @_;
1749 1816
1750 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1751 1818
1752 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1753} 1820}
1754 1821
1755sub button_down { 1822sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1757 1824
1758 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1826
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1828
1762 # byte-index to char-index 1829 # byte-index to char-index
1763 my $text = $self->{text}; 1830 my $text = $self->{text};
… …
1768 $self->update; 1835 $self->update;
1769 1836
1770 1 1837 1
1771} 1838}
1772 1839
1773sub mouse_motion { 1840sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776 1843
1777 0 1844 1
1778} 1845}
1779 1846
1780sub _draw { 1847sub _draw {
1781 my ($self) = @_; 1848 my ($self) = @_;
1782 1849
1783 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1784 1851
1785 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1788 } else { 1855 } else {
1789 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1790 } 1857 }
1791 1858
1792 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1795 glVertex 0 , 0; 1862 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1823 1890
1824our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1825 1892
1826use CFClient::OpenGL; 1893use CFClient::OpenGL;
1827 1894
1828sub key_down { 1895sub invoke_key_down {
1829 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1830 1897
1831 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1832 1899
1833 if ($sym == 13) { 1900 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1836 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1839 $self->update; 1907 $self->update;
1840 1908
1841 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1927 } else {
1860 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1861 } 1929 }
1862 1930
1863 } else { 1931 } else {
1864 return $self->SUPER::key_down ($ev) 1932 return $self->SUPER::invoke_key_down ($ev)
1865 } 1933 }
1866 1934
1867 1 1935 1
1868} 1936}
1869 1937
… …
1893 can_events => 1, 1961 can_events => 1,
1894 @_ 1962 @_
1895 ) 1963 )
1896} 1964}
1897 1965
1898sub activate { }
1899
1900sub button_up { 1966sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1902 1968
1903 $self->emit ("activate") 1969 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
… …
1908} 1974}
1909 1975
1910sub _draw { 1976sub _draw {
1911 my ($self) = @_; 1977 my ($self) = @_;
1912 1978
1913 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 1980
1919 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1922 1984
1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1924 1986
1925 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1926 1988
1927 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1928} 2026}
1929 2027
1930############################################################################# 2028#############################################################################
1931 2029
1932package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1959 my ($self) = @_; 2057 my ($self) = @_;
1960 2058
1961 (6) x 2 2059 (6) x 2
1962} 2060}
1963 2061
1964sub button_down { 2062sub invoke_button_down {
1965 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1966 2064
1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1969 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1970 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
1971 } else { 2069 } else {
1972 return 0 2070 return 0
1973 } 2071 }
1974 2072
1975 1 2073 1
… …
2000package CFClient::UI::Image; 2098package CFClient::UI::Image;
2001 2099
2002our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
2003 2101
2004use CFClient::OpenGL; 2102use CFClient::OpenGL;
2005use Carp qw/confess/;
2006 2103
2007our %loaded_images; 2104our %texture_cache;
2008 2105
2009sub new { 2106sub new {
2010 my $class = shift; 2107 my $class = shift;
2011 2108
2012 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2013 2113
2014 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2015 2116
2016 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2017 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2018 2119
2019 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2020 2121
2021 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2022
2023 $self->{aspect} = $tex->{w} / $tex->{h};
2024 2123
2025 $self 2124 $self
2026} 2125}
2027 2126
2028sub size_request { 2127sub size_request {
2029 my ($self) = @_; 2128 my ($self) = @_;
2030 2129
2031 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
2032} 2131}
2033 2132
2034sub _draw { 2133sub _draw {
2035 my ($self) = @_; 2134 my ($self) = @_;
2036 2135
… …
2147 2246
2148 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
2149 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
2150 2249
2151 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2255
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2271 $self->update; 2371 $self->update;
2272 2372
2273 $self 2373 $self
2274} 2374}
2275 2375
2276sub changed { }
2277
2278sub set_range { 2376sub set_range {
2279 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2280 2378
2281 ($range, $self->{range}) = ($self->{range}, $range); 2379 ($range, $self->{range}) = ($self->{range}, $range);
2282 2380
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 2381 if ("@$range" ne "@{$self->{range}}") {
2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2285} 2385}
2286 2386
2287sub set_value { 2387sub set_value {
2288 my ($self, $value) = @_; 2388 my ($self, $value) = @_;
2289 2389
… …
2300 if $unit; 2400 if $unit;
2301 2401
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303 2403
2304 if ($value != $old_value) { 2404 if ($value != $old_value) {
2305 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2306 $self->update; 2406 $self->update;
2307 } 2407 }
2308} 2408}
2309 2409
2310sub size_request { 2410sub size_request {
2311 my ($self) = @_; 2411 my ($self) = @_;
2312 2412
2313 ($self->{req_w}, $self->{req_h}) 2413 ($self->{req_w}, $self->{req_h})
2314} 2414}
2315 2415
2316sub button_down { 2416sub invoke_button_down {
2317 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2318 2418
2319 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2320 2420
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322 2422
2323 $self->mouse_motion ($ev, $x, $y) 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2324} 2424}
2325 2425
2326sub mouse_motion { 2426sub invoke_mouse_motion {
2327 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2328 2428
2329 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331 2431
… …
2342} 2442}
2343 2443
2344sub update { 2444sub update {
2345 my ($self) = @_; 2445 my ($self) = @_;
2346 2446
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2447 delete $self->{knob_w};
2448 $self->SUPER::update;
2449}
2450
2451sub _draw {
2452 my ($self) = @_;
2453
2454 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 2455 $self->set_value ($self->{range}[0]);
2349 2456
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2458 my $range = ($hi - $page - $lo) || 1e-100;
2352 2459
… …
2358 $value = ($value - $lo) / $range; 2465 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2466 $value = $value * $self->{scale} + $self->{offset};
2360 2467
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2469 $self->{knob_w} = $knob_w;
2363 }); 2470 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2471
2371 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2372 2473
2373 glScale $self->{w}, $self->{h}; 2474 glScale $self->{w}, $self->{h};
2374 2475
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2536sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2537sub set_value { shift->{slider}->set_value (@_) }
2437 2538
2438############################################################################# 2539#############################################################################
2439 2540
2440package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2441 2542
2442our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2443 2544
2444use CFClient::OpenGL; 2545use CFClient::OpenGL;
2445 2546
… …
2447 my $class = shift; 2548 my $class = shift;
2448 2549
2449 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2450 fontsize => 1, 2551 fontsize => 1,
2451 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2452 #font => default_font 2554 #font => default_font
2453 @_, 2555 @_,
2454 2556
2455 layout => (new CFClient::Layout 1), 2557 layout => (new CFClient::Layout 1),
2456 par => [], 2558 par => [],
… …
2471 2573
2472 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2575 $self->reflow;
2474} 2576}
2475 2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2476sub size_allocate { 2587sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2478 2589
2479 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2592
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2595 $self->{layout}->set_width ($empty->{w});
2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2597
2485 $self->reflow; 2598 $self->reflow;
2486}
2487 2599
2488sub text_size { 2600 local $self->{children} = [$empty, $slider];
2489 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2490 2606
2491 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2492 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2496 2620 );
2621
2497 $layout->size 2622 $layout
2498} 2623}
2499 2624
2500sub reflow { 2625sub reflow {
2501 my ($self) = @_; 2626 my ($self) = @_;
2502 2627
… …
2511 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2512} 2637}
2513 2638
2514sub clear { 2639sub clear {
2515 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2516 2644
2517 $self->{par} = []; 2645 $self->{par} = [];
2518 $self->{height} = 0; 2646 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2648}
2521 2649
2522sub add_paragraph { 2650sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2524 2652
2525 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2526 my ($w, $h) = $self->text_size ($line); 2654
2527 $self->{height} += $h; 2655 $para = {
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2529 } 2662 };
2530 2663
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2666
2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2670
2671sub scroll_to_bottom {
2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2532} 2676}
2533 2677
2534sub update { 2678sub update {
2535 my ($self) = @_; 2679 my ($self) = @_;
2536 2680
… …
2538 2682
2539 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2540 2684
2541 delete $self->{texture}; 2685 delete $self->{texture};
2542 2686
2543 $ROOT->on_post_alloc ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2689
2546 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2691 my $height = 0;
2548 2692
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2695 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2696 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2697
2559 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2560 } 2701 }
2561 2702
2562 $height += $_->[1]; 2703 $height += $para->{h};
2563 } 2704 }
2564 2705
2565 $self->{height} = $height; 2706 $self->{height} = $height;
2566 2707
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2568 2709
2569 delete $self->{texture}; 2710 delete $self->{texture};
2570 } 2711 }
2571 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 2718 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2575 2720
2576 my $top = int $self->{children}[1]{range}[0]; 2721 my $top = int $self->{children}[1]{range}[0];
2577 2722
2578 my $y0 = $top; 2723 my $y0 = $top;
2579 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2580 2725
2581 my $y = 0; 2726 my $y = 0;
2582
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586 2727
2587 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590 2731
2591 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2733 my $h = $para->{h};
2593 2734
2594 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 2736
2596 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2597 $layout->set_markup ($par->[4]);
2598 2738
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2600 2740
2601 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 for (@w) {
2748 my ($dx, $dy) = splice @s, 0, 2, ();
2749
2750 $_->{x} = $dx + $para->{indent};
2751 $_->{y} = $dy + $y - $y0;
2752
2753 $_->draw;
2754 }
2755 }
2603 } 2756 }
2604 2757
2605 $y += $h; 2758 $y += $h;
2606 } 2759 }
2607 2760
2608 glDisable GL_BLEND; 2761 glDisable GL_BLEND;
2609 }; 2762 };
2610 }); 2763 });
2611} 2764}
2612 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2613sub _draw { 2775sub _draw {
2614 my ($self) = @_; 2776 my ($self) = @_;
2615 2777
2616 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2621 2783
2622 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2623
2624} 2785}
2625 2786
2626############################################################################# 2787#############################################################################
2627 2788
2628package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2878 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2879 . "visible $widget->{visible}";
2719 } 2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2720 2884
2721 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2886 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2888 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2899
2736 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2737} 2901}
2738 2902
2739sub size_allocate { 2903sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2741 2905
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 2907}
2744 2908
2745sub visibility_change { 2909sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2747 2911
2748 return unless $visible; 2912 return unless $visible;
2749 2913
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2752 or return; 2916 or return;
2753 2917
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2919
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2921 if $x + $self->{w} > $self->{root}{w};
2758 2922
2759 $self->move_abs ($x, $y); 2923 $self->move_abs ($x, $y);
2760 }); 2924 });
2761} 2925}
2762 2926
… …
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852 3016
2853 if ($tex) { 3017 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2859 } 3023 }
2860} 3024}
2861 3025
2862sub DESTROY { 3026sub destroy {
2863 my ($self) = @_; 3027 my ($self) = @_;
2864 3028
2865 $self->{timer}->cancel 3029 $self->{timer}->cancel
2866 if $self->{timer}; 3030 if $self->{timer};
2867 3031
2868 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2869} 3033}
2870 3034
2871############################################################################# 3035#############################################################################
2872 3036
2873package CFClient::UI::Buttonbar; 3037package CFClient::UI::Buttonbar;
… …
2894 ); 3058 );
2895 3059
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3061
2898 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2900 3064
2901 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2902 if (!ref $widget) { 3066 if (!ref $widget) {
2903 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3068 can_hover => 1,
2905 can_events => 1, 3069 can_events => 1,
2906 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2907 } 3072 }
2908 3073
2909 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2910 3075
2911 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2916 3081
2917# popup given the event (must be a mouse button down event currently) 3082# popup given the event (must be a mouse button down event currently)
2918sub popup { 3083sub popup {
2919 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
2920 3085
2921 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
2922 3087
2923 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3089 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2926 3091
2927 $self->show; 3092 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3094}
2930 3095
2931sub mouse_motion { 3096sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2933 3098
2934 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2937 3102
2938 0 3103 0
2939} 3104}
2940 3105
2941sub button_up { 3106sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2943 3108
2944 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3110 undef $GRAB;
2946 $self->hide; 3111 $self->hide;
2947 3112
2948 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3115 } else {
2951 return 0 3116 return 0
2952 } 3117 }
2953 3118
… …
2990 : $self->{children}[$page_or_widget]; 3155 : $self->{children}[$page_or_widget];
2991 3156
2992 $self->{current} = $widget; 3157 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3158 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3159
2995 $self->_emit (page_changed => $self->{current}); 3160 $self->emit (page_changed => $self->{current});
2996 3161
2997 $self->realloc; 3162 $self->realloc;
2998} 3163}
2999 3164
3000sub visible_children { 3165sub visible_children {
… …
3005 my ($self) = @_; 3170 my ($self) = @_;
3006 3171
3007 $self->{current}->size_request 3172 $self->{current}->size_request
3008} 3173}
3009 3174
3010sub size_allocate { 3175sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3176 my ($self, $w, $h) = @_;
3012 3177
3013 $self->{current}->configure (0, 0, $w, $h); 3178 $self->{current}->configure (0, 0, $w, $h);
3179
3180 1
3014} 3181}
3015 3182
3016sub _draw { 3183sub _draw {
3017 my ($self) = @_; 3184 my ($self) = @_;
3018 3185
… …
3057 3224
3058sub set_current_page { 3225sub set_current_page {
3059 my ($self, $page) = @_; 3226 my ($self, $page) = @_;
3060 3227
3061 $self->{multiplexer}->set_current_page ($page); 3228 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3229 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3230}
3064 3231
3065############################################################################# 3232#############################################################################
3066 3233
3067package CFClient::UI::Statusbox; 3234package CFClient::UI::Combobox;
3068 3235
3236use utf8;
3237
3069our @ISA = CFClient::UI::VBox::; 3238our @ISA = CFClient::UI::Button::;
3070 3239
3071sub new { 3240sub new {
3072 my $class = shift; 3241 my $class = shift;
3073 3242
3074 $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
3244 options => [], # [value, title, longdesc], ...
3245 value => undef,
3246 @_,
3247 );
3248
3249 $self->_set_value ($self->{value});
3250
3251 $self
3252}
3253
3254sub invoke_button_down {
3255 my ($self, $ev) = @_;
3256
3257 my @menu_items;
3258
3259 for (@{ $self->{options} }) {
3260 my ($value, $title, $tooltip) = @$_;
3261
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 }
3264
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266}
3267
3268sub _set_value {
3269 my ($self, $value) = @_;
3270
3271 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3272 or return;
3273
3274 $self->{value} = $item->[0];
3275 $self->set_markup ("$item->[1] ⇓");
3276 $self->set_tooltip ($item->[2]);
3277}
3278
3279sub set_value {
3280 my ($self, $value) = @_;
3281
3282 return unless $self->{value} ne $value;
3283
3284 $self->_set_value ($value);
3285 $self->emit (changed => $value);
3286}
3287
3288#############################################################################
3289
3290package CFClient::UI::Statusbox;
3291
3292our @ISA = CFClient::UI::VBox::;
3293
3294sub new {
3295 my $class = shift;
3296
3297 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3298 fontsize => 0.8,
3076 @_, 3299 @_,
3077 ) 3300 );
3301
3302 Scalar::Util::weaken (my $this = $self);
3303
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305
3306 $self
3078} 3307}
3079 3308
3080sub reorder { 3309sub reorder {
3081 my ($self) = @_; 3310 my ($self) = @_;
3082 my $NOW = time; 3311 my $NOW = Time::HiRes::time;
3312
3313 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} };
3083 3317
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3318 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3319 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3320 }
3087 3321
… …
3090 my @items = sort { 3324 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3325 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3326 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3327 } values %{ $self->{item} };
3094 3328
3329 $self->{timer}->interval (1);
3330
3095 my $count = 10 + 1; 3331 my $count = 10 + 1;
3096 for my $item (@items) { 3332 for my $item (@items) {
3097 last unless --$count; 3333 last unless --$count;
3098 3334
3099 push @widgets, $item->{label} ||= do { 3335 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3336 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3337 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3338 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3339 : $item->{text};
3104 3340
… …
3112 tooltip => $item->{tooltip}, 3348 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3349 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3350 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3351 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3352 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3353 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3354 can_events => 1,
3119 can_hover => 1 3355 can_hover => 1
3120 }; 3356 };
3357
3358 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3359 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3360 $label->update;
3361 $label->set_max_size (undef, $label->{req_h} * $diff)
3362 if $diff < 1;
3363 $self->{timer}->interval (1/30);
3364 } else {
3365 $label->{fg}[3] = $item->{fg}[3] || 1;
3366 }
3367
3368 push @widgets, $label;
3121 } 3369 }
3122 3370
3123 $self->clear; 3371 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3372 $self->SUPER::add (reverse @widgets);
3125} 3373}
… …
3130 $text =~ s/^\s+//; 3378 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3379 $text =~ s/\s+$//;
3132 3380
3133 return unless $text; 3381 return unless $text;
3134 3382
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3383 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3384
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3385 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3386
3139 if (my $item = $self->{item}{$group}) { 3387 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3388 if ($item->{text} eq $text) {
3141 $item->{count}++; 3389 $item->{count}++;
3142 } else { 3390 } else {
3143 $item->{count} = 1; 3391 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text; 3392 $item->{text} = $item->{tooltip} = $text;
3145 } 3393 }
3146 $item->{id} = ++$self->{id}; 3394 $item->{id} += 0.2;#d#
3147 $item->{timeout} = $timeout; 3395 $item->{timeout} = $timeout;
3148 delete $item->{label}; 3396 delete $item->{label};
3149 } else { 3397 } else {
3150 $self->{item}{$group} = { 3398 $self->{item}{$group} = {
3151 id => ++$self->{id}, 3399 id => ++$self->{id},
… …
3170 3418
3171 $self->reorder; 3419 $self->reorder;
3172 $self->SUPER::reconfigure; 3420 $self->SUPER::reconfigure;
3173} 3421}
3174 3422
3423sub destroy {
3424 my ($self) = @_;
3425
3426 $self->{timer}->cancel;
3427
3428 $self->SUPER::destroy;
3429}
3430
3175############################################################################# 3431#############################################################################
3176 3432
3177package CFClient::UI::Inventory; 3433package CFClient::UI::Inventory;
3178 3434
3179our @ISA = CFClient::UI::ScrolledWindow::; 3435our @ISA = CFClient::UI::ScrolledWindow::;
… …
3278 $self->update_binding_widgets; 3534 $self->update_binding_widgets;
3279 3535
3280 $self 3536 $self
3281} 3537}
3282 3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3283sub commit { 3551sub commit {
3284 my ($self) = @_; 3552 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding; 3553 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) { 3554 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3321 my ($self) = @_; 3589 my ($self) = @_;
3322 $self->ask_for_bind (1); 3590 $self->ask_for_bind (1);
3323} 3591}
3324 3592
3325sub ask_for_bind { 3593sub ask_for_bind {
3326 my ($self, $commit) = @_; 3594 my ($self, $commit, $end_cb) = @_;
3327 3595
3328 CFClient::Binder::open_binding_dialog (sub { 3596 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_; 3597 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets; 3599 $self->update_binding_widgets;
3332 $self->commit if $commit; 3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3333 }); 3602 });
3334} 3603}
3335 3604
3336# $mod and $sym are the modifiers and key symbol 3605# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands) 3606# $cmds is a array ref of strings (the commands)
… …
3355} 3624}
3356 3625
3357# this is a shortcut method that asks for a binding 3626# this is a shortcut method that asks for a binding
3358# and then just binds it. 3627# and then just binds it.
3359sub do_quick_binding { 3628sub do_quick_binding {
3360 my ($self, $cmds) = @_; 3629 my ($self, $cmds, $end_cb) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub { 3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1); 3631 $self->ask_for_bind (1, $end_cb);
3365} 3632}
3366 3633
3367sub update_binding_widgets { 3634sub update_binding_widgets {
3368 my ($self) = @_; 3635 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding; 3636 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3425 commands => [], 3692 commands => [],
3426 @_, 3693 @_,
3427 ) 3694 )
3428} 3695}
3429 3696
3430# XXX: Do sorting? Argl... 3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3431sub add_spell { 3782sub add_spell {
3432 my ($self, $spell) = @_; 3783 my ($self, $spell) = @_;
3784
3433 $self->{spells}->{$spell->{name}} = $spell; 3785 $self->{spell}->{$spell->{name}} = $spell;
3434 3786 $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} 3787}
3463 3788
3464sub remove_spell { 3789sub remove_spell {
3465 my ($self, $spell) = @_; 3790 my ($self, $spell) = @_;
3791
3466 delete $self->{spells}->{$spell->{name}}; 3792 delete $self->{spell}->{$spell->{name}};
3467 $self->rebuild_spell_list; 3793 $self->rebuild_spell_list;
3468} 3794}
3469 3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3470############################################################################# 3803#############################################################################
3471 3804
3472package CFClient::UI::Root; 3805package CFClient::UI::Root;
3473 3806
3474our @ISA = CFClient::UI::Container::; 3807our @ISA = CFClient::UI::Container::;
3808
3809use List::Util qw(min max);
3475 3810
3476use CFClient::OpenGL; 3811use CFClient::OpenGL;
3477 3812
3478sub new { 3813sub new {
3479 my $class = shift; 3814 my $class = shift;
… …
3506 $coord = $max - $size if $coord > $max - $size; 3841 $coord = $max - $size if $coord > $max - $size;
3507 3842
3508 int $coord + 0.5 3843 int $coord + 0.5
3509} 3844}
3510 3845
3511sub size_allocate { 3846sub invoke_size_allocate {
3512 my ($self, $w, $h) = @_; 3847 my ($self, $w, $h) = @_;
3513 3848
3514 for my $child ($self->children) { 3849 for my $child ($self->children) {
3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3850 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3516 3851
… …
3520 $X = _to_pixel $X, $W, $self->{w}; 3855 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h}; 3856 $Y = _to_pixel $Y, $H, $self->{h};
3522 3857
3523 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
3524 } 3859 }
3860
3861 1
3525} 3862}
3526 3863
3527sub coord2local { 3864sub coord2local {
3528 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
3529 3866
… …
3614 3951
3615 delete $queue{$widget+0}; 3952 delete $queue{$widget+0};
3616 3953
3617 my ($w, $h) = $widget->size_request; 3954 my ($w, $h) = $widget->size_request;
3618 3955
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3956 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3957 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621 3961
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 3962 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 3963 $h = $widget->{force_h} if exists $widget->{force_h};
3624 3964
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3965 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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