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.259 by root, Tue May 30 07:13:09 2006 UTC vs.
Revision 1.306 by root, Sun Jun 18 17:39:36 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 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 179
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 186
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 189
188 } 190 }
189 } 191 }
190 192
191 reconfigure_widgets; 193 reconfigure_widgets;
… …
270 272
271 return unless $self->{visible}; 273 return unless $self->{visible};
272 274
273 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
274 276
277 delete $self->{visible};
275 delete $self->{root}; 278 delete $self->{root};
276 delete $self->{visible};
277 279
278 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
280 282
281 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
283 285
284 $self->focus_out; 286 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
287} 288}
288 289
289sub set_visibility { 290sub set_visibility {
290 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
313} 314}
314 315
315sub move_abs { 316sub move_abs {
316 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
317 318
318 $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;
319 $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;
320 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
321 322
322 $self->update; 323 $self->update;
323} 324}
324 325
… …
365 366
366 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
367 } 368 }
368} 369}
369 370
370sub size_allocate {
371 # nothing to be done
372}
373
374sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
375} 377}
376 378
377sub set_max_size { 379sub set_max_size {
378 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
379 381
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
382} 386}
383 387
384sub set_tooltip { 388sub set_tooltip {
385 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
386 390
… …
391 395
392 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
393 397
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
397 } 401 }
398} 402}
399 403
400# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
401sub coord2local { 405sub coord2local {
… …
409 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
410 414
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
412} 416}
413 417
414sub focus_in { 418sub invoke_focus_in {
415 my ($self) = @_; 419 my ($self) = @_;
416 420
417 return if $FOCUS == $self; 421 return if $FOCUS == $self;
418 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
419 423
420 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
421 425
422 $self->_emit (focus_in => $focus);
423
424 $focus->update if $focus; 426 $focus->update if $focus;
425 $FOCUS->update; 427 $FOCUS->update;
426}
427 428
429 0
430}
431
428sub focus_out { 432sub invoke_focus_out {
429 my ($self) = @_; 433 my ($self) = @_;
430 434
431 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
432 436
433 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
434 438
435 $self->_emit (focus_out => $focus);
436
437 $focus->update if $focus; #? 439 $focus->update if $focus; #?
438 440
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 442 unless $FOCUS;
441}
442 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
443sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
444sub button_up { } 454sub invoke_button_up { 1 }
445sub key_down { } 455sub invoke_key_down { 1 }
446sub key_up { } 456sub invoke_key_up { 1 }
447 457
448sub button_down { 458sub invoke_button_down {
449 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
450 460
451 $self->focus_in; 461 $self->grab_focus;
452}
453 462
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478}
459 479
460sub find_widget { 480sub find_widget {
461 my ($self, $x, $y) = @_; 481 my ($self, $x, $y) = @_;
462 482
463 return () unless $self->{can_events}; 483 return () unless $self->{can_events};
… …
472sub set_parent { 492sub set_parent {
473 my ($self, $parent) = @_; 493 my ($self, $parent) = @_;
474 494
475 Scalar::Util::weaken ($self->{parent} = $parent); 495 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible}; 496 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500} 497}
501 498
502sub realloc { 499sub realloc {
503 my ($self) = @_; 500 my ($self) = @_;
504 501
… …
525 522
526 $self->realloc; 523 $self->realloc;
527 $self->update; 524 $self->update;
528} 525}
529 526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
530
530sub draw { 531sub draw {
531 my ($self) = @_; 532 my ($self) = @_;
532 533
533 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534 545
535 glPushMatrix; 546 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 548
540 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 551 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 553 glBegin GL_QUADS;
547 glVertex $x , $y; 554 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
551 glEnd; 558 glEnd;
552 glDisable GL_BLEND; 559 glDisable GL_BLEND;
553 } 560 }
554 561
555 if ($ENV{CFPLUS_DEBUG} & 1) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 563 glPushMatrix;
557 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 567 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
564 glEnd; 571 glEnd;
565 glPopMatrix; 572 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
568} 578}
569 579
570sub _draw { 580sub _draw {
571 my ($self) = @_; 581 my ($self) = @_;
572 582
… …
575 585
576sub DESTROY { 586sub DESTROY {
577 my ($self) = @_; 587 my ($self) = @_;
578 588
579 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
580 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
581} 593}
582 594
583############################################################################# 595#############################################################################
584 596
585package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
610 622
611 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
613 625
614 glEnable GL_BLEND; 626 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 628 glColor_premultiply @$color;
617 629
618 glBegin GL_QUADS; 630 glBegin GL_QUADS;
619 glVertex 0 , 0; 631 glVertex 0 , 0;
620 glVertex 0 , $h; 632 glVertex 0 , $h;
621 glVertex $w, $h; 633 glVertex $w, $h;
… …
652our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
653 665
654sub new { 666sub new {
655 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
656 668
657 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
658 670
659 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
660 children => [], 672 children => [],
661 can_events => 0, 673 can_events => 0,
662 %arg, 674 %arg,
663 ); 675 );
676
664 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
665 679
666 $self 680 $self
667} 681}
668 682
669sub add { 683sub add {
… …
717 $x -= $self->{x}; 731 $x -= $self->{x};
718 $y -= $self->{y}; 732 $y -= $self->{y};
719 733
720 my $res; 734 my $res;
721 735
722 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
724 and return $res; 738 and return $res;
725 } 739 }
726 740
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748} 762}
749 763
750sub add { 764sub add {
751 my ($self, $child) = @_; 765 my ($self, $child) = @_;
752 766
753 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
756} 769}
757 770
758sub remove { 771sub remove {
759 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
768 781
769sub size_request { 782sub size_request {
770 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
771} 784}
772 785
773sub size_allocate { 786sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
775 788
776 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
777} 792}
778 793
779############################################################################# 794#############################################################################
795
796# back-buffered drawing area
780 797
781package CFClient::UI::Window; 798package CFClient::UI::Window;
782 799
783our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
784 801
… …
795 812
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 814 $self->SUPER::update;
798} 815}
799 816
800sub size_allocate { 817sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
802 819
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
805} 823}
806 824
807sub _render { 825sub _render {
826 my ($self) = @_;
827
808 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
809} 829}
810 830
811sub render_child { 831sub render_child {
812 my ($self) = @_; 832 my ($self) = @_;
813 833
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
817 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
818 $self->_render; 845 $self->_render;
819 }; 846 };
820} 847}
821 848
822sub _draw { 849sub _draw {
823 my ($self) = @_; 850 my ($self) = @_;
824 851
825 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
826 853
827 my $tex = $self->{texture} 854 my $tex = $self->{texture}
828 or return; 855 or return;
829 856
830 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
833 860
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 862
836 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
837} 864}
… …
861 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
862 889
863 ($w, $h) 890 ($w, $h)
864} 891}
865 892
866sub size_allocate { 893sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
868 895
869 my $child = $self->child; 896 my $child = $self->child;
870 897
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 900
874 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
875 $self->update; 902 $self->update;
903
904 1
876} 905}
877 906
878sub set_offset { 907sub set_offset {
879 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
880 909
… …
913} 942}
914 943
915sub _render { 944sub _render {
916 my ($self) = @_; 945 my ($self) = @_;
917 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 951
920 $self->SUPER::_render; 952 $self->SUPER::_render;
921} 953}
922 954
… …
925package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
926 958
927our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
928 960
929sub new { 961sub new {
930 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
931 965
932 my $self; 966 my $self;
933 967
934 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
935 vertical => 1, 969 vertical => 1,
… …
940 ; 974 ;
941 975
942 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 978 slider => $slider,
945 @_, 979 %arg,
946 ); 980 );
947 981
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
951 984
952 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
953} 992}
954 993
955sub update { 994sub update {
956 my ($self) = @_; 995 my ($self) = @_;
957 996
… …
960 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1002}
964 1003
965sub size_allocate { 1004sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969 1006
970 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
972} 1011}
973 1012
974#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll 1014# update viewport offset on scroll
976 1015
… …
996 1035
997 if ($self->{bg}) { 1036 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
999 1038
1000 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
1003 1042
1004 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1044 glVertex 0 , 0;
1006 glVertex 0 , $h; 1045 glVertex 0 , $h;
1007 glVertex $w, $h; 1046 glVertex $w, $h;
… …
1029my @border = 1068my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1071
1033sub new { 1072sub new {
1034 my $class = shift; 1073 my ($class, %arg) = @_;
1035 1074
1036 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1078 border => 0.6,
1040 can_events => 1, 1079 can_events => 1,
1041 min_w => 16, 1080 min_w => 16,
1042 min_h => 16, 1081 min_h => 16,
1043 @_ 1082 %arg,
1044 ); 1083 );
1045 1084
1046 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1047 align => 0, 1086 align => 0,
1048 valign => 1, 1087 valign => 1,
1049 text => $self->{title}, 1088 text => $self->{title},
1050 fontsize => $self->{border}; 1089 fontsize => $self->{border},
1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
1051 1100
1052 $self 1101 $self
1102}
1103
1104sub add {
1105 my ($self, @widgets) = @_;
1106
1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1110}
1054 1111
1055sub border { 1112sub border {
1056 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1057} 1114}
1058 1115
1059sub size_request { 1116sub size_request {
1060 my ($self) = @_; 1117 my ($self) = @_;
1118
1119 $self->{title_widget}->size_request
1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
1061 1124
1062 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1063 1126
1064 ( 1127 (
1065 $w + $self->border * 2, 1128 $w + $self->border * 2,
1066 $h + $self->border * 2, 1129 $h + $self->border * 2,
1067 ) 1130 )
1068} 1131}
1069 1132
1070sub size_allocate { 1133sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
1072 1135
1136 if ($self->{title_widget}) {
1137 $self->{title_widget}{w} = $w;
1138 $self->{title_widget}{h} = $h;
1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1140 }
1141
1142 my $border = $self->border;
1143
1073 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1075 1146
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1082sub button_down { 1155sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1084 1157
1085 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1159 my $border = $self->border;
1087 1160
… …
1103 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1104 1177
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1180
1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1182 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1183 };
1111 1184
1112 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1118 1191
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1193
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1195 # HACK: the next line is required to enforce placement
1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
1123 } 1202 1
1124} 1203}
1125 1204
1126sub button_up { 1205sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1128 1207
1129 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1130} 1209}
1131 1210
1132sub mouse_motion { 1211sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1134 1213
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1136} 1217}
1137 1218
1138sub _draw { 1219sub _draw {
1139 my ($self) = @_; 1220 my ($self) = @_;
1140 1221
1222 my $child = $self->{children}[0];
1223
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1226
1144 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1229
1147 my $border = $self->border; 1230 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1246 }
1164 1247
1165 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1166 1249
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1250 $child->draw;
1251
1252 if ($self->{title_widget}) {
1253 glTranslate 0, $border - $self->{h};
1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1170} 1261}
1171 1262
1172############################################################################# 1263#############################################################################
1173 1264
1174package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1197 1288
1198 $child->set_parent ($self); 1289 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1200 1291
1201 $self->realloc; 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1202} 1299}
1203 1300
1204# TODO: move to container class maybe? send children a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1302sub clear {
1206 my ($self) = @_; 1303 my ($self) = @_;
… …
1247 (sum @$ws), 1344 (sum @$ws),
1248 (sum @$hs), 1345 (sum @$hs),
1249 ) 1346 )
1250} 1347}
1251 1348
1252sub size_allocate { 1349sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1254 1351
1255 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1256 1353
1257 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
… …
1289 } 1386 }
1290 1387
1291 $y += $row_h; 1388 $y += $row_h;
1292 } 1389 }
1293 1390
1391 1
1294} 1392}
1295 1393
1296sub find_widget { 1394sub find_widget {
1297 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1298 1396
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1435 )
1338} 1436}
1339 1437
1340sub size_allocate { 1438sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1342 1440
1343 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1442 my $children = $self->{children};
1345 1443
… …
1467 1565
1468 delete $self->{texture}; 1566 delete $self->{texture};
1469 $self->SUPER::update; 1567 $self->SUPER::update;
1470} 1568}
1471 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1472sub set_text { 1577sub set_text {
1473 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1474 1579
1475 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1477 1582
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1480 1585
1586 delete $self->{size_req};
1481 $self->realloc; 1587 $self->realloc;
1482 $self->update; 1588 $self->update;
1483} 1589}
1484 1590
1485sub set_markup { 1591sub set_markup {
… …
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1598
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1495 1601
1602 delete $self->{size_req};
1496 $self->realloc; 1603 $self->realloc;
1497 $self->update; 1604 $self->update;
1498} 1605}
1499 1606
1500sub size_request { 1607sub size_request {
1501 my ($self) = @_; 1608 my ($self) = @_;
1502 1609
1610 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1616
1509 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1510 1618
1511 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1622
1515 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1516 1624
1517 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1519 } 1630 };
1520 1631
1521 ($w, $h) 1632 @{ $self->{size_req} }
1522} 1633}
1523 1634
1524sub size_allocate { 1635sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1526 1637
1638 delete $self->{ox};
1639
1527 delete $self->{texture}; 1640 delete $self->{texture}
1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1528} 1644}
1529 1645
1530sub set_fontsize { 1646sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1532 1648
1533 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1534 delete $self->{texture}; 1650 delete $self->{texture};
1535 1651
1536 $self->realloc; 1652 $self->realloc;
1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1537} 1661}
1538 1662
1539sub _draw { 1663sub _draw {
1540 my ($self) = @_; 1664 my ($self) = @_;
1541 1665
… …
1547 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1675
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1553 1678
1679 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1557 1683
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1563 }; 1687 };
1564 1688
1565 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1567 1693
1568 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1569 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1571 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1573 } 1701 }
1574 1702
1575 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1576} 1704}
1577 1705
… …
1594 can_hover => 1, 1722 can_hover => 1,
1595 can_focus => 1, 1723 can_focus => 1,
1596 valign => 0, 1724 valign => 0,
1597 can_events => 1, 1725 can_events => 1,
1598 #text => ... 1726 #text => ...
1727 #hidden => "*",
1599 @_ 1728 @_
1600 ) 1729 )
1601} 1730}
1602 1731
1603sub _set_text { 1732sub _set_text {
… …
1605 1734
1606 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1607 1736
1608 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1609 1738
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1740 $self->{text} = $text;
1614 1741
1615 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1617 1745
1618 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1619} 1750}
1620 1751
1621sub set_text { 1752sub set_text {
1622 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1623 1754
1624 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 1756 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 1757}
1629 1758
1630sub get_text { 1759sub get_text {
1631 $_[0]{text} 1760 $_[0]{text}
1632} 1761}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1638 1767
1639 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1640} 1769}
1641 1770
1642sub key_down { 1771sub invoke_key_down {
1643 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1644 1773
1645 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1659 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1660 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 1793 $self->emit ('escape');
1665 } elsif ($uni) { 1794 } elsif ($uni) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1667 } 1798 }
1668 1799
1669 $self->_set_text ($text); 1800 $self->_set_text ($text);
1670 1801
1671 $self->realloc; 1802 $self->realloc;
1672}
1673 1803
1804 1
1805}
1806
1674sub focus_in { 1807sub invoke_focus_in {
1675 my ($self) = @_; 1808 my ($self) = @_;
1676 1809
1677 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1678 1811
1679 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1680} 1813}
1681 1814
1682sub button_down { 1815sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1684 1817
1685 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 1819
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 1821
1689 # byte-index to char-index 1822 # byte-index to char-index
1690 my $text = $self->{text}; 1823 my $text = $self->{text};
1691 utf8::encode $text; 1824 utf8::encode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1693 1826
1694 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1695 $self->update; 1828 $self->update;
1829
1830 1
1696} 1831}
1697 1832
1698sub mouse_motion { 1833sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1836
1837 1
1701} 1838}
1702 1839
1703sub _draw { 1840sub _draw {
1704 my ($self) = @_; 1841 my ($self) = @_;
1705 1842
1706 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1707 1844
1708 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1711 } else { 1848 } else {
1712 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1713 } 1850 }
1714 1851
1715 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1718 glVertex 0 , 0; 1855 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1746 1883
1747our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1748 1885
1749use CFClient::OpenGL; 1886use CFClient::OpenGL;
1750 1887
1751sub key_down { 1888sub invoke_key_down {
1752 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1753 1890
1754 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1755 1892
1756 if ($sym == 13) { 1893 if ($sym == 13) {
1757 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1759 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 1899 $self->emit (activate => $txt);
1762 $self->update; 1900 $self->update;
1763 1901
1764 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1782 } else { 1920 } else {
1783 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1784 } 1922 }
1785 1923
1786 } else { 1924 } else {
1787 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::invoke_key_down ($ev)
1926 }
1927
1788 } 1928 1
1789
1790} 1929}
1791 1930
1792############################################################################# 1931#############################################################################
1793 1932
1794package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1815 can_events => 1, 1954 can_events => 1,
1816 @_ 1955 @_
1817 ) 1956 )
1818} 1957}
1819 1958
1820sub activate { }
1821
1822sub button_up { 1959sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1824 1961
1825 $self->emit ("activate") 1962 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 1964 && $y >= 0 && $y < $self->{h};
1965
1966 1
1828} 1967}
1829 1968
1830sub _draw { 1969sub _draw {
1831 my ($self) = @_; 1970 my ($self) = @_;
1832 1971
1833 local $self->{fg} = $self->{fg}; 1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 1973
1839 glEnable GL_TEXTURE_2D; 1974 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 1976 glColor 0, 0, 0, 1;
1842 1977
1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1978 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1844 1979
1845 glDisable GL_TEXTURE_2D; 1980 glDisable GL_TEXTURE_2D;
1846 1981
1847 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1983}
1984
1985#############################################################################
1986
1987package CFClient::UI::ImageButton;
1988
1989our @ISA = CFClient::UI::Image::;
1990
1991use CFClient::OpenGL;
1992
1993my %textures;
1994
1995sub new {
1996 my $class = shift;
1997
1998 my $self = $class->SUPER::new (
1999 padding_x => 4,
2000 padding_y => 4,
2001 fg => [1, 1, 1],
2002 active_fg => [0, 0, 1],
2003 can_hover => 1,
2004 align => 0,
2005 valign => 0,
2006 can_events => 1,
2007 @_
2008 );
2009}
2010
2011sub invoke_button_up {
2012 my ($self, $ev, $x, $y) = @_;
2013
2014 $self->emit ("activate")
2015 if $x >= 0 && $x < $self->{w}
2016 && $y >= 0 && $y < $self->{h};
2017
2018 1
1848} 2019}
1849 2020
1850############################################################################# 2021#############################################################################
1851 2022
1852package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
… …
1879 my ($self) = @_; 2050 my ($self) = @_;
1880 2051
1881 (6) x 2 2052 (6) x 2
1882} 2053}
1883 2054
1884sub button_down { 2055sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1886 2057
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1890 $self->_emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
1891 } 2066 1
1892} 2067}
1893 2068
1894sub _draw { 2069sub _draw {
1895 my ($self) = @_; 2070 my ($self) = @_;
1896 2071
… …
2063 2238
2064 my $h1 = $self->{h} * (1 - $ycut1); 2239 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2240 my $h2 = $self->{h} * (1 - $ycut2);
2066 2241
2067 glEnable GL_BLEND; 2242 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2245 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2247
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2248 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2249 glBegin GL_QUADS;
… …
2187 $self->update; 2363 $self->update;
2188 2364
2189 $self 2365 $self
2190} 2366}
2191 2367
2192sub changed { }
2193
2194sub set_range { 2368sub set_range {
2195 my ($self, $range) = @_; 2369 my ($self, $range) = @_;
2196 2370
2197 ($range, $self->{range}) = ($self->{range}, $range); 2371 ($range, $self->{range}) = ($self->{range}, $range);
2198 2372
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2373 if ("@$range" ne "@{$self->{range}}") {
2374 $self->update;
2375 $self->set_value ($self->{range}[0]);
2376 }
2201} 2377}
2202 2378
2203sub set_value { 2379sub set_value {
2204 my ($self, $value) = @_; 2380 my ($self, $value) = @_;
2205 2381
… …
2216 if $unit; 2392 if $unit;
2217 2393
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2394 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2395
2220 if ($value != $old_value) { 2396 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2397 $self->emit (changed => $value);
2222 $self->update; 2398 $self->update;
2223 } 2399 }
2224} 2400}
2225 2401
2226sub size_request { 2402sub size_request {
2227 my ($self) = @_; 2403 my ($self) = @_;
2228 2404
2229 ($self->{req_w}, $self->{req_h}) 2405 ($self->{req_w}, $self->{req_h})
2230} 2406}
2231 2407
2232sub button_down { 2408sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2234 2410
2235 $self->SUPER::button_down ($ev, $x, $y); 2411 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2412
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2414
2239 $self->mouse_motion ($ev, $x, $y); 2415 $self->mouse_motion ($ev, $x, $y)
2240} 2416}
2241 2417
2242sub mouse_motion { 2418sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2244 2420
2245 if ($GRAB == $self) { 2421 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2422 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2423
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2424 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2425
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2426 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2427
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2428 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2429 } else {
2430 return 0;
2431 }
2432
2253 } 2433 1
2254} 2434}
2255 2435
2256sub update { 2436sub update {
2257 my ($self) = @_; 2437 my ($self) = @_;
2258 2438
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2439 delete $self->{knob_w};
2440 $self->SUPER::update;
2441}
2442
2443sub _draw {
2444 my ($self) = @_;
2445
2446 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2447 $self->set_value ($self->{range}[0]);
2261 2448
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2449 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2450 my $range = ($hi - $page - $lo) || 1e-100;
2264 2451
… …
2270 $value = ($value - $lo) / $range; 2457 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2458 $value = $value * $self->{scale} + $self->{offset};
2272 2459
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2460 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2461 $self->{knob_w} = $knob_w;
2275 }); 2462 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2463
2283 $self->SUPER::_draw (); 2464 $self->SUPER::_draw ();
2284 2465
2285 glScale $self->{w}, $self->{h}; 2466 glScale $self->{w}, $self->{h};
2286 2467
… …
2347sub set_range { shift->{slider}->set_range (@_) } 2528sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 2529sub set_value { shift->{slider}->set_value (@_) }
2349 2530
2350############################################################################# 2531#############################################################################
2351 2532
2352package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2353 2534
2354our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2355 2536
2356use CFClient::OpenGL; 2537use CFClient::OpenGL;
2357 2538
… …
2359 my $class = shift; 2540 my $class = shift;
2360 2541
2361 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2362 fontsize => 1, 2543 fontsize => 1,
2363 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2364 #font => default_font 2546 #font => default_font
2365 @_, 2547 @_,
2366 2548
2367 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2368 par => [], 2550 par => [],
… …
2383 2565
2384 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2385 $self->reflow; 2567 $self->reflow;
2386} 2568}
2387 2569
2388sub size_allocate { 2570sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 2571 my ($self, $w, $h) = @_;
2390
2391 $self->SUPER::size_allocate ($w, $h);
2392 2572
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2575 $self->{layout}->set_width ($self->{children}[0]{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2577
2397 $self->reflow; 2578 $self->reflow;
2579
2580 $self->SUPER::invoke_size_allocate ($w, $h)
2398} 2581}
2399 2582
2400sub text_size { 2583sub text_size {
2401 my ($self, $text, $indent) = @_; 2584 my ($self, $text, $indent) = @_;
2402 2585
2403 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2404 2587
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2589 $layout->set_width ($self->{children}[0]{w} - $indent);
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2591 $layout->set_markup ($text);
2408 2592
2409 $layout->size 2593 $layout->size
2410} 2594}
2411 2595
… …
2450 2634
2451 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2452 2636
2453 delete $self->{texture}; 2637 delete $self->{texture};
2454 2638
2455 $ROOT->on_post_alloc ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2641
2458 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2643 my $height = 0;
2460 2644
… …
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464 2648
2465 for (@{$self->{par}}) { 2649 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]); 2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2468 $layout->set_markup ($_->[4]); 2653 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2654 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2655 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h; 2656 $_->[1] = $h;
2472 } 2657 }
… …
2475 } 2660 }
2476 2661
2477 $self->{height} = $height; 2662 $self->{height} = $height;
2478 2663
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2480 2665
2481 delete $self->{texture}; 2666 delete $self->{texture};
2482 } 2667 }
2483 2668
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2670 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2671 glClear GL_COLOR_BUFFER_BIT;
2487 2672
2488 my $top = int $self->{children}[1]{range}[0]; 2673 my $top = int $self->{children}[1]{range}[0];
2489 2674
2490 my $y0 = $top; 2675 my $y0 = $top;
… …
2504 my $h = $par->[1]; 2689 my $h = $par->[1];
2505 2690
2506 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 2692 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]); 2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($par->[4]); 2695 $layout->set_markup ($par->[4]);
2510 2696
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2512 2698
2513 glRasterPos $par->[3], $y - $y0; 2699 glRasterPos $par->[3], $y - $y0;
… …
2525sub _draw { 2711sub _draw {
2526 my ($self) = @_; 2712 my ($self) = @_;
2527 2713
2528 glEnable GL_TEXTURE_2D; 2714 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2716 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2718 glDisable GL_TEXTURE_2D;
2533 2719
2534 $self->{children}[1]->draw; 2720 $self->{children}[1]->draw;
2535 2721
2536} 2722}
… …
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 2813 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2814 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 2815 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 2816 . "visible $widget->{visible}";
2631 } 2817 }
2818
2819 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//;
2632 2821
2633 $self->add (new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2634 markup => $tooltip, 2823 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 2825 fontsize => 0.8,
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 2836
2648 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2649} 2838}
2650 2839
2651sub size_allocate { 2840sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 2841 my ($self, $w, $h) = @_;
2653 2842
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 2843 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 2844}
2656 2845
2657sub visibility_change { 2846sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 2847 my ($self, $visible) = @_;
2659 2848
2660 return unless $visible; 2849 return unless $visible;
2661 2850
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 2851 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2664 or return; 2853 or return;
2665 2854
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 2856
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 2858 if $x + $self->{w} > $self->{root}{w};
2670 2859
2671 $self->move_abs ($x, $y); 2860 $self->move_abs ($x, $y);
2672 }); 2861 });
2673} 2862}
2674 2863
… …
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764 2953
2765 if ($tex) { 2954 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 2955 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 2957 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2771 } 2960 }
2772} 2961}
2773 2962
2774sub DESTROY { 2963sub destroy {
2775 my ($self) = @_; 2964 my ($self) = @_;
2776 2965
2777 $self->{timer}->cancel 2966 $self->{timer}->cancel
2778 if $self->{timer}; 2967 if $self->{timer};
2779 2968
2780 $self->SUPER::DESTROY; 2969 $self->SUPER::destroy;
2781} 2970}
2782 2971
2783############################################################################# 2972#############################################################################
2784 2973
2785package CFClient::UI::Inventory; 2974package CFClient::UI::Buttonbar;
2786 2975
2787our @ISA = CFClient::UI::ScrolledWindow::; 2976our @ISA = CFClient::UI::HBox::;
2788 2977
2789sub new { 2978# TODO: should actualyl wrap buttons and other goodies.
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824 2979
2825############################################################################# 2980#############################################################################
2826 2981
2827package CFClient::UI::Menu; 2982package CFClient::UI::Menu;
2828 2983
… …
2840 ); 2995 );
2841 2996
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843 2998
2844 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2846 3001
2847 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2848 if (!ref $widget) { 3003 if (!ref $widget) {
2849 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2850 can_hover => 1, 3005 can_hover => 1,
2851 can_events => 1, 3006 can_events => 1,
2852 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2853 } 3009 }
2854 3010
2855 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2856 3012
2857 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2862 3018
2863# popup given the event (must be a mouse button down event currently) 3019# popup given the event (must be a mouse button down event currently)
2864sub popup { 3020sub popup {
2865 my ($self, $ev) = @_; 3021 my ($self, $ev) = @_;
2866 3022
2867 $self->_emit ("popdown"); 3023 $self->emit ("popdown");
2868 3024
2869 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self; 3026 $GRAB = $self;
2871 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2872 3028
2873 $self->show; 3029 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3030 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875} 3031}
2876 3032
2877sub mouse_motion { 3033sub invoke_mouse_motion {
2878 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2879 3035
2880 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2883}
2884 3039
3040 0
3041}
3042
2885sub button_up { 3043sub invoke_button_up {
2886 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2887 3045
2888 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB; 3047 undef $GRAB;
2890 $self->hide; 3048 $self->hide;
2891 3049
2892 $self->_emit ("popdown"); 3050 $self->emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
3052 } else {
3053 return 0
3054 }
3055
2894 } 3056 1
2895} 3057}
2896 3058
2897############################################################################# 3059#############################################################################
2898 3060
2899package CFClient::UI::Statusbox; 3061package CFClient::UI::Multiplexer;
2900 3062
2901our @ISA = CFClient::UI::VBox::; 3063our @ISA = CFClient::UI::Container::;
2902 3064
2903sub new { 3065sub new {
2904 my $class = shift; 3066 my $class = shift;
2905 3067
2906 $class->SUPER::new ( 3068 my $self = $class->SUPER::new (
3069 @_,
3070 );
3071
3072 $self->{current} = $self->{children}[0]
3073 if @{ $self->{children} };
3074
3075 $self
3076}
3077
3078sub add {
3079 my ($self, @widgets) = @_;
3080
3081 $self->SUPER::add (@widgets);
3082
3083 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} };
3085}
3086
3087sub set_current_page {
3088 my ($self, $page_or_widget) = @_;
3089
3090 my $widget = ref $page_or_widget
3091 ? $page_or_widget
3092 : $self->{children}[$page_or_widget];
3093
3094 $self->{current} = $widget;
3095 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3096
3097 $self->emit (page_changed => $self->{current});
3098
3099 $self->realloc;
3100}
3101
3102sub visible_children {
3103 $_[0]{current}
3104}
3105
3106sub size_request {
3107 my ($self) = @_;
3108
3109 $self->{current}->size_request
3110}
3111
3112sub invoke_size_allocate {
3113 my ($self, $w, $h) = @_;
3114
3115 $self->{current}->configure (0, 0, $w, $h);
3116
3117 1
3118}
3119
3120sub _draw {
3121 my ($self) = @_;
3122
3123 $self->{current}->draw;
3124}
3125
3126#############################################################################
3127
3128package CFClient::UI::Notebook;
3129
3130our @ISA = CFClient::UI::VBox::;
3131
3132sub new {
3133 my $class = shift;
3134
3135 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3138 # filter => # will be put between multiplexer and $self
3139 @_,
3140 );
3141
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3143 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3144
3145 $self
3146}
3147
3148sub add {
3149 my ($self, $title, $widget, $tooltip) = @_;
3150
3151 Scalar::Util::weaken $self;
3152
3153 $self->{buttonbar}->add (new CFClient::UI::Button
3154 markup => $title,
3155 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) },
3157 );
3158
3159 $self->{multiplexer}->add ($widget);
3160}
3161
3162sub set_current_page {
3163 my ($self, $page) = @_;
3164
3165 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current});
3167}
3168
3169#############################################################################
3170
3171package CFClient::UI::Combobox;
3172
3173use utf8;
3174
3175our @ISA = CFClient::UI::Button::;
3176
3177sub new {
3178 my $class = shift;
3179
3180 my $self = $class->SUPER::new (
3181 options => [], # [value, title, longdesc], ...
3182 value => undef,
3183 @_,
3184 );
3185
3186 $self->_set_value ($self->{value});
3187
3188 $self
3189}
3190
3191sub invoke_button_down {
3192 my ($self, $ev) = @_;
3193
3194 my @menu_items;
3195
3196 for (@{ $self->{options} }) {
3197 my ($value, $title, $tooltip) = @$_;
3198
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 }
3201
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203}
3204
3205sub _set_value {
3206 my ($self, $value) = @_;
3207
3208 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3209 or return;
3210
3211 $self->{value} = $item->[0];
3212 $self->set_markup ("$item->[1] ⇓");
3213 $self->set_tooltip ($item->[2]);
3214}
3215
3216sub set_value {
3217 my ($self, $value) = @_;
3218
3219 return unless $self->{value} ne $value;
3220
3221 $self->_set_value ($value);
3222 $self->emit (changed => $value);
3223}
3224
3225#############################################################################
3226
3227package CFClient::UI::Statusbox;
3228
3229our @ISA = CFClient::UI::VBox::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
2907 fontsize => 0.8, 3235 fontsize => 0.8,
2908 @_, 3236 @_,
2909 ) 3237 );
3238
3239 Scalar::Util::weaken (my $this = $self);
3240
3241 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3242
3243 $self
2910} 3244}
2911 3245
2912sub reorder { 3246sub reorder {
2913 my ($self) = @_; 3247 my ($self) = @_;
2914 my $NOW = time; 3248 my $NOW = Time::HiRes::time;
3249
3250 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} };
2915 3254
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3255 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3256 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3257 }
2919 3258
… …
2922 my @items = sort { 3261 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3262 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3263 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3264 } values %{ $self->{item} };
2926 3265
3266 $self->{timer}->interval (1);
3267
2927 my $count = 10 + 1; 3268 my $count = 10 + 1;
2928 for my $item (@items) { 3269 for my $item (@items) {
2929 last unless --$count; 3270 last unless --$count;
2930 3271
2931 push @widgets, $item->{label} ||= do { 3272 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3273 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3274 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3275 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3276 : $item->{text};
2936 3277
… …
2944 tooltip => $item->{tooltip}, 3285 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3286 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3287 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3288 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3289 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3290 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3291 can_events => 1,
2951 can_hover => 1 3292 can_hover => 1
2952 }; 3293 };
3294
3295 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3296 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3297 $label->update;
3298 $label->set_max_size (undef, $label->{req_h} * $diff)
3299 if $diff < 1;
3300 $self->{timer}->interval (1/30);
3301 } else {
3302 $label->{fg}[3] = $item->{fg}[3] || 1;
3303 }
3304
3305 push @widgets, $label;
2953 } 3306 }
2954 3307
2955 $self->clear; 3308 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3309 $self->SUPER::add (reverse @widgets);
2957} 3310}
… …
2962 $text =~ s/^\s+//; 3315 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3316 $text =~ s/\s+$//;
2964 3317
2965 return unless $text; 3318 return unless $text;
2966 3319
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3320 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3321
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3322 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3323
2971 if (my $item = $self->{item}{$group}) { 3324 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3325 if ($item->{text} eq $text) {
2973 $item->{count}++; 3326 $item->{count}++;
2974 } else { 3327 } else {
2975 $item->{count} = 1; 3328 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text; 3329 $item->{text} = $item->{tooltip} = $text;
2977 } 3330 }
2978 $item->{id} = ++$self->{id}; 3331 $item->{id} += 0.2;#d#
2979 $item->{timeout} = $timeout; 3332 $item->{timeout} = $timeout;
2980 delete $item->{label}; 3333 delete $item->{label};
2981 } else { 3334 } else {
2982 $self->{item}{$group} = { 3335 $self->{item}{$group} = {
2983 id => ++$self->{id}, 3336 id => ++$self->{id},
… …
3002 3355
3003 $self->reorder; 3356 $self->reorder;
3004 $self->SUPER::reconfigure; 3357 $self->SUPER::reconfigure;
3005} 3358}
3006 3359
3360sub destroy {
3361 my ($self) = @_;
3362
3363 $self->{timer}->cancel;
3364
3365 $self->SUPER::destroy;
3366}
3367
3007############################################################################# 3368#############################################################################
3008 3369
3370package CFClient::UI::Inventory;
3371
3372our @ISA = CFClient::UI::ScrolledWindow::;
3373
3374sub new {
3375 my $class = shift;
3376
3377 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3379 @_,
3380 );
3381
3382 $self
3383}
3384
3385sub set_items {
3386 my ($self, $items) = @_;
3387
3388 $self->{child}->clear;
3389 return unless $items;
3390
3391 my @items = sort {
3392 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name})
3394 } @$items;
3395
3396 $self->{real_items} = \@items;
3397
3398 my $row = 0;
3399 for my $item (@items) {
3400 CFClient::Item::update_widgets $item;
3401
3402 $self->{child}->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget});
3405
3406 $row++;
3407 }
3408}
3409
3410#############################################################################
3411
3412package CFClient::UI::BindEditor;
3413
3414our @ISA = CFClient::UI::FancyFrame::;
3415
3416sub new {
3417 my $class = shift;
3418
3419 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421 $self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425 text => "start recording",
3426 tooltip => "Start/Stops recording of actions."
3427 ."All subsequent actions after the recording started will be captured."
3428 ."The actions are displayed after the record was stopped."
3429 ."To bind the action you have to click on the 'Bind' button",
3430 on_activate => sub {
3431 unless ($self->{recording}) {
3432 $self->start;
3433 } else {
3434 $self->stop;
3435 }
3436 });
3437
3438 $vb->add (new CFClient::UI::Label text => "Actions:");
3439 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3442 $vb->add (my $hb = new CFClient::UI::HBox);
3443 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444 $hb->add (new CFClient::UI::Button
3445 text => "bind",
3446 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447 on_activate => sub {
3448 $self->ask_for_bind;
3449 });
3450
3451 $vb->add (my $hb = new CFClient::UI::HBox);
3452 $hb->add (new CFClient::UI::Button
3453 text => "ok",
3454 expand => 1,
3455 tooltip => "This closes the binding editor and saves the binding",
3456 on_activate => sub {
3457 $self->hide;
3458 $self->commit;
3459 });
3460
3461 $hb->add (new CFClient::UI::Button
3462 text => "cancel",
3463 expand => 1,
3464 tooltip => "This closes the binding editor without saving",
3465 on_activate => sub {
3466 $self->hide;
3467 $self->{binding_cancel}->()
3468 if $self->{binding_cancel};
3469 });
3470
3471 $self->update_binding_widgets;
3472
3473 $self
3474}
3475
3476sub commit {
3477 my ($self) = @_;
3478 my ($mod, $sym, $cmds) = $self->get_binding;
3479 if ($sym != 0 && @$cmds > 0) {
3480 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481 ."'. Don't forget 'Save Config'!");
3482 $self->{binding_change}->($mod, $sym, $cmds)
3483 if $self->{binding_change};
3484 } else {
3485 $::STATUSBOX->add ("No action bound, no key or action specified!");
3486 $self->{binding_cancel}->()
3487 if $self->{binding_cancel};
3488 }
3489}
3490
3491sub start {
3492 my ($self) = @_;
3493
3494 $self->{rec_btn}->set_text ("stop recording");
3495 $self->{recording} = 1;
3496 $self->clear_command_list;
3497 $::CONN->start_record if $::CONN;
3498}
3499
3500sub stop {
3501 my ($self) = @_;
3502
3503 $self->{rec_btn}->set_text ("start recording");
3504 $self->{recording} = 0;
3505
3506 my $rec;
3507 $rec = $::CONN->stop_record if $::CONN;
3508 return unless ref $rec eq 'ARRAY';
3509 $self->set_command_list ($rec);
3510}
3511
3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3518sub ask_for_bind {
3519 my ($self, $commit, $end_cb) = @_;
3520
3521 CFClient::Binder::open_binding_dialog (sub {
3522 my ($mod, $sym) = @_;
3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524 $self->update_binding_widgets;
3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3527 });
3528}
3529
3530# $mod and $sym are the modifiers and key symbol
3531# $cmds is a array ref of strings (the commands)
3532# $cb is the callback that is executed on OK
3533# $ccb is the callback that is executed on CANCEL and
3534# when the binding was unsuccessful on OK
3535sub set_binding {
3536 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538 $self->clear_command_list;
3539 $self->{recording} = 0;
3540 $self->{rec_btn}->set_text ("start recording");
3541
3542 $self->{binding} = [$mod, $sym];
3543 $self->{commands} = $cmds;
3544
3545 $self->{binding_change} = $cb;
3546 $self->{binding_cancel} = $ccb;
3547
3548 $self->update_binding_widgets;
3549}
3550
3551# this is a shortcut method that asks for a binding
3552# and then just binds it.
3553sub do_quick_binding {
3554 my ($self, $cmds, $end_cb) = @_;
3555 $self->set_binding (undef, undef, $cmds, sub {
3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557 });
3558 $self->ask_for_bind (1, $end_cb);
3559}
3560
3561sub update_binding_widgets {
3562 my ($self) = @_;
3563 my ($mod, $sym, $cmds) = $self->get_binding;
3564 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565 $self->set_command_list ($cmds);
3566}
3567
3568sub get_binding {
3569 my ($self) = @_;
3570 return (
3571 $self->{binding}->[0],
3572 $self->{binding}->[1],
3573 [ grep { defined $_ } @{$self->{commands}} ]
3574 );
3575}
3576
3577sub clear_command_list {
3578 my ($self) = @_;
3579 $self->{cmdbox}->clear ();
3580}
3581
3582sub set_command_list {
3583 my ($self, $cmds) = @_;
3584
3585 $self->{cmdbox}->clear ();
3586 $self->{commands} = $cmds;
3587
3588 my $idx = 0;
3589
3590 for (@$cmds) {
3591 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593 my $i = $idx;
3594 $hb->add (new CFClient::UI::Label text => $_);
3595 $hb->add (new CFClient::UI::Button
3596 text => "delete",
3597 tooltip => "Deletes the action from the record",
3598 on_activate => sub {
3599 $self->{cmdbox}->remove ($hb);
3600 $cmds->[$i] = undef;
3601 });
3602
3603
3604 $idx++
3605 }
3606}
3607
3608#############################################################################
3609
3610package CFClient::UI::SpellList;
3611
3612our @ISA = CFClient::UI::Table::;
3613
3614sub new {
3615 my $class = shift;
3616
3617 my $self = $class->SUPER::new (
3618 binding => [],
3619 commands => [],
3620 @_,
3621 )
3622}
3623
3624my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3625
3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3628my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3630my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3634my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3636
3637sub rebuild_spell_list {
3638 my ($self) = @_;
3639
3640 $CFClient::UI::ROOT->on_refresh ($self => sub {
3641 $self->clear;
3642
3643 return unless $::CONN;
3644
3645 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650
3651 my $row = 0;
3652
3653 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654 my $spell = $self->{spell}{$_};
3655
3656 $row++;
3657
3658 my $spell_cb = sub {
3659 my ($widget, $ev) = @_;
3660
3661 if ($ev->{button} == 1) {
3662 $::CONN->user_send ("cast $spell->{name}");
3663 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu
3667 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ],
3671 )->popup ($ev);
3672 } else {
3673 return 0;
3674 }
3675
3676 1
3677 };
3678
3679 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681 #TODO: add path info to tooltip
3682 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3683
3684 $self->add (0, $row, new CFClient::UI::Face
3685 face => $spell->{face},
3686 can_hover => 1,
3687 can_events => 1,
3688 tooltip => $tooltip,
3689 on_button_down => $spell_cb,
3690 );
3691
3692 $self->add (1, $row, new CFClient::UI::Label
3693 expand => 1,
3694 text => $spell->{name},
3695 can_hover => 1,
3696 can_events => 1,
3697 tooltip => $tooltip,
3698 on_button_down => $spell_cb,
3699 );
3700
3701 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705 }
3706 });
3707}
3708
3709sub add_spell {
3710 my ($self, $spell) = @_;
3711
3712 $self->{spell}->{$spell->{name}} = $spell;
3713 $self->rebuild_spell_list;
3714}
3715
3716sub remove_spell {
3717 my ($self, $spell) = @_;
3718
3719 delete $self->{spell}->{$spell->{name}};
3720 $self->rebuild_spell_list;
3721}
3722
3723sub clear_spells {
3724 my ($self) = @_;
3725
3726 $self->{spell} = {};
3727 $self->rebuild_spell_list;
3728}
3729
3730#############################################################################
3731
3009package CFClient::UI::Root; 3732package CFClient::UI::Root;
3010 3733
3011our @ISA = CFClient::UI::Container::; 3734our @ISA = CFClient::UI::Container::;
3735
3736use List::Util qw(min max);
3012 3737
3013use CFClient::OpenGL; 3738use CFClient::OpenGL;
3014 3739
3015sub new { 3740sub new {
3016 my $class = shift; 3741 my $class = shift;
… …
3043 $coord = $max - $size if $coord > $max - $size; 3768 $coord = $max - $size if $coord > $max - $size;
3044 3769
3045 int $coord + 0.5 3770 int $coord + 0.5
3046} 3771}
3047 3772
3048sub size_allocate { 3773sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3774 my ($self, $w, $h) = @_;
3050 3775
3051 for my $child ($self->children) { 3776 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3777 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053 3778
… …
3057 $X = _to_pixel $X, $W, $self->{w}; 3782 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h}; 3783 $Y = _to_pixel $Y, $H, $self->{h};
3059 3784
3060 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
3061 } 3786 }
3787
3788 1
3062} 3789}
3063 3790
3064sub coord2local { 3791sub coord2local {
3065 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
3066 3793
… …
3122 $_->() 3849 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3850 for values %{delete $self->{refresh_hook}};
3124 } 3851 }
3125 3852
3126 if ($self->{realloc}) { 3853 if ($self->{realloc}) {
3854 my %queue;
3127 my @queue; 3855 my @queue;
3856 my $widget;
3128 3857
3858 outer:
3129 while () { 3859 while () {
3130 if ($self->{realloc}) { 3860 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 3861 for $widget (values %$realloc) {
3862 $widget->{visible} or next; # do not resize invisible widgets
3132 3863
3133 use sort 'stable'; 3864 $queue{$widget+0}++ and next; # duplicates are common
3134 3865
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 3866 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 3867 }
3137 } 3868 }
3138 3869
3870 while () {
3871 @queue or last outer;
3872
3139 my $widget = pop @queue || last; 3873 $widget = pop @{ $queue[-1] || [] }
3874 and last;
3875
3876 pop @queue;
3877 }
3140 3878
3141 $widget->{visible} or last; # do not resize invisible widgets 3879 delete $queue{$widget+0};
3142 3880
3143 my ($w, $h) = $widget->size_request; 3881 my ($w, $h) = $widget->size_request;
3144 3882
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3883 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3884 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3885
3886 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3887 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147 3888
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 3889 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 3890 $h = $widget->{force_h} if exists $widget->{force_h};
3150 3891
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3892 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3154 $widget->{req_h} = $h; 3895 $widget->{req_h} = $h;
3155 3896
3156 $self->{size_alloc}{$widget+0} = $widget; 3897 $self->{size_alloc}{$widget+0} = $widget;
3157 3898
3158 if (my $parent = $widget->{parent}) { 3899 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 3900 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 3901 unless $queue{$parent+0};
3902
3161 $parent->{force_size_alloc} = 1; 3903 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 3904 $self->{size_alloc}{$parent+0} = $parent;
3163 } 3905 }
3164 } 3906 }
3165 3907
… …
3181 3923
3182 $w = int $w + 0.5; 3924 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 3925 $h = int $h + 0.5;
3184 3926
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3927 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928 $widget->{old_w} = $widget->{w};
3929 $widget->{old_h} = $widget->{h};
3930
3186 $widget->{w} = $w; 3931 $widget->{w} = $w;
3187 $widget->{h} = $h; 3932 $widget->{h} = $h;
3188 3933
3189 $widget->emit (size_allocate => $w, $h); 3934 $widget->emit (size_allocate => $w, $h);
3190 } 3935 }
… …
3205 glLoadIdentity; 3950 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3952 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3953 glLoadIdentity;
3209 3954
3955 {
3956 package CFClient::UI::Base;
3957
3958 ($draw_x, $draw_y, $draw_w, $draw_h) =
3959 (0, 0, $self->{w}, $self->{h});
3960 }
3961
3210 $self->_draw; 3962 $self->_draw;
3211} 3963}
3212 3964
3213############################################################################# 3965#############################################################################
3214 3966

Diff Legend

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