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.261 by elmex, Tue May 30 14:45:56 2006 UTC vs.
Revision 1.325 by root, Thu Jul 13 01:29:17 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
… …
332} 333}
333 334
334sub size_request { 335sub size_request {
335 require Carp; 336 require Carp;
336 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
337} 342}
338 343
339sub configure { 344sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
341 346
… …
365 370
366 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
367 } 372 }
368} 373}
369 374
370sub size_allocate {
371 # nothing to be done
372}
373
374sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
375} 381}
376 382
377sub set_max_size { 383sub set_max_size {
378 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
379 385
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
382} 390}
383 391
384sub set_tooltip { 392sub set_tooltip {
385 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
386 394
… …
391 399
392 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
393 401
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
397 } 405 }
398} 406}
399 407
400# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
401sub coord2local { 409sub coord2local {
… …
409 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
410 418
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
412} 420}
413 421
414sub focus_in { 422sub invoke_focus_in {
415 my ($self) = @_; 423 my ($self) = @_;
416 424
417 return if $FOCUS == $self; 425 return if $FOCUS == $self;
418 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
419 427
420 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
421 429
422 $self->_emit (focus_in => $focus); 430 $self->update;
423 431
424 $focus->update if $focus; 432 0
425 $FOCUS->update;
426} 433}
427 434
428sub focus_out { 435sub invoke_focus_out {
429 my ($self) = @_; 436 my ($self) = @_;
430 437
431 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
432 439
433 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
434 441
435 $self->_emit (focus_out => $focus); 442 $self->update;
436 443
437 $focus->update if $focus; #?
438
439 $::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
440 unless $FOCUS; 445 unless $FOCUS;
441}
442 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
443sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
444sub button_up { } 458sub invoke_button_up { 1 }
445sub key_down { } 459sub invoke_key_down { 1 }
446sub key_up { } 460sub invoke_key_up { 1 }
447 461
448sub button_down { 462sub invoke_button_down {
449 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
450 464
451 $self->focus_in; 465 $self->grab_focus;
452}
453 466
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
459 484
460sub find_widget { 485sub find_widget {
461 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
462 487
463 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
472sub set_parent { 497sub set_parent {
473 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
474 499
475 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible}; 501 $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} 502}
501 503
502sub realloc { 504sub realloc {
503 my ($self) = @_; 505 my ($self) = @_;
504 506
… …
525 527
526 $self->realloc; 528 $self->realloc;
527 $self->update; 529 $self->update;
528} 530}
529 531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535
530sub draw { 536sub draw {
531 my ($self) = @_; 537 my ($self) = @_;
532 538
533 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534 548
535 glPushMatrix; 549 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 551
540 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 554 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 556 glBegin GL_QUADS;
547 glVertex $x , $y; 557 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
551 glEnd; 561 glEnd;
552 glDisable GL_BLEND; 562 glDisable GL_BLEND;
553 } 563 }
554 564
555 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 566 glPushMatrix;
557 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 570 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
564 glEnd; 574 glEnd;
565 glPopMatrix; 575 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
568} 581}
569 582
570sub _draw { 583sub _draw {
571 my ($self) = @_; 584 my ($self) = @_;
572 585
… …
574} 587}
575 588
576sub DESTROY { 589sub DESTROY {
577 my ($self) = @_; 590 my ($self) = @_;
578 591
592 return if CFClient::in_destruct;
593
579 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
580 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
581} 598}
582 599
583############################################################################# 600#############################################################################
584 601
585package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
610 627
611 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
613 630
614 glEnable GL_BLEND; 631 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 633 glColor_premultiply @$color;
617 634
618 glBegin GL_QUADS; 635 glBegin GL_QUADS;
619 glVertex 0 , 0; 636 glVertex 0 , 0;
620 glVertex 0 , $h; 637 glVertex 0 , $h;
621 glVertex $w, $h; 638 glVertex $w, $h;
… …
652our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
653 670
654sub new { 671sub new {
655 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
656 673
657 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
658 675
659 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
660 children => [], 677 children => [],
661 can_events => 0, 678 can_events => 0,
662 %arg, 679 %arg,
663 ); 680 );
681
664 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
665 684
666 $self 685 $self
667} 686}
668 687
669sub add { 688sub add {
… …
717 $x -= $self->{x}; 736 $x -= $self->{x};
718 $y -= $self->{y}; 737 $y -= $self->{y};
719 738
720 my $res; 739 my $res;
721 740
722 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
724 and return $res; 743 and return $res;
725 } 744 }
726 745
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748} 767}
749 768
750sub add { 769sub add {
751 my ($self, $child) = @_; 770 my ($self, $child) = @_;
752 771
753 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
756} 774}
757 775
758sub remove { 776sub remove {
759 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
768 786
769sub size_request { 787sub size_request {
770 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
771} 789}
772 790
773sub size_allocate { 791sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
775 793
776 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
777} 797}
778 798
779############################################################################# 799#############################################################################
800
801# back-buffered drawing area
780 802
781package CFClient::UI::Window; 803package CFClient::UI::Window;
782 804
783our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
784 806
… …
795 817
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 819 $self->SUPER::update;
798} 820}
799 821
800sub size_allocate { 822sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
802 824
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
805} 828}
806 829
807sub _render { 830sub _render {
831 my ($self) = @_;
832
808 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
809} 834}
810 835
811sub render_child { 836sub render_child {
812 my ($self) = @_; 837 my ($self) = @_;
813 838
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
817 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
818 $self->_render; 850 $self->_render;
819 }; 851 };
820} 852}
821 853
822sub _draw { 854sub _draw {
823 my ($self) = @_; 855 my ($self) = @_;
824 856
825 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
826 858
827 my $tex = $self->{texture} 859 my $tex = $self->{texture}
828 or return; 860 or return;
829 861
830 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
833 865
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 867
836 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
837} 869}
… …
861 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
862 894
863 ($w, $h) 895 ($w, $h)
864} 896}
865 897
866sub size_allocate { 898sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
868 900
869 my $child = $self->child; 901 my $child = $self->child;
870 902
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 905
874 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
875 $self->update; 907 $self->update;
908
909 1
876} 910}
877 911
878sub set_offset { 912sub set_offset {
879 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
880 914
… …
913} 947}
914 948
915sub _render { 949sub _render {
916 my ($self) = @_; 950 my ($self) = @_;
917 951
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
954
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 956
920 $self->SUPER::_render; 957 $self->SUPER::_render;
921} 958}
922 959
… …
925package CFClient::UI::ScrolledWindow; 962package CFClient::UI::ScrolledWindow;
926 963
927our @ISA = CFClient::UI::HBox::; 964our @ISA = CFClient::UI::HBox::;
928 965
929sub new { 966sub new {
930 my $class = shift; 967 my ($class, %arg) = @_;
968
969 my $child = delete $arg{child};
931 970
932 my $self; 971 my $self;
933 972
934 my $slider = new CFClient::UI::Slider 973 my $slider = new CFClient::UI::Slider
935 vertical => 1, 974 vertical => 1,
… …
940 ; 979 ;
941 980
942 $self = $class->SUPER::new ( 981 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 982 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 983 slider => $slider,
945 @_, 984 %arg,
946 ); 985 );
947 986
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 987 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child;
951 989
952 $self 990 $self
953} 991}
954 992
993#TODO# update range on size_allocate depending on child
994
995sub add {
996 my ($self, $widget) = @_;
997
998 $self->{vp}->add ($self->{child} = $widget);
999}
1000
1001sub update_slider {
1002 my ($self) = @_;
1003
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005}
1006
955sub update { 1007sub update {
956 my ($self) = @_; 1008 my ($self) = @_;
957 1009
958 $self->SUPER::update; 1010 $self->SUPER::update;
959 1011
960 # todo: overwrite size_allocate of child 1012 $self->update_slider;
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1013}
964 1014
965sub size_allocate { 1015sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1016 my ($self, $w, $h) = @_;
967 1017
1018 $self->update_slider;
1019
968 $self->SUPER::size_allocate ($w, $h); 1020 $self->SUPER::invoke_size_allocate ($w, $h)
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972} 1021}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1022
977############################################################################# 1023#############################################################################
978 1024
979package CFClient::UI::Frame; 1025package CFClient::UI::Frame;
980 1026
… …
996 1042
997 if ($self->{bg}) { 1043 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1044 my ($w, $h) = @$self{qw(w h)};
999 1045
1000 glEnable GL_BLEND; 1046 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1047 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1048 glColor_premultiply @{ $self->{bg} };
1003 1049
1004 glBegin GL_QUADS; 1050 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1051 glVertex 0 , 0;
1006 glVertex 0 , $h; 1052 glVertex 0 , $h;
1007 glVertex $w, $h; 1053 glVertex $w, $h;
… …
1029my @border = 1075my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1076 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); 1077 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1078
1033sub new { 1079sub new {
1034 my $class = shift; 1080 my ($class, %arg) = @_;
1035 1081
1036 my $self = $class->SUPER::new ( 1082 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1083 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1084 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1085 border => 0.6,
1040 can_events => 1, 1086 can_events => 1,
1041 min_w => 16, 1087 min_w => 16,
1042 min_h => 16, 1088 min_h => 16,
1043 @_ 1089 %arg,
1044 ); 1090 );
1045 1091
1046 $self->{title} &&= new CFClient::UI::Label 1092 $self->{title_widget} = new CFClient::UI::Label
1047 align => 0, 1093 align => 0,
1048 valign => 1, 1094 valign => 1,
1049 text => $self->{title}, 1095 text => $self->{title},
1050 fontsize => $self->{border}; 1096 fontsize => $self->{border},
1097 if exists $self->{title};
1098
1099 if ($self->{has_close_button}) {
1100 $self->{close_button} =
1101 new CFClient::UI::ImageButton
1102 path => 'x1_close.png',
1103 on_activate => sub { $self->emit ("delete") };
1104
1105 $self->CFClient::UI::Container::add ($self->{close_button});
1106 }
1051 1107
1052 $self 1108 $self
1109}
1110
1111sub add {
1112 my ($self, @widgets) = @_;
1113
1114 $self->SUPER::add (@widgets);
1115 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1116 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1117}
1054 1118
1055sub border { 1119sub border {
1056 int $_[0]{border} * $::FONTSIZE 1120 int $_[0]{border} * $::FONTSIZE
1057} 1121}
1058 1122
1059sub size_request { 1123sub size_request {
1060 my ($self) = @_; 1124 my ($self) = @_;
1125
1126 $self->{title_widget}->size_request
1127 if $self->{title_widget};
1128
1129 $self->{close_button}->size_request
1130 if $self->{close_button};
1061 1131
1062 my ($w, $h) = $self->SUPER::size_request; 1132 my ($w, $h) = $self->SUPER::size_request;
1063 1133
1064 ( 1134 (
1065 $w + $self->border * 2, 1135 $w + $self->border * 2,
1066 $h + $self->border * 2, 1136 $h + $self->border * 2,
1067 ) 1137 )
1068} 1138}
1069 1139
1070sub size_allocate { 1140sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1141 my ($self, $w, $h) = @_;
1072 1142
1143 if ($self->{title_widget}) {
1144 $self->{title_widget}{w} = $w;
1145 $self->{title_widget}{h} = $h;
1146 $self->{title_widget}->invoke_size_allocate ($w, $h);
1147 }
1148
1149 my $border = $self->border;
1150
1073 $h -= List::Util::max 0, $self->border * 2; 1151 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1152 $w -= List::Util::max 0, $border * 2;
1075 1153
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); 1154 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1155
1156 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1157 if $self->{close_button};
1158
1159 1
1160}
1161
1162sub invoke_delete {
1163 my ($self) = @_;
1164
1165 $self->hide;
1166
1167 1
1168}
1169
1082sub button_down { 1170sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
1084 1172
1085 my ($w, $h) = @$self{qw(w h)}; 1173 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1174 my $border = $self->border;
1087 1175
… …
1103 my $dy = $ev->{y} - $oy; 1191 my $dy = $ev->{y} - $oy;
1104 1192
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1193 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1194 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1195
1196 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1197 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1198 };
1111 1199
1112 } elsif ($lr ^ $td) { 1200 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1201 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1202 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1205 my ($ev, $x, $y) = @_;
1118 1206
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1207 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1208
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1209 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1210 # HACK: the next line is required to enforce placement
1211 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1212 };
1213 } else {
1214 return 0;
1215 }
1216
1123 } 1217 1
1124} 1218}
1125 1219
1126sub button_up { 1220sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1128 1222
1129 delete $self->{motion}; 1223 ! ! delete $self->{motion}
1130} 1224}
1131 1225
1132sub mouse_motion { 1226sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1227 my ($self, $ev, $x, $y) = @_;
1134 1228
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1229 $self->{motion}->($ev, $x, $y) if $self->{motion};
1230
1231 ! ! $self->{motion}
1136} 1232}
1137 1233
1138sub _draw { 1234sub _draw {
1139 my ($self) = @_; 1235 my ($self) = @_;
1140 1236
1237 my $child = $self->{children}[0];
1238
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1239 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1240 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1241
1144 glEnable GL_TEXTURE_2D; 1242 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1244
1147 my $border = $self->border; 1245 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1260 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1261 }
1164 1262
1165 glDisable GL_TEXTURE_2D; 1263 glDisable GL_TEXTURE_2D;
1166 1264
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1265 $child->draw;
1266
1267 if ($self->{title_widget}) {
1268 glTranslate 0, $border - $self->{h};
1269 $self->{title_widget}->_draw;
1270
1271 glTranslate 0, - ($border - $self->{h});
1272 }
1273
1274 $self->{close_button}->draw
1275 if $self->{close_button};
1170} 1276}
1171 1277
1172############################################################################# 1278#############################################################################
1173 1279
1174package CFClient::UI::Table; 1280package CFClient::UI::Table;
… …
1197 1303
1198 $child->set_parent ($self); 1304 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1305 $self->{children}[$y][$x] = $child;
1200 1306
1201 $self->realloc; 1307 $self->realloc;
1308}
1309
1310sub remove {
1311 my ($self, $child) = @_;
1312
1313 # TODO: not yet implemented
1202} 1314}
1203 1315
1204# TODO: move to container class maybe? send children a signal on removal? 1316# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1317sub clear {
1206 my ($self) = @_; 1318 my ($self) = @_;
… …
1247 (sum @$ws), 1359 (sum @$ws),
1248 (sum @$hs), 1360 (sum @$hs),
1249 ) 1361 )
1250} 1362}
1251 1363
1252sub size_allocate { 1364sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1365 my ($self, $w, $h) = @_;
1254 1366
1255 my ($ws, $hs) = $self->get_wh; 1367 my ($ws, $hs) = $self->get_wh;
1256 1368
1257 my $req_w = (sum @$ws) || 1; 1369 my $req_w = (sum @$ws) || 1;
… …
1289 } 1401 }
1290 1402
1291 $y += $row_h; 1403 $y += $row_h;
1292 } 1404 }
1293 1405
1406 1
1294} 1407}
1295 1408
1296sub find_widget { 1409sub find_widget {
1297 my ($self, $x, $y) = @_; 1410 my ($self, $x, $y) = @_;
1298 1411
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1448 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1449 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1450 )
1338} 1451}
1339 1452
1340sub size_allocate { 1453sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1454 my ($self, $w, $h) = @_;
1342 1455
1343 my $space = $self->{vertical} ? $h : $w; 1456 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1457 my @children = $self->visible_children;
1345 1458
1346 my @req; 1459 my @req;
1347 1460
1348 if ($self->{homogeneous}) { 1461 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1462 @req = ($space / (@children || 1)) x @children;
1350 } else { 1463 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1464 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1465 my $req = List::Util::sum @req;
1353 1466
1354 if ($req > $space) { 1467 if ($req > $space) {
1355 # ah well, not enough space 1468 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1469 $_ *= $space / $req for @req;
1357 } else { 1470 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1471 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1472
1360 $space = ($space - $req) / $expand; # remaining space to give away 1473 $space = ($space - $req) / $expand; # remaining space to give away
1361 1474
1362 $req[$_] += $space * $children->[$_]{expand} 1475 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1476 for 0 .. $#children;
1364 } 1477 }
1365 } 1478 }
1366 1479
1367 CFClient::UI::harmonize \@req; 1480 CFClient::UI::harmonize \@req;
1368 1481
1369 my $pos = 0; 1482 my $pos = 0;
1370 for (0 .. $#$children) { 1483 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1484 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1485 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1486
1374 $pos += $alloc; 1487 $pos += $alloc;
1375 } 1488 }
1376 1489
1377 1 1490 1
… …
1467 1580
1468 delete $self->{texture}; 1581 delete $self->{texture};
1469 $self->SUPER::update; 1582 $self->SUPER::update;
1470} 1583}
1471 1584
1585sub realloc {
1586 my ($self) = @_;
1587
1588 delete $self->{ox};
1589 $self->SUPER::realloc;
1590}
1591
1472sub set_text { 1592sub set_text {
1473 my ($self, $text) = @_; 1593 my ($self, $text) = @_;
1474 1594
1475 return if $self->{text} eq "T$text"; 1595 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1596 $self->{text} = "T$text";
1477 1597
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1598 $self->{layout}->set_text ($text);
1480 1599
1600 delete $self->{size_req};
1481 $self->realloc; 1601 $self->realloc;
1482 $self->update; 1602 $self->update;
1483} 1603}
1484 1604
1485sub set_markup { 1605sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1608 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1609 $self->{text} = "M$markup";
1490 1610
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1611 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1612
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1495 1614
1615 delete $self->{size_req};
1496 $self->realloc; 1616 $self->realloc;
1497 $self->update; 1617 $self->update;
1498} 1618}
1499 1619
1500sub size_request { 1620sub size_request {
1501 my ($self) = @_; 1621 my ($self) = @_;
1502 1622
1623 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1629
1509 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1510 1631
1511 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1634 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1636
1515 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1516 1638
1517 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1640 $h = List::Util::max $h, $h2;
1641 }
1642
1643 [$w, $h]
1519 } 1644 };
1520 1645
1521 ($w, $h) 1646 @{ $self->{size_req} }
1522} 1647}
1523 1648
1649sub baseline_shift {
1650 $_[0]{layout}->descent
1651}
1652
1524sub size_allocate { 1653sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1654 my ($self, $w, $h) = @_;
1526 1655
1656 delete $self->{ox};
1657
1527 delete $self->{texture}; 1658 delete $self->{texture}
1659 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1660
1661 1
1528} 1662}
1529 1663
1530sub set_fontsize { 1664sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1665 my ($self, $fontsize) = @_;
1532 1666
1533 $self->{fontsize} = $fontsize; 1667 $self->{fontsize} = $fontsize;
1668 delete $self->{size_req};
1534 delete $self->{texture}; 1669 delete $self->{texture};
1535 1670
1536 $self->realloc; 1671 $self->realloc;
1537} 1672}
1538 1673
1674sub reconfigure {
1675 my ($self) = @_;
1676
1677 delete $self->{size_req};
1678 delete $self->{texture};
1679
1680 $self->SUPER::reconfigure;
1681}
1682
1539sub _draw { 1683sub _draw {
1540 my ($self) = @_; 1684 my ($self) = @_;
1541 1685
1542 $self->SUPER::_draw; # draw background, if applicable 1686 $self->SUPER::_draw; # draw background, if applicable
1543 1687
1544 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}}); 1689 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1547 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1695
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1696 [$self->{layout}->size]
1697 };
1553 1698
1699 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1702 : ($self->{w} - $size->[0]) * 0.5);
1557 1703
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1706 : ($self->{h} - $size->[1]) * 0.5);
1561
1562 $tex
1563 }; 1707 };
1564 1708
1565 glEnable GL_TEXTURE_2D; 1709 my $w = List::Util::min $self->{w} + 4, $size->[0];
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1710 my $h = List::Util::min $self->{h} + 2, $size->[1];
1567 1711
1568 if ($tex->{format} == GL_ALPHA) { 1712 $self->{layout}->render ($self->{ox}, $self->{oy});
1569 glColor @{$self->{fg}};
1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1574
1575 glDisable GL_TEXTURE_2D;
1576} 1713}
1577 1714
1578############################################################################# 1715#############################################################################
1579 1716
1580package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
1594 can_hover => 1, 1731 can_hover => 1,
1595 can_focus => 1, 1732 can_focus => 1,
1596 valign => 0, 1733 valign => 0,
1597 can_events => 1, 1734 can_events => 1,
1598 #text => ... 1735 #text => ...
1736 #hidden => "*",
1599 @_ 1737 @_
1600 ) 1738 )
1601} 1739}
1602 1740
1603sub _set_text { 1741sub _set_text {
… …
1605 1743
1606 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1607 1745
1608 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1609 1747
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1749 $self->{text} = $text;
1614 1750
1615 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1617 1754
1618 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1619} 1759}
1620 1760
1621sub set_text { 1761sub set_text {
1622 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1623 1763
1624 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 1765 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 1766}
1629 1767
1630sub get_text { 1768sub get_text {
1631 $_[0]{text} 1769 $_[0]{text}
1632} 1770}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1638 1776
1639 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1640} 1778}
1641 1779
1642sub key_down { 1780sub invoke_key_down {
1643 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1644 1782
1645 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1659 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1660 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 1802 $self->emit ('escape');
1665 } elsif ($uni) { 1803 } elsif ($uni) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1667 } 1807 }
1668 1808
1669 $self->_set_text ($text); 1809 $self->_set_text ($text);
1670 1810
1671 $self->realloc; 1811 $self->realloc;
1672}
1673 1812
1813 1
1814}
1815
1674sub focus_in { 1816sub invoke_focus_in {
1675 my ($self) = @_; 1817 my ($self) = @_;
1676 1818
1677 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1678 1820
1679 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1680} 1822}
1681 1823
1682sub button_down { 1824sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1684 1826
1685 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 1828
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 1830
1689 # byte-index to char-index 1831 # byte-index to char-index
1690 my $text = $self->{text}; 1832 my $text = $self->{text};
1691 utf8::encode $text; 1833 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length $text;
1693 1835
1694 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1695 $self->update; 1837 $self->update;
1838
1839 1
1696} 1840}
1697 1841
1698sub mouse_motion { 1842sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1701} 1847}
1702 1848
1703sub _draw { 1849sub _draw {
1704 my ($self) = @_; 1850 my ($self) = @_;
1705 1851
1706 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1707 1853
1708 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1711 } else { 1857 } else {
1712 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1713 } 1859 }
1714 1860
1715 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1718 glVertex 0 , 0; 1864 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1746 1892
1747our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1748 1894
1749use CFClient::OpenGL; 1895use CFClient::OpenGL;
1750 1896
1751sub key_down { 1897sub invoke_key_down {
1752 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1753 1899
1754 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1755 1901
1756 if ($sym == 13) { 1902 if ($sym == 13) {
1757 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1759 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1762 $self->update; 1909 $self->update;
1763 1910
1764 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1782 } else { 1929 } else {
1783 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1784 } 1931 }
1785 1932
1786 } else { 1933 } else {
1787 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1788 } 1937 1
1789
1790} 1938}
1791 1939
1792############################################################################# 1940#############################################################################
1793 1941
1794package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1815 can_events => 1, 1963 can_events => 1,
1816 @_ 1964 @_
1817 ) 1965 )
1818} 1966}
1819 1967
1820sub activate { }
1821
1822sub button_up { 1968sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1824 1970
1825 $self->emit ("activate") 1971 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1974
1975 1
1828} 1976}
1829 1977
1830sub _draw { 1978sub _draw {
1831 my ($self) = @_; 1979 my ($self) = @_;
1832 1980
1833 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 1982
1839 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1842 1986
1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1844 1988
1845 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1846 1990
1847 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1848} 2028}
1849 2029
1850############################################################################# 2030#############################################################################
1851 2031
1852package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1879 my ($self) = @_; 2059 my ($self) = @_;
1880 2060
1881 (6) x 2 2061 (6) x 2
1882} 2062}
1883 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
1884sub button_down { 2072sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
1886 2074
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2077 $self->toggle;
1890 $self->_emit (changed => $self->{state}); 2078 } else {
2079 return 0
2080 }
2081
1891 } 2082 1
1892} 2083}
1893 2084
1894sub _draw { 2085sub _draw {
1895 my ($self) = @_; 2086 my ($self) = @_;
1896 2087
… …
1916package CFClient::UI::Image; 2107package CFClient::UI::Image;
1917 2108
1918our @ISA = CFClient::UI::Base::; 2109our @ISA = CFClient::UI::Base::;
1919 2110
1920use CFClient::OpenGL; 2111use CFClient::OpenGL;
1921use Carp qw/confess/;
1922 2112
1923our %loaded_images; 2113our %texture_cache;
1924 2114
1925sub new { 2115sub new {
1926 my $class = shift; 2116 my $class = shift;
1927 2117
1928 my $self = $class->SUPER::new (can_events => 0, @_); 2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
1929 2122
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2123 $self->{path}
2124 or Carp::croak "required attribute 'path' not set";
1931 2125
1932 $loaded_images{$self->{image}} ||= 2126 $self->{tex} = $texture_cache{$self->{path}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1934 2128
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
1936 2130
1937 Scalar::Util::weaken $loaded_images{$self->{image}}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940 2132
1941 $self 2133 $self
1942} 2134}
1943 2135
1944sub size_request { 2136sub size_request {
1945 my ($self) = @_; 2137 my ($self) = @_;
1946 2138
1947 ($self->{tex}->{w}, $self->{tex}->{h}) 2139 ($self->{tex}{w}, $self->{tex}{h})
1948} 2140}
1949 2141
1950sub _draw { 2142sub _draw {
1951 my ($self) = @_; 2143 my ($self) = @_;
1952 2144
… …
2061 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2062 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2063 2255
2064 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2257 my $h2 = $self->{h} * (1 - $ycut2);
2258 my $h3 = $self->{h};
2259
2260 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2066 2261
2067 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2266 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2267
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2268 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2269 glBegin GL_QUADS;
… …
2088 2284
2089 if ($t3) { 2285 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd; 2292 glEnd;
2097 } 2293 }
2098 2294
2099 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
2187 $self->update; 2383 $self->update;
2188 2384
2189 $self 2385 $self
2190} 2386}
2191 2387
2192sub changed { }
2193
2194sub set_range { 2388sub set_range {
2195 my ($self, $range) = @_; 2389 my ($self, $range) = @_;
2196 2390
2197 ($range, $self->{range}) = ($self->{range}, $range); 2391 ($range, $self->{range}) = ($self->{range}, $range);
2198 2392
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2393 if ("@$range" ne "@{$self->{range}}") {
2394 $self->update;
2395 $self->set_value ($self->{range}[0]);
2396 }
2201} 2397}
2202 2398
2203sub set_value { 2399sub set_value {
2204 my ($self, $value) = @_; 2400 my ($self, $value) = @_;
2205 2401
… …
2216 if $unit; 2412 if $unit;
2217 2413
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2414 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2415
2220 if ($value != $old_value) { 2416 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2417 $self->emit (changed => $value);
2222 $self->update; 2418 $self->update;
2223 } 2419 }
2224} 2420}
2225 2421
2226sub size_request { 2422sub size_request {
2227 my ($self) = @_; 2423 my ($self) = @_;
2228 2424
2229 ($self->{req_w}, $self->{req_h}) 2425 ($self->{req_w}, $self->{req_h})
2230} 2426}
2231 2427
2232sub button_down { 2428sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2234 2430
2235 $self->SUPER::button_down ($ev, $x, $y); 2431 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2432
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2433 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2434
2239 $self->mouse_motion ($ev, $x, $y); 2435 $self->invoke_mouse_motion ($ev, $x, $y)
2240} 2436}
2241 2437
2242sub mouse_motion { 2438sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2244 2440
2245 if ($GRAB == $self) { 2441 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2442 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2443
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2444 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2445
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2446 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2447
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2448 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2449 } else {
2450 return 0;
2451 }
2452
2253 } 2453 1
2254} 2454}
2255 2455
2256sub update { 2456sub update {
2257 my ($self) = @_; 2457 my ($self) = @_;
2258 2458
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2459 delete $self->{knob_w};
2460 $self->SUPER::update;
2461}
2462
2463sub _draw {
2464 my ($self) = @_;
2465
2466 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2467 $self->set_value ($self->{range}[0]);
2261 2468
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2469 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2470 my $range = ($hi - $page - $lo) || 1e-100;
2264 2471
… …
2270 $value = ($value - $lo) / $range; 2477 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2478 $value = $value * $self->{scale} + $self->{offset};
2272 2479
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2480 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2481 $self->{knob_w} = $knob_w;
2275 }); 2482 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2483
2283 $self->SUPER::_draw (); 2484 $self->SUPER::_draw ();
2284 2485
2285 glScale $self->{w}, $self->{h}; 2486 glScale $self->{w}, $self->{h};
2286 2487
… …
2347sub set_range { shift->{slider}->set_range (@_) } 2548sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 2549sub set_value { shift->{slider}->set_value (@_) }
2349 2550
2350############################################################################# 2551#############################################################################
2351 2552
2352package CFClient::UI::TextView; 2553package CFClient::UI::TextScroller;
2353 2554
2354our @ISA = CFClient::UI::HBox::; 2555our @ISA = CFClient::UI::HBox::;
2355 2556
2356use CFClient::OpenGL; 2557use CFClient::OpenGL;
2357 2558
… …
2359 my $class = shift; 2560 my $class = shift;
2360 2561
2361 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2362 fontsize => 1, 2563 fontsize => 1,
2363 can_events => 0, 2564 can_events => 0,
2565 indent => 0,
2364 #font => default_font 2566 #font => default_font
2365 @_, 2567 @_,
2366 2568
2367 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2368 par => [], 2570 par => [],
2369 height => 0, 2571 height => 0,
2370 children => [ 2572 children => [
2371 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2372 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
… …
2383 2585
2384 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2385 $self->reflow; 2587 $self->reflow;
2386} 2588}
2387 2589
2590sub size_request {
2591 my ($self) = @_;
2592
2593 my ($empty, $slider) = @{ $self->{children} };
2594
2595 local $self->{children} = [$empty, $slider];
2596 $self->SUPER::size_request
2597}
2598
2388sub size_allocate { 2599sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 2600 my ($self, $w, $h) = @_;
2390 2601
2391 $self->SUPER::size_allocate ($w, $h); 2602 my ($empty, $slider, @other) = @{ $self->{children} };
2603 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392 2604
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2605 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2606 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2607 $self->{layout}->set_width ($empty->{w});
2608 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2609
2397 $self->reflow; 2610 $self->reflow;
2398}
2399 2611
2400sub text_size { 2612 local $self->{children} = [$empty, $slider];
2401 my ($self, $text, $indent) = @_; 2613 $self->SUPER::invoke_size_allocate ($w, $h)
2614}
2615
2616sub get_layout {
2617 my ($self, $para) = @_;
2402 2618
2403 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2404 2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2623 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2624 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2625 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2626 $layout->set_markup ($para->{markup});
2627
2628 $layout->set_shapes (
2629 map
2630 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2631 @{$para->{widget}}
2408 2632 );
2633
2409 $layout->size 2634 $layout
2410} 2635}
2411 2636
2412sub reflow { 2637sub reflow {
2413 my ($self) = @_; 2638 my ($self) = @_;
2414 2639
… …
2423 $self->{children}[1]->set_value ($offset); 2648 $self->{children}[1]->set_value ($offset);
2424} 2649}
2425 2650
2426sub clear { 2651sub clear {
2427 my ($self) = @_; 2652 my ($self) = @_;
2653
2654 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other;
2428 2656
2429 $self->{par} = []; 2657 $self->{par} = [];
2430 $self->{height} = 0; 2658 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2660}
2433 2661
2434sub add_paragraph { 2662sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2663 my ($self, $color, $para, $indent) = @_;
2436 2664
2437 for my $line (split /\n/, $text) { 2665 my ($text, @w) = ref $para ? @$para : $para;
2438 my ($w, $h) = $self->text_size ($line); 2666
2439 $self->{height} += $h; 2667 $para = {
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2668 w => 1e10,
2669 wrapped => 1,
2670 fg => $color,
2671 indent => $indent,
2672 markup => $text,
2673 widget => \@w,
2441 } 2674 };
2442 2675
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2676 $self->add (@w) if @w;
2677 push @{$self->{par}}, $para;
2678
2679 $self->{need_reflow}++;
2680 $self->update;
2681}
2682
2683sub scroll_to_bottom {
2684 my ($self) = @_;
2685
2686 $self->{scroll_to_bottom} = 1;
2687 $self->update;
2444} 2688}
2445 2689
2446sub update { 2690sub update {
2447 my ($self) = @_; 2691 my ($self) = @_;
2448 2692
… …
2450 2694
2451 return unless $self->{h} > 0; 2695 return unless $self->{h} > 0;
2452 2696
2453 delete $self->{texture}; 2697 delete $self->{texture};
2454 2698
2455 $ROOT->on_post_alloc ($self, sub { 2699 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2701
2458 if (delete $self->{need_reflow}) { 2702 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2703 my $height = 0;
2460 2704
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2705 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2707 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2708 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2709
2471 $_->[1] = $h; 2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2472 } 2713 }
2473 2714
2474 $height += $_->[1]; 2715 $height += $para->{h};
2475 } 2716 }
2476 2717
2477 $self->{height} = $height; 2718 $self->{height} = $height;
2478 2719
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2720 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2721
2481 delete $self->{texture}; 2722 delete $self->{texture};
2482 } 2723 }
2483 2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2727 }
2728
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2730 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2731 glClear GL_COLOR_BUFFER_BIT;
2487 2732
2488 my $top = int $self->{children}[1]{range}[0]; 2733 my $top = int $self->{children}[1]{range}[0];
2489 2734
2490 my $y0 = $top; 2735 my $y0 = $top;
2491 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2492 2737
2493 my $y = 0; 2738 my $y = 0;
2494 2739
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2503 for my $par (@{$self->{par}}) { 2740 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2741 my $h = $para->{h};
2505 2742
2506 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2509 $layout->set_markup ($par->[4]);
2510 2744
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2745 my $layout = $self->get_layout ($para);
2512 2746
2513 glRasterPos $par->[3], $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2748
2749 if (my @w = @{ $para->{widget} }) {
2750 my @s = $layout->get_shapes;
2751
2752 for (@w) {
2753 my ($dx, $dy) = splice @s, 0, 2, ();
2754
2755 $_->{x} = $dx + $para->{indent};
2756 $_->{y} = $dy + $y - $y0;
2757
2758 $_->draw;
2759 }
2760 }
2515 } 2761 }
2516 2762
2517 $y += $h; 2763 $y += $h;
2518 } 2764 }
2519
2520 glDisable GL_BLEND;
2521 }; 2765 };
2522 }); 2766 });
2523} 2767}
2524 2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2776}
2777
2525sub _draw { 2778sub _draw {
2526 my ($self) = @_; 2779 my ($self) = @_;
2527 2780
2528 glEnable GL_TEXTURE_2D; 2781 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2783 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2784 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2533 2786
2534 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2535
2536} 2788}
2537 2789
2538############################################################################# 2790#############################################################################
2539 2791
2540package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 2879 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2880 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 2881 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 2882 . "visible $widget->{visible}";
2631 } 2883 }
2884
2885 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//;
2632 2887
2633 $self->add (new CFClient::UI::Label 2888 $self->add (new CFClient::UI::Label
2634 markup => $tooltip, 2889 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 2891 fontsize => 0.8,
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 2902
2648 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2649} 2904}
2650 2905
2651sub size_allocate { 2906sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2653 2908
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 2909 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 2910}
2656 2911
2657sub visibility_change { 2912sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 2913 my ($self, $visible) = @_;
2659 2914
2660 return unless $visible; 2915 return unless $visible;
2661 2916
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 2917 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2664 or return; 2919 or return;
2665 2920
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 2922
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 2924 if $x + $self->{w} > $self->{root}{w};
2670 2925
2671 $self->move_abs ($x, $y); 2926 $self->move_abs ($x, $y);
2672 }); 2927 });
2673} 2928}
2674 2929
… …
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764 3019
2765 if ($tex) { 3020 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 3021 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 3023 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3024 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2771 } 3026 }
2772} 3027}
2773 3028
2774sub DESTROY { 3029sub destroy {
2775 my ($self) = @_; 3030 my ($self) = @_;
2776 3031
2777 $self->{timer}->cancel 3032 $self->{timer}->cancel
2778 if $self->{timer}; 3033 if $self->{timer};
2779 3034
2780 $self->SUPER::DESTROY; 3035 $self->SUPER::destroy;
2781} 3036}
2782 3037
2783############################################################################# 3038#############################################################################
2784 3039
2785package CFClient::UI::Inventory; 3040package CFClient::UI::Buttonbar;
2786 3041
2787our @ISA = CFClient::UI::ScrolledWindow::; 3042our @ISA = CFClient::UI::HBox::;
2788 3043
2789sub new { 3044# 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 3045
2825############################################################################# 3046#############################################################################
2826 3047
2827package CFClient::UI::Menu; 3048package CFClient::UI::Menu;
2828 3049
… …
2840 ); 3061 );
2841 3062
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3063 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843 3064
2844 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
2846 3067
2847 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
2848 if (!ref $widget) { 3069 if (!ref $widget) {
3070 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2;
3072
3073 $widget = new CFClient::UI::HBox
3074 can_hover => 1,
3075 can_events => 1,
3076 tooltip => $tooltip,
3077 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1),
3080 ],
3081 ;
3082
3083 } else {
2849 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2850 can_hover => 1, 3085 can_hover => 1,
2851 can_events => 1, 3086 can_events => 1,
2852 text => $widget; 3087 markup => $widget,
3088 tooltip => $tooltip;
3089 }
2853 } 3090 }
2854 3091
2855 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
2856 3093
2857 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
2862 3099
2863# popup given the event (must be a mouse button down event currently) 3100# popup given the event (must be a mouse button down event currently)
2864sub popup { 3101sub popup {
2865 my ($self, $ev) = @_; 3102 my ($self, $ev) = @_;
2866 3103
2867 $self->_emit ("popdown"); 3104 $self->emit ("popdown");
2868 3105
2869 # maybe save $GRAB? must be careful about events... 3106 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self; 3107 $GRAB = $self;
2871 $self->{button} = $ev->{button}; 3108 $self->{button} = $ev->{button};
2872 3109
2873 $self->show; 3110 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3111 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875} 3112}
2876 3113
2877sub mouse_motion { 3114sub invoke_mouse_motion {
2878 my ($self, $ev, $x, $y) = @_; 3115 my ($self, $ev, $x, $y) = @_;
2879 3116
2880 # TODO: should use vbox->find_widget or so 3117 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3118 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 3119 $self->{hover} = $self->{item}{$HOVER};
2883}
2884 3120
3121 0
3122}
3123
2885sub button_up { 3124sub invoke_button_up {
2886 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2887 3126
2888 if ($ev->{button} == $self->{button}) { 3127 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB; 3128 undef $GRAB;
2890 $self->hide; 3129 $self->hide;
2891 3130
2892 $self->_emit ("popdown"); 3131 $self->emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 3132 $self->{hover}[1]->() if $self->{hover};
3133 } else {
3134 return 0
3135 }
3136
2894 } 3137 1
2895} 3138}
2896 3139
2897############################################################################# 3140#############################################################################
2898 3141
2899package CFClient::UI::Statusbox; 3142package CFClient::UI::Multiplexer;
2900 3143
2901our @ISA = CFClient::UI::VBox::; 3144our @ISA = CFClient::UI::Container::;
2902 3145
2903sub new { 3146sub new {
2904 my $class = shift; 3147 my $class = shift;
2905 3148
2906 $class->SUPER::new ( 3149 my $self = $class->SUPER::new (
3150 @_,
3151 );
3152
3153 $self->{current} = $self->{children}[0]
3154 if @{ $self->{children} };
3155
3156 $self
3157}
3158
3159sub add {
3160 my ($self, @widgets) = @_;
3161
3162 $self->SUPER::add (@widgets);
3163
3164 $self->{current} = $self->{children}[0]
3165 if @{ $self->{children} };
3166}
3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3172}
3173
3174sub set_current_page {
3175 my ($self, $page_or_widget) = @_;
3176
3177 my $widget = ref $page_or_widget
3178 ? $page_or_widget
3179 : $self->{children}[$page_or_widget];
3180
3181 $self->{current} = $widget;
3182 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3183
3184 $self->emit (page_changed => $self->{current});
3185
3186 $self->realloc;
3187}
3188
3189sub visible_children {
3190 $_[0]{current}
3191}
3192
3193sub size_request {
3194 my ($self) = @_;
3195
3196 $self->{current}->size_request
3197}
3198
3199sub invoke_size_allocate {
3200 my ($self, $w, $h) = @_;
3201
3202 $self->{current}->configure (0, 0, $w, $h);
3203
3204 1
3205}
3206
3207sub _draw {
3208 my ($self) = @_;
3209
3210 $self->{current}->draw;
3211}
3212
3213#############################################################################
3214
3215package CFClient::UI::Notebook;
3216
3217our @ISA = CFClient::UI::VBox::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (
3223 buttonbar => (new CFClient::UI::Buttonbar),
3224 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3225 # filter => # will be put between multiplexer and $self
3226 @_,
3227 );
3228
3229 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3230 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3231
3232 $self
3233}
3234
3235sub add {
3236 my ($self, $title, $widget, $tooltip) = @_;
3237
3238 Scalar::Util::weaken $self;
3239
3240 $self->{buttonbar}->add (new CFClient::UI::Button
3241 markup => $title,
3242 tooltip => $tooltip,
3243 on_activate => sub { $self->set_current_page ($widget) },
3244 );
3245
3246 $self->{multiplexer}->add ($widget);
3247}
3248
3249sub get_current_page {
3250 my ($self) = @_;
3251
3252 $self->{multiplexer}->get_current_page
3253}
3254
3255sub set_current_page {
3256 my ($self, $page) = @_;
3257
3258 $self->{multiplexer}->set_current_page ($page);
3259 $self->emit (page_changed => $self->{multiplexer}{current});
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::Combobox;
3265
3266use utf8;
3267
3268our @ISA = CFClient::UI::Button::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (
3274 options => [], # [value, title, longdesc], ...
3275 value => undef,
3276 @_,
3277 );
3278
3279 $self->_set_value ($self->{value});
3280
3281 $self
3282}
3283
3284sub invoke_button_down {
3285 my ($self, $ev) = @_;
3286
3287 my @menu_items;
3288
3289 for (@{ $self->{options} }) {
3290 my ($value, $title, $tooltip) = @$_;
3291
3292 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293 }
3294
3295 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296}
3297
3298sub _set_value {
3299 my ($self, $value) = @_;
3300
3301 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3302 or return;
3303
3304 $self->{value} = $item->[0];
3305 $self->set_markup ("$item->[1] ⇓");
3306 $self->set_tooltip ($item->[2]);
3307}
3308
3309sub set_value {
3310 my ($self, $value) = @_;
3311
3312 return unless $self->{value} ne $value;
3313
3314 $self->_set_value ($value);
3315 $self->emit (changed => $value);
3316}
3317
3318#############################################################################
3319
3320package CFClient::UI::Statusbox;
3321
3322our @ISA = CFClient::UI::VBox::;
3323
3324sub new {
3325 my $class = shift;
3326
3327 my $self = $class->SUPER::new (
2907 fontsize => 0.8, 3328 fontsize => 0.8,
2908 @_, 3329 @_,
2909 ) 3330 );
3331
3332 Scalar::Util::weaken (my $this = $self);
3333
3334 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3335
3336 $self
2910} 3337}
2911 3338
2912sub reorder { 3339sub reorder {
2913 my ($self) = @_; 3340 my ($self) = @_;
2914 my $NOW = time; 3341 my $NOW = Time::HiRes::time;
3342
3343 # freeze display when hovering over any label
3344 return if $CFClient::UI::TOOLTIP->{owner}
3345 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3346 values %{ $self->{item} };
2915 3347
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3348 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3349 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3350 }
2919 3351
… …
2922 my @items = sort { 3354 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3355 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3356 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3357 } values %{ $self->{item} };
2926 3358
3359 $self->{timer}->interval (1);
3360
2927 my $count = 10 + 1; 3361 my $count = 10 + 1;
2928 for my $item (@items) { 3362 for my $item (@items) {
2929 last unless --$count; 3363 last unless --$count;
2930 3364
2931 push @widgets, $item->{label} ||= do { 3365 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3366 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3367 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3368 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3369 : $item->{text};
2936 3370
… …
2944 tooltip => $item->{tooltip}, 3378 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3379 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3380 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3381 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3382 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3383 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3384 can_events => 1,
2951 can_hover => 1 3385 can_hover => 1
2952 }; 3386 };
3387
3388 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3389 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3390 $label->update;
3391 $label->set_max_size (undef, $label->{req_h} * $diff)
3392 if $diff < 1;
3393 $self->{timer}->interval (1/30);
3394 } else {
3395 $label->{fg}[3] = $item->{fg}[3] || 1;
3396 }
3397
3398 push @widgets, $label;
2953 } 3399 }
2954 3400
2955 $self->clear; 3401 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3402 $self->SUPER::add (reverse @widgets);
2957} 3403}
… …
2962 $text =~ s/^\s+//; 3408 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3409 $text =~ s/\s+$//;
2964 3410
2965 return unless $text; 3411 return unless $text;
2966 3412
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3413 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3414
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3415 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3416
2971 if (my $item = $self->{item}{$group}) { 3417 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3418 if ($item->{text} eq $text) {
2973 $item->{count}++; 3419 $item->{count}++;
2974 } else { 3420 } else {
2975 $item->{count} = 1; 3421 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text; 3422 $item->{text} = $item->{tooltip} = $text;
2977 } 3423 }
2978 $item->{id} = ++$self->{id}; 3424 $item->{id} += 0.2;#d#
2979 $item->{timeout} = $timeout; 3425 $item->{timeout} = $timeout;
2980 delete $item->{label}; 3426 delete $item->{label};
2981 } else { 3427 } else {
2982 $self->{item}{$group} = { 3428 $self->{item}{$group} = {
2983 id => ++$self->{id}, 3429 id => ++$self->{id},
… …
2989 count => 1, 3435 count => 1,
2990 %arg, 3436 %arg,
2991 }; 3437 };
2992 } 3438 }
2993 3439
3440 $ROOT->on_refresh (reorder => sub {
2994 $self->reorder; 3441 $self->reorder;
3442 });
2995} 3443}
2996 3444
2997sub reconfigure { 3445sub reconfigure {
2998 my ($self) = @_; 3446 my ($self) = @_;
2999 3447
… …
3002 3450
3003 $self->reorder; 3451 $self->reorder;
3004 $self->SUPER::reconfigure; 3452 $self->SUPER::reconfigure;
3005} 3453}
3006 3454
3455sub destroy {
3456 my ($self) = @_;
3457
3458 $self->{timer}->cancel;
3459
3460 $self->SUPER::destroy;
3461}
3462
3007############################################################################# 3463#############################################################################
3008 3464
3465package CFClient::UI::Inventory;
3466
3467our @ISA = CFClient::UI::Table::;
3468
3469sub new {
3470 my $class = shift;
3471
3472 my $self = $class->SUPER::new (
3473 col_expand => [0, 1, 0],
3474 @_,
3475 );
3476
3477 $self
3478}
3479
3480sub set_items {
3481 my ($self, $items) = @_;
3482
3483 $self->clear;
3484 return unless $items;
3485
3486 my @items = sort {
3487 ($a->{type} <=> $b->{type})
3488 or ($a->{name} cmp $b->{name})
3489 } values %$items;
3490
3491 $self->{real_items} = \@items;
3492
3493 my $row = 0;
3494 for my $item (@items) {
3495 CFClient::Item::update_widgets $item;
3496
3497 $self->add (0, $row, $item->{face_widget});
3498 $self->add (1, $row, $item->{desc_widget});
3499 $self->add (2, $row, $item->{weight_widget});
3500
3501 $row++;
3502 }
3503}
3504
3505#############################################################################
3506
3507package CFClient::UI::SpellList;
3508
3509our @ISA = CFClient::UI::Table::;
3510
3511sub new {
3512 my $class = shift;
3513
3514 my $self = $class->SUPER::new (
3515 binding => [],
3516 commands => [],
3517 @_,
3518 )
3519}
3520
3521my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3522
3523my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3525my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3529my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3531my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533
3534sub rebuild_spell_list {
3535 my ($self) = @_;
3536
3537 $CFClient::UI::ROOT->on_refresh ($self => sub {
3538 $self->clear;
3539
3540 return unless $::CONN;
3541
3542 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547
3548 my $row = 0;
3549
3550 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551 my $spell = $self->{spell}{$_};
3552
3553 $row++;
3554
3555 my $spell_cb = sub {
3556 my ($widget, $ev) = @_;
3557
3558 if ($ev->{button} == 1) {
3559 $::CONN->user_send ("cast $spell->{name}");
3560 } elsif ($ev->{button} == 2) {
3561 $::CONN->user_send ("invoke $spell->{name}");
3562 } elsif ($ev->{button} == 3) {
3563 (new CFClient::UI::Menu
3564 items => [
3565 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567 ],
3568 )->popup ($ev);
3569 } else {
3570 return 0;
3571 }
3572
3573 1
3574 };
3575
3576 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577
3578 #TODO: add path info to tooltip
3579 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3580
3581 $self->add (0, $row, new CFClient::UI::Face
3582 face => $spell->{face},
3583 can_hover => 1,
3584 can_events => 1,
3585 tooltip => $tooltip,
3586 on_button_down => $spell_cb,
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $tooltip,
3595 on_button_down => $spell_cb,
3596 );
3597
3598 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602 }
3603 });
3604}
3605
3606sub add_spell {
3607 my ($self, $spell) = @_;
3608
3609 $self->{spell}->{$spell->{name}} = $spell;
3610 $self->rebuild_spell_list;
3611}
3612
3613sub remove_spell {
3614 my ($self, $spell) = @_;
3615
3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620sub clear_spells {
3621 my ($self) = @_;
3622
3623 $self->{spell} = {};
3624 $self->rebuild_spell_list;
3625}
3626
3627#############################################################################
3628
3009package CFClient::UI::Root; 3629package CFClient::UI::Root;
3010 3630
3011our @ISA = CFClient::UI::Container::; 3631our @ISA = CFClient::UI::Container::;
3632
3633use List::Util qw(min max);
3012 3634
3013use CFClient::OpenGL; 3635use CFClient::OpenGL;
3014 3636
3015sub new { 3637sub new {
3016 my $class = shift; 3638 my $class = shift;
… …
3043 $coord = $max - $size if $coord > $max - $size; 3665 $coord = $max - $size if $coord > $max - $size;
3044 3666
3045 int $coord + 0.5 3667 int $coord + 0.5
3046} 3668}
3047 3669
3048sub size_allocate { 3670sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3671 my ($self, $w, $h) = @_;
3050 3672
3051 for my $child ($self->children) { 3673 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3674 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053 3675
… …
3057 $X = _to_pixel $X, $W, $self->{w}; 3679 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h}; 3680 $Y = _to_pixel $Y, $H, $self->{h};
3059 3681
3060 $child->configure ($X, $Y, $W, $H); 3682 $child->configure ($X, $Y, $W, $H);
3061 } 3683 }
3684
3685 1
3062} 3686}
3063 3687
3064sub coord2local { 3688sub coord2local {
3065 my ($self, $x, $y) = @_; 3689 my ($self, $x, $y) = @_;
3066 3690
… …
3122 $_->() 3746 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3747 for values %{delete $self->{refresh_hook}};
3124 } 3748 }
3125 3749
3126 if ($self->{realloc}) { 3750 if ($self->{realloc}) {
3751 my %queue;
3127 my @queue; 3752 my @queue;
3753 my $widget;
3128 3754
3755 outer:
3129 while () { 3756 while () {
3130 if ($self->{realloc}) { 3757 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 3758 for $widget (values %$realloc) {
3759 $widget->{visible} or next; # do not resize invisible widgets
3132 3760
3133 use sort 'stable'; 3761 $queue{$widget+0}++ and next; # duplicates are common
3134 3762
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 3763 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 3764 }
3137 } 3765 }
3138 3766
3767 while () {
3768 @queue or last outer;
3769
3139 my $widget = pop @queue || last; 3770 $widget = pop @{ $queue[-1] || [] }
3771 and last;
3772
3773 pop @queue;
3774 }
3140 3775
3141 $widget->{visible} or last; # do not resize invisible widgets 3776 delete $queue{$widget+0};
3142 3777
3143 my ($w, $h) = $widget->size_request; 3778 my ($w, $h) = $widget->size_request;
3144 3779
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3780 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3781 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3782
3783 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3784 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147 3785
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 3786 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 3787 $h = $widget->{force_h} if exists $widget->{force_h};
3150 3788
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3789 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3154 $widget->{req_h} = $h; 3792 $widget->{req_h} = $h;
3155 3793
3156 $self->{size_alloc}{$widget+0} = $widget; 3794 $self->{size_alloc}{$widget+0} = $widget;
3157 3795
3158 if (my $parent = $widget->{parent}) { 3796 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 3797 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 3798 unless $queue{$parent+0};
3799
3161 $parent->{force_size_alloc} = 1; 3800 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 3801 $self->{size_alloc}{$parent+0} = $parent;
3163 } 3802 }
3164 } 3803 }
3165 3804
… …
3181 3820
3182 $w = int $w + 0.5; 3821 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 3822 $h = int $h + 0.5;
3184 3823
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3824 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3825 $widget->{old_w} = $widget->{w};
3826 $widget->{old_h} = $widget->{h};
3827
3186 $widget->{w} = $w; 3828 $widget->{w} = $w;
3187 $widget->{h} = $h; 3829 $widget->{h} = $h;
3188 3830
3189 $widget->emit (size_allocate => $w, $h); 3831 $widget->emit (size_allocate => $w, $h);
3190 } 3832 }
… …
3205 glLoadIdentity; 3847 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3848 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3849 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3850 glLoadIdentity;
3209 3851
3852 {
3853 package CFClient::UI::Base;
3854
3855 ($draw_x, $draw_y, $draw_w, $draw_h) =
3856 (0, 0, $self->{w}, $self->{h});
3857 }
3858
3210 $self->_draw; 3859 $self->_draw;
3211} 3860}
3212
3213#############################################################################
3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315sub ask_for_bind {
3316 my ($self, $commit) = @_;
3317
3318 CFClient::Binder::open_binding_dialog (sub {
3319 my ($mod, $sym) = @_;
3320 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3321 $self->update_binding_widgets;
3322 $self->commit if $commit;
3323 });
3324}
3325
3326sub set_binding {
3327 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328
3329 $self->clear_command_list;
3330 $self->{recording} = 0;
3331 $self->{rec_btn}->set_text ("start recording");
3332
3333 $self->{binding} = [$mod, $sym];
3334 $self->{commands} = $cmds;
3335
3336 $self->{binding_change} = $cb;
3337 $self->{binding_cancel} = $ccb;
3338
3339 $self->update_binding_widgets;
3340}
3341
3342sub update_binding_widgets {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3346 $self->set_command_list ($cmds);
3347}
3348
3349sub get_binding {
3350 my ($self) = @_;
3351 return (
3352 $self->{binding}->[0],
3353 $self->{binding}->[1],
3354 [ grep { defined $_ } @{$self->{commands}} ]
3355 );
3356}
3357
3358sub clear_command_list {
3359 my ($self) = @_;
3360 $self->{cmdbox}->clear ();
3361}
3362
3363sub set_command_list {
3364 my ($self, $cmds) = @_;
3365
3366 $self->{cmdbox}->clear ();
3367 $self->{commands} = $cmds;
3368
3369 my $idx = 0;
3370
3371 for (@$cmds) {
3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373
3374 my $i = $idx;
3375 $hb->add (new CFClient::UI::Button
3376 text => "delete",
3377 tooltip => "Deletes the action from the record",
3378 on_activate => sub {
3379 $self->{cmdbox}->remove ($hb);
3380 $cmds->[$i] = undef;
3381 });
3382
3383 $hb->add (new CFClient::UI::Label text => $_);
3384
3385 $idx++
3386 }
3387}
3388
3389 3861
3390############################################################################# 3862#############################################################################
3391 3863
3392package CFClient::UI; 3864package CFClient::UI;
3393 3865

Diff Legend

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