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.329 by root, Sun Jul 23 02:44:06 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 $FOCUS = $self;
427 429
428 $self->_emit (focus_in => $focus); 430 $self->update;
429 431
430 $focus->update if $focus; 432 0
431 $FOCUS->update;
432} 433}
433 434
434sub focus_out { 435sub invoke_focus_out {
435 my ($self) = @_; 436 my ($self) = @_;
436 437
437 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
438 439
439 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
440 441
441 $self->_emit (focus_out => $focus); 442 $self->update;
442 443
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 445 unless $FOCUS;
447}
448 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
449sub mouse_motion { 0 } 457sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 458sub invoke_button_up { 0 }
451sub key_down { 0 } 459sub invoke_key_down { 0 }
452sub key_up { 0 } 460sub invoke_key_up { 0 }
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 0
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 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480
481 #d##TODO# stop propagating at first true, do not use sum
482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 485}
461 486
462sub find_widget { 487sub find_widget {
463 my ($self, $x, $y) = @_; 488 my ($self, $x, $y) = @_;
464 489
… …
474sub set_parent { 499sub set_parent {
475 my ($self, $parent) = @_; 500 my ($self, $parent) = @_;
476 501
477 Scalar::Util::weaken ($self->{parent} = $parent); 502 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 503 $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} 504}
503 505
504sub realloc { 506sub realloc {
505 my ($self) = @_; 507 my ($self) = @_;
506 508
… …
539 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
540 542
541 # update screen rectangle 543 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 544 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 545 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 546
547 # skip widgets that are entirely outside the drawing area 547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 550
551 glPushMatrix; 551 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 553
556 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 556 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 558 glBegin GL_QUADS;
563 glVertex $x , $y; 559 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
567 glEnd; 563 glEnd;
568 glDisable GL_BLEND; 564 glDisable GL_BLEND;
569 } 565 }
570 566
571 if ($ENV{CFPLUS_DEBUG} & 1) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 568 glPushMatrix;
573 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 572 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
580 glEnd; 576 glEnd;
581 glPopMatrix; 577 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
584} 583}
585 584
586sub _draw { 585sub _draw {
587 my ($self) = @_; 586 my ($self) = @_;
588 587
… …
590} 589}
591 590
592sub DESTROY { 591sub DESTROY {
593 my ($self) = @_; 592 my ($self) = @_;
594 593
594 return if CFClient::in_destruct;
595
595 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
596 #$self->deactivate; 597
598 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 600}
598 601
599############################################################################# 602#############################################################################
600 603
601package CFClient::UI::DrawBG; 604package CFClient::UI::DrawBG;
… …
626 629
627 if ($color && (@$color < 4 || $color->[3])) { 630 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 631 my ($w, $h) = @$self{qw(w h)};
629 632
630 glEnable GL_BLEND; 633 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 634 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 635 glColor_premultiply @$color;
633 636
634 glBegin GL_QUADS; 637 glBegin GL_QUADS;
635 glVertex 0 , 0; 638 glVertex 0 , 0;
636 glVertex 0 , $h; 639 glVertex 0 , $h;
637 glVertex $w, $h; 640 glVertex $w, $h;
… …
766} 769}
767 770
768sub add { 771sub add {
769 my ($self, $child) = @_; 772 my ($self, $child) = @_;
770 773
771 $self->{children} = []; 774 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 775 $self->SUPER::add ($child);
774} 776}
775 777
776sub remove { 778sub remove {
777 my ($self, $widget) = @_; 779 my ($self, $widget) = @_;
… …
786 788
787sub size_request { 789sub size_request {
788 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
789} 791}
790 792
791sub size_allocate { 793sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 794 my ($self, $w, $h) = @_;
793 795
794 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
797
798 1
795} 799}
796 800
797############################################################################# 801#############################################################################
802
803# back-buffered drawing area
798 804
799package CFClient::UI::Window; 805package CFClient::UI::Window;
800 806
801our @ISA = CFClient::UI::Bin::; 807our @ISA = CFClient::UI::Bin::;
802 808
… …
813 819
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 820 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 821 $self->SUPER::update;
816} 822}
817 823
818sub size_allocate { 824sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
820 826
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 827 $self->update;
828
829 $self->SUPER::invoke_size_allocate ($w, $h)
823} 830}
824 831
825sub _render { 832sub _render {
826 my ($self) = @_; 833 my ($self) = @_;
827 834
… …
854 my $tex = $self->{texture} 861 my $tex = $self->{texture}
855 or return; 862 or return;
856 863
857 glEnable GL_TEXTURE_2D; 864 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 866 glColor 0, 0, 0, 1;
860 867
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 869
863 glDisable GL_TEXTURE_2D; 870 glDisable GL_TEXTURE_2D;
864} 871}
… …
888 $h = 10 if $self->{scroll_y}; 895 $h = 10 if $self->{scroll_y};
889 896
890 ($w, $h) 897 ($w, $h)
891} 898}
892 899
893sub size_allocate { 900sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 901 my ($self, $w, $h) = @_;
895 902
896 my $child = $self->child; 903 my $child = $self->child;
897 904
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 905 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 906 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 907
901 $self->child->configure (0, 0, $w, $h); 908 $self->child->configure (0, 0, $w, $h);
902 $self->update; 909 $self->update;
910
911 1
903} 912}
904 913
905sub set_offset { 914sub set_offset {
906 my ($self, $x, $y) = @_; 915 my ($self, $x, $y) = @_;
907 916
… …
981 $self->add ($child) if $child; 990 $self->add ($child) if $child;
982 991
983 $self 992 $self
984} 993}
985 994
995#TODO# update range on size_allocate depending on child
996
986sub add { 997sub add {
987 my ($self, $widget) = @_; 998 my ($self, $widget) = @_;
988 999
989 $self->{vp}->add ($self->{child} = $widget); 1000 $self->{vp}->add ($self->{child} = $widget);
990} 1001}
991 1002
1003sub invoke_button_up {
1004 my ($self, $ev) = @_;
1005
1006 warn "button up $ev->{button}\n";#d#
1007
1008 0
1009}
1010
1011sub update_slider {
1012 my ($self) = @_;
1013
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1015}
1016
992sub update { 1017sub update {
993 my ($self) = @_; 1018 my ($self) = @_;
994 1019
995 $self->SUPER::update; 1020 $self->SUPER::update;
996 1021
997 # todo: overwrite size_allocate of child 1022 $self->update_slider;
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1000} 1023}
1001 1024
1002sub size_allocate { 1025sub invoke_size_allocate {
1003 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
1004 1027
1028 $self->update_slider;
1029
1005 $self->SUPER::size_allocate ($w, $h); 1030 $self->SUPER::invoke_size_allocate ($w, $h)
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009} 1031}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
1013 1032
1014############################################################################# 1033#############################################################################
1015 1034
1016package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
1017 1036
… …
1033 1052
1034 if ($self->{bg}) { 1053 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1054 my ($w, $h) = @$self{qw(w h)};
1036 1055
1037 glEnable GL_BLEND; 1056 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1057 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1058 glColor_premultiply @{ $self->{bg} };
1040 1059
1041 glBegin GL_QUADS; 1060 glBegin GL_QUADS;
1042 glVertex 0 , 0; 1061 glVertex 0 , 0;
1043 glVertex 0 , $h; 1062 glVertex 0 , $h;
1044 glVertex $w, $h; 1063 glVertex $w, $h;
… …
1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1087 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1069 1088
1070sub new { 1089sub new {
1071 my ($class, %arg) = @_; 1090 my ($class, %arg) = @_;
1072 1091
1073 my $title = delete $arg{title};
1074
1075 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1095 border => 0.6,
1079 can_events => 1, 1096 can_events => 1,
1080 min_w => 16, 1097 min_w => 64,
1081 min_h => 16, 1098 min_h => 32,
1082 %arg, 1099 %arg,
1083 ); 1100 );
1084 1101
1085 $self->{title} = new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
1086 align => 0, 1103 align => 0,
1087 valign => 1, 1104 valign => 1,
1088 text => $title, 1105 text => $self->{title},
1089 fontsize => $self->{border} 1106 fontsize => $self->{border},
1090 if defined $title; 1107 if exists $self->{title};
1108
1109 if ($self->{has_close_button}) {
1110 $self->{close_button} =
1111 new CFClient::UI::ImageButton
1112 path => 'x1_close.png',
1113 on_activate => sub { $self->emit ("delete") };
1114
1115 $self->CFClient::UI::Container::add ($self->{close_button});
1116 }
1091 1117
1092 $self 1118 $self
1093} 1119}
1094 1120
1095sub add { 1121sub add {
1096 my ($self, @widgets) = @_; 1122 my ($self, @widgets) = @_;
1097 1123
1098 $self->SUPER::add (@widgets); 1124 $self->SUPER::add (@widgets);
1125 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1126 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1100} 1127}
1101 1128
1102sub border { 1129sub border {
1103 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
1104} 1131}
1105 1132
1106sub size_request { 1133sub size_request {
1107 my ($self) = @_; 1134 my ($self) = @_;
1108 1135
1109 $self->{title}->size_request 1136 $self->{title_widget}->size_request
1110 if $self->{title}; 1137 if $self->{title_widget};
1138
1139 $self->{close_button}->size_request
1140 if $self->{close_button};
1111 1141
1112 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
1113 1143
1114 ( 1144 (
1115 $w + $self->border * 2, 1145 $w + $self->border * 2,
1116 $h + $self->border * 2, 1146 $h + $self->border * 2,
1117 ) 1147 )
1118} 1148}
1119 1149
1120sub size_allocate { 1150sub invoke_size_allocate {
1121 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1122 1152
1123 if ($self->{title}) { 1153 if ($self->{title_widget}) {
1124 $self->{title}{w} = $w; 1154 $self->{title_widget}{w} = $w;
1125 $self->{title}{h} = $h; 1155 $self->{title_widget}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h); 1156 $self->{title_widget}->invoke_size_allocate ($w, $h);
1127 } 1157 }
1128 1158
1129 my $border = $self->border; 1159 my $border = $self->border;
1130 1160
1131 $h -= List::Util::max 0, $border * 2; 1161 $h -= List::Util::max 0, $border * 2;
1132 $w -= List::Util::max 0, $border * 2; 1162 $w -= List::Util::max 0, $border * 2;
1163
1164 $self->child->configure ($border, $border, $w, $h);
1165
1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1167 if $self->{close_button};
1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1133 1176
1134 $self->child->configure ($border, $border, $w, $h); 1177 1
1135} 1178}
1136 1179
1137sub button_down { 1180sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1139 1182
1140 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
1141 my $border = $self->border; 1184 my $border = $self->border;
1142 1185
… …
1158 my $dy = $ev->{y} - $oy; 1201 my $dy = $ev->{y} - $oy;
1159 1202
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1203 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1204 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1205
1206 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1207 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1208 };
1166 1209
1167 } elsif ($lr ^ $td) { 1210 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1211 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1212 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1215 my ($ev, $x, $y) = @_;
1173 1216
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1218
1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1220 # HACK: the next line is required to enforce placement
1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1177 }; 1222 };
1178 } else { 1223 } else {
1179 return 0; 1224 return 0;
1180 } 1225 }
1181 1226
1182 1 1227 1
1183} 1228}
1184 1229
1185sub button_up { 1230sub invoke_button_up {
1186 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1187 1232
1188 !!delete $self->{motion} 1233 ! ! delete $self->{motion}
1189} 1234}
1190 1235
1191sub mouse_motion { 1236sub invoke_mouse_motion {
1192 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1193 1238
1194 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195 1240
1196 !!$self->{motion} 1241 ! ! $self->{motion}
1197} 1242}
1198 1243
1199sub _draw { 1244sub _draw {
1200 my ($self) = @_; 1245 my ($self) = @_;
1201 1246
… …
1227 1272
1228 glDisable GL_TEXTURE_2D; 1273 glDisable GL_TEXTURE_2D;
1229 1274
1230 $child->draw; 1275 $child->draw;
1231 1276
1232 if ($self->{title}) { 1277 if ($self->{title_widget}) {
1233 glTranslate 0, $border - $self->{h}; 1278 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw; 1279 $self->{title_widget}->_draw;
1280
1281 glTranslate 0, - ($border - $self->{h});
1235 } 1282 }
1283
1284 $self->{close_button}->draw
1285 if $self->{close_button};
1236} 1286}
1237 1287
1238############################################################################# 1288#############################################################################
1239 1289
1240package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1263 1313
1264 $child->set_parent ($self); 1314 $child->set_parent ($self);
1265 $self->{children}[$y][$x] = $child; 1315 $self->{children}[$y][$x] = $child;
1266 1316
1267 $self->realloc; 1317 $self->realloc;
1318}
1319
1320sub remove {
1321 my ($self, $child) = @_;
1322
1323 # TODO: not yet implemented
1268} 1324}
1269 1325
1270# TODO: move to container class maybe? send children a signal on removal? 1326# TODO: move to container class maybe? send children a signal on removal?
1271sub clear { 1327sub clear {
1272 my ($self) = @_; 1328 my ($self) = @_;
… …
1313 (sum @$ws), 1369 (sum @$ws),
1314 (sum @$hs), 1370 (sum @$hs),
1315 ) 1371 )
1316} 1372}
1317 1373
1318sub size_allocate { 1374sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1320 1376
1321 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1322 1378
1323 my $req_w = (sum @$ws) || 1; 1379 my $req_w = (sum @$ws) || 1;
… …
1355 } 1411 }
1356 1412
1357 $y += $row_h; 1413 $y += $row_h;
1358 } 1414 }
1359 1415
1416 1
1360} 1417}
1361 1418
1362sub find_widget { 1419sub find_widget {
1363 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1364 1421
… …
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1459 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 ) 1460 )
1404} 1461}
1405 1462
1406sub size_allocate { 1463sub invoke_size_allocate {
1407 my ($self, $w, $h) = @_; 1464 my ($self, $w, $h) = @_;
1408 1465
1409 my $space = $self->{vertical} ? $h : $w; 1466 my $space = $self->{vertical} ? $h : $w;
1410 my $children = $self->{children}; 1467 my @children = $self->visible_children;
1411 1468
1412 my @req; 1469 my @req;
1413 1470
1414 if ($self->{homogeneous}) { 1471 if ($self->{homogeneous}) {
1415 @req = ($space / (@$children || 1)) x @$children; 1472 @req = ($space / (@children || 1)) x @children;
1416 } else { 1473 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1474 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1418 my $req = List::Util::sum @req; 1475 my $req = List::Util::sum @req;
1419 1476
1420 if ($req > $space) { 1477 if ($req > $space) {
1421 # ah well, not enough space 1478 # ah well, not enough space
1422 $_ *= $space / $req for @req; 1479 $_ *= $space / $req for @req;
1423 } else { 1480 } else {
1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1481 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1425 1482
1426 $space = ($space - $req) / $expand; # remaining space to give away 1483 $space = ($space - $req) / $expand; # remaining space to give away
1427 1484
1428 $req[$_] += $space * $children->[$_]{expand} 1485 $req[$_] += $space * $children[$_]{expand}
1429 for 0 .. $#$children; 1486 for 0 .. $#children;
1430 } 1487 }
1431 } 1488 }
1432 1489
1433 CFClient::UI::harmonize \@req; 1490 CFClient::UI::harmonize \@req;
1434 1491
1435 my $pos = 0; 1492 my $pos = 0;
1436 for (0 .. $#$children) { 1493 for (0 .. $#children) {
1437 my $alloc = $req[$_]; 1494 my $alloc = $req[$_];
1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1495 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1439 1496
1440 $pos += $alloc; 1497 $pos += $alloc;
1441 } 1498 }
1442 1499
1443 1 1500 1
… …
1533 1590
1534 delete $self->{texture}; 1591 delete $self->{texture};
1535 $self->SUPER::update; 1592 $self->SUPER::update;
1536} 1593}
1537 1594
1595sub realloc {
1596 my ($self) = @_;
1597
1598 delete $self->{ox};
1599 $self->SUPER::realloc;
1600}
1601
1538sub set_text { 1602sub set_text {
1539 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1540 1604
1541 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1543 1607
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1546 1609
1610 delete $self->{size_req};
1547 $self->realloc; 1611 $self->realloc;
1548 $self->update; 1612 $self->update;
1549} 1613}
1550 1614
1551sub set_markup { 1615sub set_markup {
… …
1554 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1555 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1556 1620
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1622
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1560 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1561 1624
1625 delete $self->{size_req};
1562 $self->realloc; 1626 $self->realloc;
1563 $self->update; 1627 $self->update;
1564} 1628}
1565 1629
1566sub size_request { 1630sub size_request {
1567 my ($self) = @_; 1631 my ($self) = @_;
1568 1632
1633 $self->{size_req} ||= do {
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1635 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1639
1575 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1576 1641
1577 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1578 $self->{template}->set_font ($self->{font}) if $self->{font}; 1643 $self->{template}->set_font ($self->{font}) if $self->{font};
1644 $self->{template}->set_width ($self->{max_w} || -1);
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1646
1581 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1582 1648
1583 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1650 $h = List::Util::max $h, $h2;
1651 }
1652
1653 [$w, $h]
1585 } 1654 };
1586 1655
1587 ($w, $h) 1656 @{ $self->{size_req} }
1588} 1657}
1589 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1590sub size_allocate { 1663sub invoke_size_allocate {
1591 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1592 1665
1593 delete $self->{ox}; 1666 delete $self->{ox};
1594 1667
1595 delete $self->{texture} 1668 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1669 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1670
1671 1
1597} 1672}
1598 1673
1599sub set_fontsize { 1674sub set_fontsize {
1600 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1601 1676
1602 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1603 delete $self->{texture}; 1679 delete $self->{texture};
1604 1680
1605 $self->realloc; 1681 $self->realloc;
1606} 1682}
1607 1683
1684sub reconfigure {
1685 my ($self) = @_;
1686
1687 delete $self->{size_req};
1688 delete $self->{texture};
1689
1690 $self->SUPER::reconfigure;
1691}
1692
1608sub _draw { 1693sub _draw {
1609 my ($self) = @_; 1694 my ($self) = @_;
1610 1695
1611 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1612 1697
1613 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1614 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1615 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1616 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1617 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1620 1705
1621 new_from_layout CFClient::Texture $self->{layout} 1706 [$self->{layout}->size]
1622 }; 1707 };
1623 1708
1624 unless (exists $self->{ox}) { 1709 unless (exists $self->{ox}) {
1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1627 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1628 1713
1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1632 }; 1717 };
1633 1718
1634 glEnable GL_TEXTURE_2D; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1636 1721
1637 if ($tex->{format} == GL_ALPHA) { 1722 $self->{layout}->render ($self->{ox}, $self->{oy});
1638 glColor @{$self->{fg}};
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640 } else {
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642 }
1643
1644 glDisable GL_TEXTURE_2D;
1645} 1723}
1646 1724
1647############################################################################# 1725#############################################################################
1648 1726
1649package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1663 can_hover => 1, 1741 can_hover => 1,
1664 can_focus => 1, 1742 can_focus => 1,
1665 valign => 0, 1743 valign => 0,
1666 can_events => 1, 1744 can_events => 1,
1667 #text => ... 1745 #text => ...
1746 #hidden => "*",
1668 @_ 1747 @_
1669 ) 1748 )
1670} 1749}
1671 1750
1672sub _set_text { 1751sub _set_text {
… …
1674 1753
1675 delete $self->{cur_h}; 1754 delete $self->{cur_h};
1676 1755
1677 return if $self->{text} eq $text; 1756 return if $self->{text} eq $text;
1678 1757
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 1758 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1759 $self->{text} = $text;
1683 1760
1684 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1763 delete $self->{size_req};
1686 1764
1687 $self->_emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1766
1767 $self->realloc;
1768 $self->update;
1688} 1769}
1689 1770
1690sub set_text { 1771sub set_text {
1691 my ($self, $text) = @_; 1772 my ($self, $text) = @_;
1692 1773
1693 $self->{cursor} = length $text; 1774 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1775 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1776}
1698 1777
1699sub get_text { 1778sub get_text {
1700 $_[0]{text} 1779 $_[0]{text}
1701} 1780}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1707 1786
1708 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1709} 1788}
1710 1789
1711sub key_down { 1790sub invoke_key_down {
1712 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1713 1792
1714 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1807 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1808 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1809 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1812 $self->emit ('escape');
1734 } elsif ($uni) { 1813 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1815 } else {
1737 return 0; 1816 return 0;
1738 } 1817 }
… …
1742 $self->realloc; 1821 $self->realloc;
1743 1822
1744 1 1823 1
1745} 1824}
1746 1825
1747sub focus_in { 1826sub invoke_focus_in {
1748 my ($self) = @_; 1827 my ($self) = @_;
1749 1828
1750 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1751 1830
1752 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1753} 1832}
1754 1833
1755sub button_down { 1834sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1757 1836
1758 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1838
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1840
1762 # byte-index to char-index 1841 # byte-index to char-index
1763 my $text = $self->{text}; 1842 my $text = $self->{text};
1764 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1766 1845
1767 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1768 $self->update; 1847 $self->update;
1769 1848
1770 1 1849 1
1771} 1850}
1772 1851
1773sub mouse_motion { 1852sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1854# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776 1855
1777 0 1856 1
1778} 1857}
1779 1858
1780sub _draw { 1859sub _draw {
1781 my ($self) = @_; 1860 my ($self) = @_;
1782 1861
1783 local $self->{fg} = $self->{fg}; 1862 local $self->{fg} = $self->{fg};
1784 1863
1785 if ($FOCUS == $self) { 1864 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 1865 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 1866 $self->{fg} = $self->{active_fg};
1788 } else { 1867 } else {
1789 glColor @{$self->{bg}}; 1868 glColor_premultiply @{$self->{bg}};
1790 } 1869 }
1791 1870
1792 glEnable GL_BLEND; 1871 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1872 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 1873 glBegin GL_QUADS;
1795 glVertex 0 , 0; 1874 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 1875 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 1876 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 1877 glVertex $self->{w}, 0;
… …
1823 1902
1824our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1825 1904
1826use CFClient::OpenGL; 1905use CFClient::OpenGL;
1827 1906
1828sub key_down { 1907sub invoke_key_down {
1829 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1830 1909
1831 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1832 1911
1833 if ($sym == 13) { 1912 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1836 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1918 $self->emit (activate => $txt);
1839 $self->update; 1919 $self->update;
1840 1920
1841 } elsif ($sym == CFClient::SDLK_UP) { 1921 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1922 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1923 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1939 } else {
1860 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1861 } 1941 }
1862 1942
1863 } else { 1943 } else {
1864 return $self->SUPER::key_down ($ev) 1944 return $self->SUPER::invoke_key_down ($ev)
1865 } 1945 }
1866 1946
1867 1 1947 1
1868} 1948}
1869 1949
… …
1893 can_events => 1, 1973 can_events => 1,
1894 @_ 1974 @_
1895 ) 1975 )
1896} 1976}
1897 1977
1898sub activate { }
1899
1900sub button_up { 1978sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1902 1980
1903 $self->emit ("activate") 1981 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 1983 && $y >= 0 && $y < $self->{h};
… …
1908} 1986}
1909 1987
1910sub _draw { 1988sub _draw {
1911 my ($self) = @_; 1989 my ($self) = @_;
1912 1990
1913 local $self->{fg} = $self->{fg}; 1991 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 1992
1919 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 1995 glColor 0, 0, 0, 1;
1922 1996
1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1997 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1924 1998
1925 glDisable GL_TEXTURE_2D; 1999 glDisable GL_TEXTURE_2D;
1926 2000
1927 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
2002}
2003
2004#############################################################################
2005
2006package CFClient::UI::ImageButton;
2007
2008our @ISA = CFClient::UI::Image::;
2009
2010use CFClient::OpenGL;
2011
2012my %textures;
2013
2014sub new {
2015 my $class = shift;
2016
2017 my $self = $class->SUPER::new (
2018 padding_x => 4,
2019 padding_y => 4,
2020 fg => [1, 1, 1],
2021 active_fg => [0, 0, 1],
2022 can_hover => 1,
2023 align => 0,
2024 valign => 0,
2025 can_events => 1,
2026 @_
2027 );
2028}
2029
2030sub invoke_button_up {
2031 my ($self, $ev, $x, $y) = @_;
2032
2033 $self->emit ("activate")
2034 if $x >= 0 && $x < $self->{w}
2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
1928} 2038}
1929 2039
1930############################################################################# 2040#############################################################################
1931 2041
1932package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
… …
1959 my ($self) = @_; 2069 my ($self) = @_;
1960 2070
1961 (6) x 2 2071 (6) x 2
1962} 2072}
1963 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1964sub button_down { 2082sub invoke_button_down {
1965 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1966 2084
1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1969 $self->{state} = !$self->{state}; 2087 $self->toggle;
1970 $self->_emit (changed => $self->{state});
1971 } else { 2088 } else {
1972 return 0 2089 return 0
1973 } 2090 }
1974 2091
1975 1 2092 1
… …
2000package CFClient::UI::Image; 2117package CFClient::UI::Image;
2001 2118
2002our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
2003 2120
2004use CFClient::OpenGL; 2121use CFClient::OpenGL;
2005use Carp qw/confess/;
2006 2122
2007our %loaded_images; 2123our %texture_cache;
2008 2124
2009sub new { 2125sub new {
2010 my $class = shift; 2126 my $class = shift;
2011 2127
2012 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
2013 2132
2014 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2133 $self->{path} || $self->{tex}
2134 or Carp::croak "'path' or 'tex' attributes required";
2015 2135
2016 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2017 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2018 2138
2019 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2020 2140
2021 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2022
2023 $self->{aspect} = $tex->{w} / $tex->{h};
2024 2142
2025 $self 2143 $self
2026} 2144}
2027 2145
2028sub size_request { 2146sub size_request {
2029 my ($self) = @_; 2147 my ($self) = @_;
2030 2148
2031 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
2032} 2150}
2033 2151
2034sub _draw { 2152sub _draw {
2035 my ($self) = @_; 2153 my ($self) = @_;
2036 2154
… …
2145 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2146 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2147 2265
2148 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2149 my $h2 = $self->{h} * (1 - $ycut2); 2267 my $h2 = $self->{h} * (1 - $ycut2);
2268 my $h3 = $self->{h};
2269
2270 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2150 2271
2151 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2276 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2277
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2278 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2279 glBegin GL_QUADS;
… …
2172 2294
2173 if ($t3) { 2295 if ($t3) {
2174 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2175 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2176 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2177 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2178 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2179 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2180 glEnd; 2302 glEnd;
2181 } 2303 }
2182 2304
2183 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2271 $self->update; 2393 $self->update;
2272 2394
2273 $self 2395 $self
2274} 2396}
2275 2397
2276sub changed { }
2277
2278sub set_range { 2398sub set_range {
2279 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2280 2400
2281 ($range, $self->{range}) = ($self->{range}, $range); 2401 ($range, $self->{range}) = ($self->{range}, $range);
2282 2402
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 2403 if ("@$range" ne "@{$self->{range}}") {
2404 $self->update;
2405 $self->set_value ($self->{range}[0]);
2406 }
2285} 2407}
2286 2408
2287sub set_value { 2409sub set_value {
2288 my ($self, $value) = @_; 2410 my ($self, $value) = @_;
2289 2411
… …
2300 if $unit; 2422 if $unit;
2301 2423
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303 2425
2304 if ($value != $old_value) { 2426 if ($value != $old_value) {
2305 $self->_emit (changed => $value); 2427 $self->emit (changed => $value);
2306 $self->update; 2428 $self->update;
2307 } 2429 }
2308} 2430}
2309 2431
2310sub size_request { 2432sub size_request {
2311 my ($self) = @_; 2433 my ($self) = @_;
2312 2434
2313 ($self->{req_w}, $self->{req_h}) 2435 ($self->{req_w}, $self->{req_h})
2314} 2436}
2315 2437
2316sub button_down { 2438sub invoke_button_down {
2317 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2318 2440
2319 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2320 2442
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322 2444
2323 $self->mouse_motion ($ev, $x, $y) 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2324} 2446}
2325 2447
2326sub mouse_motion { 2448sub invoke_mouse_motion {
2327 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2328 2450
2329 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331 2453
… …
2342} 2464}
2343 2465
2344sub update { 2466sub update {
2345 my ($self) = @_; 2467 my ($self) = @_;
2346 2468
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2469 delete $self->{knob_w};
2470 $self->SUPER::update;
2471}
2472
2473sub _draw {
2474 my ($self) = @_;
2475
2476 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 2477 $self->set_value ($self->{range}[0]);
2349 2478
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2479 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2480 my $range = ($hi - $page - $lo) || 1e-100;
2352 2481
… …
2358 $value = ($value - $lo) / $range; 2487 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2488 $value = $value * $self->{scale} + $self->{offset};
2360 2489
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2490 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2491 $self->{knob_w} = $knob_w;
2363 }); 2492 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2493
2371 $self->SUPER::_draw (); 2494 $self->SUPER::_draw ();
2372 2495
2373 glScale $self->{w}, $self->{h}; 2496 glScale $self->{w}, $self->{h};
2374 2497
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2558sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2559sub set_value { shift->{slider}->set_value (@_) }
2437 2560
2438############################################################################# 2561#############################################################################
2439 2562
2440package CFClient::UI::TextView; 2563package CFClient::UI::TextScroller;
2441 2564
2442our @ISA = CFClient::UI::HBox::; 2565our @ISA = CFClient::UI::HBox::;
2443 2566
2444use CFClient::OpenGL; 2567use CFClient::OpenGL;
2445 2568
… …
2447 my $class = shift; 2570 my $class = shift;
2448 2571
2449 my $self = $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2450 fontsize => 1, 2573 fontsize => 1,
2451 can_events => 0, 2574 can_events => 0,
2575 indent => 0,
2452 #font => default_font 2576 #font => default_font
2453 @_, 2577 @_,
2454 2578
2455 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2456 par => [], 2580 par => [],
2457 height => 0, 2581 height => 0,
2458 children => [ 2582 children => [
2459 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2471 2595
2472 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2597 $self->reflow;
2474} 2598}
2475 2599
2600sub size_request {
2601 my ($self) = @_;
2602
2603 my ($empty, $slider) = @{ $self->{children} };
2604
2605 local $self->{children} = [$empty, $slider];
2606 $self->SUPER::size_request
2607}
2608
2476sub size_allocate { 2609sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2478 2611
2479 $self->SUPER::size_allocate ($w, $h); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2614
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2617 $self->{layout}->set_width ($empty->{w});
2618 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2619
2485 $self->reflow; 2620 $self->reflow;
2486}
2487 2621
2488sub text_size { 2622 local $self->{children} = [$empty, $slider];
2489 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2490 2628
2491 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2492 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2634 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2635 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2636 $layout->set_markup ($para->{markup});
2637
2638 $layout->set_shapes (
2639 map
2640 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2641 @{$para->{widget}}
2496 2642 );
2643
2497 $layout->size 2644 $layout
2498} 2645}
2499 2646
2500sub reflow { 2647sub reflow {
2501 my ($self) = @_; 2648 my ($self) = @_;
2502 2649
… …
2511 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2512} 2659}
2513 2660
2514sub clear { 2661sub clear {
2515 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2516 2666
2517 $self->{par} = []; 2667 $self->{par} = [];
2518 $self->{height} = 0; 2668 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2670}
2521 2671
2522sub add_paragraph { 2672sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2524 2674
2525 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2526 my ($w, $h) = $self->text_size ($line); 2676
2527 $self->{height} += $h; 2677 $para = {
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2678 w => 1e10,
2679 wrapped => 1,
2680 fg => $color,
2681 indent => $indent,
2682 markup => $text,
2683 widget => \@w,
2529 } 2684 };
2530 2685
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2686 $self->add (@w) if @w;
2687 push @{$self->{par}}, $para;
2688
2689 $self->{need_reflow}++;
2690 $self->update;
2691}
2692
2693sub scroll_to_bottom {
2694 my ($self) = @_;
2695
2696 $self->{scroll_to_bottom} = 1;
2697 $self->update;
2532} 2698}
2533 2699
2534sub update { 2700sub update {
2535 my ($self) = @_; 2701 my ($self) = @_;
2536 2702
… …
2538 2704
2539 return unless $self->{h} > 0; 2705 return unless $self->{h} > 0;
2540 2706
2541 delete $self->{texture}; 2707 delete $self->{texture};
2542 2708
2543 $ROOT->on_post_alloc ($self, sub { 2709 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2711
2546 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2713 my $height = 0;
2548 2714
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2717 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2719
2559 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2560 } 2723 }
2561 2724
2562 $height += $_->[1]; 2725 $height += $para->{h};
2563 } 2726 }
2564 2727
2565 $self->{height} = $height; 2728 $self->{height} = $height;
2566 2729
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2730 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2568 2731
2569 delete $self->{texture}; 2732 delete $self->{texture};
2570 } 2733 }
2571 2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 2740 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
2575 2742
2576 my $top = int $self->{children}[1]{range}[0]; 2743 my $top = int $self->{children}[1]{range}[0];
2577 2744
2578 my $y0 = $top; 2745 my $y0 = $top;
2579 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2580 2747
2581 my $y = 0; 2748 my $y = 0;
2582 2749
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591 for my $par (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2751 my $h = $para->{h};
2593 2752
2594 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 2754
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2600 2756
2601 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2758
2759 if (my @w = @{ $para->{widget} }) {
2760 my @s = $layout->get_shapes;
2761
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 }
2603 } 2771 }
2604 2772
2605 $y += $h; 2773 $y += $h;
2606 } 2774 }
2607
2608 glDisable GL_BLEND;
2609 }; 2775 };
2610 }); 2776 });
2611} 2777}
2612 2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2786}
2787
2613sub _draw { 2788sub _draw {
2614 my ($self) = @_; 2789 my ($self) = @_;
2615 2790
2616 glEnable GL_TEXTURE_2D; 2791 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 2793 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2794 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2621 2796
2622 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2623
2624} 2798}
2625 2799
2626############################################################################# 2800#############################################################################
2627 2801
2628package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2889 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2890 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2891 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2892 . "visible $widget->{visible}";
2719 } 2893 }
2894
2895 $tooltip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//;
2720 2897
2721 $self->add (new CFClient::UI::Label 2898 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2899 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2901 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2912
2736 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2737} 2914}
2738 2915
2739sub size_allocate { 2916sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2741 2918
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 2919 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 2920}
2744 2921
2745sub visibility_change { 2922sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 2923 my ($self, $visible) = @_;
2747 2924
2748 return unless $visible; 2925 return unless $visible;
2749 2926
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 2927 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2752 or return; 2929 or return;
2753 2930
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2932
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2934 if $x + $self->{w} > $self->{root}{w};
2758 2935
2759 $self->move_abs ($x, $y); 2936 $self->move_abs ($x, $y);
2760 }); 2937 });
2761} 2938}
2762 2939
… …
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852 3029
2853 if ($tex) { 3030 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3031 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 3033 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3035 glDisable GL_TEXTURE_2D;
2859 } 3036 }
2860} 3037}
2861 3038
2862sub DESTROY { 3039sub destroy {
2863 my ($self) = @_; 3040 my ($self) = @_;
2864 3041
2865 $self->{timer}->cancel 3042 $self->{timer}->cancel
2866 if $self->{timer}; 3043 if $self->{timer};
2867 3044
2868 $self->SUPER::DESTROY; 3045 $self->SUPER::destroy;
2869} 3046}
2870 3047
2871############################################################################# 3048#############################################################################
2872 3049
2873package CFClient::UI::Buttonbar; 3050package CFClient::UI::Buttonbar;
… …
2894 ); 3071 );
2895 3072
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3073 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3074
2898 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2900 3077
2901 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2902 if (!ref $widget) { 3079 if (!ref $widget) {
3080 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2;
3082
3083 $widget = new CFClient::UI::HBox
3084 can_hover => 1,
3085 can_events => 1,
3086 tooltip => $tooltip,
3087 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1),
3090 ],
3091 ;
3092
3093 } else {
2903 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3095 can_hover => 1,
2905 can_events => 1, 3096 can_events => 1,
2906 text => $widget; 3097 markup => $widget,
3098 tooltip => $tooltip;
3099 }
2907 } 3100 }
2908 3101
2909 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2910 3103
2911 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2916 3109
2917# popup given the event (must be a mouse button down event currently) 3110# popup given the event (must be a mouse button down event currently)
2918sub popup { 3111sub popup {
2919 my ($self, $ev) = @_; 3112 my ($self, $ev) = @_;
2920 3113
2921 $self->_emit ("popdown"); 3114 $self->emit ("popdown");
2922 3115
2923 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3117 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2926 3119
2927 $self->show; 3120 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3121 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3122}
2930 3123
2931sub mouse_motion { 3124sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2933 3126
2934 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2937 3130
2938 0 3131 0
2939} 3132}
2940 3133
2941sub button_up { 3134sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2943 3136
2944 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3138 undef $GRAB;
2946 $self->hide; 3139 $self->hide;
2947 3140
2948 $self->_emit ("popdown"); 3141 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3143 } else {
2951 return 0 3144 return 0
2952 } 3145 }
2953 3146
… …
2980 3173
2981 $self->{current} = $self->{children}[0] 3174 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3175 if @{ $self->{children} };
2983} 3176}
2984 3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3182}
3183
2985sub set_current_page { 3184sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3185 my ($self, $page_or_widget) = @_;
2987 3186
2988 my $widget = ref $page_or_widget 3187 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3188 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3189 : $self->{children}[$page_or_widget];
2991 3190
2992 $self->{current} = $widget; 3191 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3192 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3193
2995 $self->_emit (page_changed => $self->{current}); 3194 $self->emit (page_changed => $self->{current});
2996 3195
2997 $self->realloc; 3196 $self->realloc;
2998} 3197}
2999 3198
3000sub visible_children { 3199sub visible_children {
… …
3005 my ($self) = @_; 3204 my ($self) = @_;
3006 3205
3007 $self->{current}->size_request 3206 $self->{current}->size_request
3008} 3207}
3009 3208
3010sub size_allocate { 3209sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3210 my ($self, $w, $h) = @_;
3012 3211
3013 $self->{current}->configure (0, 0, $w, $h); 3212 $self->{current}->configure (0, 0, $w, $h);
3213
3214 1
3014} 3215}
3015 3216
3016sub _draw { 3217sub _draw {
3017 my ($self) = @_; 3218 my ($self) = @_;
3018 3219
… …
3053 ); 3254 );
3054 3255
3055 $self->{multiplexer}->add ($widget); 3256 $self->{multiplexer}->add ($widget);
3056} 3257}
3057 3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3263}
3264
3058sub set_current_page { 3265sub set_current_page {
3059 my ($self, $page) = @_; 3266 my ($self, $page) = @_;
3060 3267
3061 $self->{multiplexer}->set_current_page ($page); 3268 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3269 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3270}
3064 3271
3065############################################################################# 3272#############################################################################
3066 3273
3067package CFClient::UI::Statusbox; 3274package CFClient::UI::Combobox;
3068 3275
3276use utf8;
3277
3069our @ISA = CFClient::UI::VBox::; 3278our @ISA = CFClient::UI::Button::;
3070 3279
3071sub new { 3280sub new {
3072 my $class = shift; 3281 my $class = shift;
3073 3282
3074 $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
3284 options => [], # [value, title, longdesc], ...
3285 value => undef,
3286 @_,
3287 );
3288
3289 $self->_set_value ($self->{value});
3290
3291 $self
3292}
3293
3294sub invoke_button_down {
3295 my ($self, $ev) = @_;
3296
3297 my @menu_items;
3298
3299 for (@{ $self->{options} }) {
3300 my ($value, $title, $tooltip) = @$_;
3301
3302 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303 }
3304
3305 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306}
3307
3308sub _set_value {
3309 my ($self, $value) = @_;
3310
3311 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3312 or return;
3313
3314 $self->{value} = $item->[0];
3315 $self->set_markup ("$item->[1] ⇓");
3316 $self->set_tooltip ($item->[2]);
3317}
3318
3319sub set_value {
3320 my ($self, $value) = @_;
3321
3322 return unless $self->{value} ne $value;
3323
3324 $self->_set_value ($value);
3325 $self->emit (changed => $value);
3326}
3327
3328#############################################################################
3329
3330package CFClient::UI::Statusbox;
3331
3332our @ISA = CFClient::UI::VBox::;
3333
3334sub new {
3335 my $class = shift;
3336
3337 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3338 fontsize => 0.8,
3076 @_, 3339 @_,
3077 ) 3340 );
3341
3342 Scalar::Util::weaken (my $this = $self);
3343
3344 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345
3346 $self
3078} 3347}
3079 3348
3080sub reorder { 3349sub reorder {
3081 my ($self) = @_; 3350 my ($self) = @_;
3082 my $NOW = time; 3351 my $NOW = Time::HiRes::time;
3352
3353 # freeze display when hovering over any label
3354 return if $CFClient::UI::TOOLTIP->{owner}
3355 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3356 values %{ $self->{item} };
3083 3357
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3358 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3359 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3360 }
3087 3361
… …
3090 my @items = sort { 3364 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3365 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3366 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3367 } values %{ $self->{item} };
3094 3368
3369 $self->{timer}->interval (1);
3370
3095 my $count = 10 + 1; 3371 my $count = 10 + 1;
3096 for my $item (@items) { 3372 for my $item (@items) {
3097 last unless --$count; 3373 last unless --$count;
3098 3374
3099 push @widgets, $item->{label} ||= do { 3375 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3376 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3377 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3378 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3379 : $item->{text};
3104 3380
… …
3112 tooltip => $item->{tooltip}, 3388 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3389 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3390 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3391 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3392 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3393 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3394 can_events => 1,
3119 can_hover => 1 3395 can_hover => 1
3120 }; 3396 };
3397
3398 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3399 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3400 $label->update;
3401 $label->set_max_size (undef, $label->{req_h} * $diff)
3402 if $diff < 1;
3403 $self->{timer}->interval (1/30);
3404 } else {
3405 $label->{fg}[3] = $item->{fg}[3] || 1;
3406 }
3407
3408 push @widgets, $label;
3121 } 3409 }
3122 3410
3123 $self->clear; 3411 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3412 $self->SUPER::add (reverse @widgets);
3125} 3413}
… …
3130 $text =~ s/^\s+//; 3418 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3419 $text =~ s/\s+$//;
3132 3420
3133 return unless $text; 3421 return unless $text;
3134 3422
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3423 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3424
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3425 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3426
3139 if (my $item = $self->{item}{$group}) { 3427 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3428 if ($item->{text} eq $text) {
3141 $item->{count}++; 3429 $item->{count}++;
3142 } else { 3430 } else {
3143 $item->{count} = 1; 3431 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text; 3432 $item->{text} = $item->{tooltip} = $text;
3145 } 3433 }
3146 $item->{id} = ++$self->{id}; 3434 $item->{id} += 0.2;#d#
3147 $item->{timeout} = $timeout; 3435 $item->{timeout} = $timeout;
3148 delete $item->{label}; 3436 delete $item->{label};
3149 } else { 3437 } else {
3150 $self->{item}{$group} = { 3438 $self->{item}{$group} = {
3151 id => ++$self->{id}, 3439 id => ++$self->{id},
… …
3157 count => 1, 3445 count => 1,
3158 %arg, 3446 %arg,
3159 }; 3447 };
3160 } 3448 }
3161 3449
3450 $ROOT->on_refresh (reorder => sub {
3162 $self->reorder; 3451 $self->reorder;
3452 });
3163} 3453}
3164 3454
3165sub reconfigure { 3455sub reconfigure {
3166 my ($self) = @_; 3456 my ($self) = @_;
3167 3457
… …
3170 3460
3171 $self->reorder; 3461 $self->reorder;
3172 $self->SUPER::reconfigure; 3462 $self->SUPER::reconfigure;
3173} 3463}
3174 3464
3465sub destroy {
3466 my ($self) = @_;
3467
3468 $self->{timer}->cancel;
3469
3470 $self->SUPER::destroy;
3471}
3472
3175############################################################################# 3473#############################################################################
3176 3474
3177package CFClient::UI::Inventory; 3475package CFClient::UI::Inventory;
3178 3476
3179our @ISA = CFClient::UI::ScrolledWindow::; 3477our @ISA = CFClient::UI::Table::;
3180 3478
3181sub new { 3479sub new {
3182 my $class = shift; 3480 my $class = shift;
3183 3481
3184 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3483 col_expand => [0, 1, 0],
3186 @_, 3484 @_,
3187 ); 3485 );
3188 3486
3189 $self 3487 $self
3190} 3488}
3191 3489
3192sub set_items { 3490sub set_items {
3193 my ($self, $items) = @_; 3491 my ($self, $items) = @_;
3194 3492
3195 $self->{child}->clear; 3493 $self->clear;
3196 return unless $items; 3494 return unless $items;
3197 3495
3198 my @items = sort { 3496 my @items = sort {
3199 ($a->{type} <=> $b->{type}) 3497 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name}) 3498 or ($a->{name} cmp $b->{name})
3201 } @$items; 3499 } values %$items;
3202 3500
3203 $self->{real_items} = \@items; 3501 $self->{real_items} = \@items;
3204 3502
3205 my $row = 0; 3503 my $row = 0;
3206 for my $item (@items) { 3504 for my $item (@items) {
3207 CFClient::Item::update_widgets $item; 3505 CFClient::Item::update_widgets $item;
3208 3506
3209 $self->{child}->add (0, $row, $item->{face_widget}); 3507 $self->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget}); 3508 $self->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget}); 3509 $self->add (2, $row, $item->{weight_widget});
3212 3510
3213 $row++; 3511 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 } 3512 }
3412} 3513}
3413 3514
3414############################################################################# 3515#############################################################################
3415 3516
… …
3425 commands => [], 3526 commands => [],
3426 @_, 3527 @_,
3427 ) 3528 )
3428} 3529}
3429 3530
3430# XXX: Do sorting? Argl... 3531my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544sub rebuild_spell_list {
3545 my ($self) = @_;
3546
3547 $CFClient::UI::ROOT->on_refresh ($self => sub {
3548 $self->clear;
3549
3550 return unless $::CONN;
3551
3552 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558 my $row = 0;
3559
3560 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561 my $spell = $self->{spell}{$_};
3562
3563 $row++;
3564
3565 my $spell_cb = sub {
3566 my ($widget, $ev) = @_;
3567
3568 if ($ev->{button} == 1) {
3569 $::CONN->user_send ("cast $spell->{name}");
3570 } elsif ($ev->{button} == 2) {
3571 $::CONN->user_send ("invoke $spell->{name}");
3572 } elsif ($ev->{button} == 3) {
3573 (new CFClient::UI::Menu
3574 items => [
3575 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577 ],
3578 )->popup ($ev);
3579 } else {
3580 return 0;
3581 }
3582
3583 1
3584 };
3585
3586 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588 #TODO: add path info to tooltip
3589 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591 $self->add (0, $row, new CFClient::UI::Face
3592 face => $spell->{face},
3593 can_hover => 1,
3594 can_events => 1,
3595 tooltip => $tooltip,
3596 on_button_down => $spell_cb,
3597 );
3598
3599 $self->add (1, $row, new CFClient::UI::Label
3600 expand => 1,
3601 text => $spell->{name},
3602 can_hover => 1,
3603 can_events => 1,
3604 tooltip => $tooltip,
3605 on_button_down => $spell_cb,
3606 );
3607
3608 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612 }
3613 });
3614}
3615
3431sub add_spell { 3616sub add_spell {
3432 my ($self, $spell) = @_; 3617 my ($self, $spell) = @_;
3618
3433 $self->{spells}->{$spell->{name}} = $spell; 3619 $self->{spell}->{$spell->{name}} = $spell;
3434 3620 $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} 3621}
3463 3622
3464sub remove_spell { 3623sub remove_spell {
3465 my ($self, $spell) = @_; 3624 my ($self, $spell) = @_;
3625
3466 delete $self->{spells}->{$spell->{name}}; 3626 delete $self->{spell}->{$spell->{name}};
3467 $self->rebuild_spell_list; 3627 $self->rebuild_spell_list;
3468} 3628}
3469 3629
3630sub clear_spells {
3631 my ($self) = @_;
3632
3633 $self->{spell} = {};
3634 $self->rebuild_spell_list;
3635}
3636
3470############################################################################# 3637#############################################################################
3471 3638
3472package CFClient::UI::Root; 3639package CFClient::UI::Root;
3473 3640
3474our @ISA = CFClient::UI::Container::; 3641our @ISA = CFClient::UI::Container::;
3642
3643use List::Util qw(min max);
3475 3644
3476use CFClient::OpenGL; 3645use CFClient::OpenGL;
3477 3646
3478sub new { 3647sub new {
3479 my $class = shift; 3648 my $class = shift;
… …
3506 $coord = $max - $size if $coord > $max - $size; 3675 $coord = $max - $size if $coord > $max - $size;
3507 3676
3508 int $coord + 0.5 3677 int $coord + 0.5
3509} 3678}
3510 3679
3511sub size_allocate { 3680sub invoke_size_allocate {
3512 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
3513 3682
3514 for my $child ($self->children) { 3683 for my $child ($self->children) {
3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3684 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3516 3685
… …
3520 $X = _to_pixel $X, $W, $self->{w}; 3689 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3522 3691
3523 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3524 } 3693 }
3694
3695 1
3525} 3696}
3526 3697
3527sub coord2local { 3698sub coord2local {
3528 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3529 3700
… …
3614 3785
3615 delete $queue{$widget+0}; 3786 delete $queue{$widget+0};
3616 3787
3617 my ($w, $h) = $widget->size_request; 3788 my ($w, $h) = $widget->size_request;
3618 3789
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3790 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3791 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3792
3793 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3794 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621 3795
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 3796 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 3797 $h = $widget->{force_h} if exists $widget->{force_h};
3624 3798
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3799 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3651 3825
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3653 3827
3654 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3655 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3830
3831 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h;
3833
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656 3836
3657 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
3658 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
3659 3839
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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