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

Diff Legend

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