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.264 by root, Thu Jun 1 02:58:30 2006 UTC vs.
Revision 1.316 by root, Sun Jul 2 13:57:58 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 my $focus = $FOCUS; $FOCUS = $self;
421 429
422 $self->_emit (focus_in => $focus);
423
424 $focus->update if $focus; 430 $focus->update if $focus;
425 $FOCUS->update; 431 $FOCUS->update;
426}
427 432
433 0
434}
435
428sub focus_out { 436sub invoke_focus_out {
429 my ($self) = @_; 437 my ($self) = @_;
430 438
431 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
432 440
433 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
434 442
435 $self->_emit (focus_out => $focus);
436
437 $focus->update if $focus; #? 443 $focus->update if $focus; #?
438 444
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 446 unless $FOCUS;
441}
442 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
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->hide };
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
1082sub button_down { 1160sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1084 1162
1085 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1164 my $border = $self->border;
1087 1165
… …
1103 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
1104 1182
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1185
1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1187 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1188 };
1111 1189
1112 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1118 1196
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1198
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
1123 } 1207 1
1124} 1208}
1125 1209
1126sub button_up { 1210sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1128 1212
1129 delete $self->{motion}; 1213 ! ! delete $self->{motion}
1130} 1214}
1131 1215
1132sub mouse_motion { 1216sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1134 1218
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
1136} 1222}
1137 1223
1138sub _draw { 1224sub _draw {
1139 my ($self) = @_; 1225 my ($self) = @_;
1140 1226
1227 my $child = $self->{children}[0];
1228
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1231
1144 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1234
1147 my $border = $self->border; 1235 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1251 }
1164 1252
1165 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1166 1254
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1255 $child->draw;
1256
1257 if ($self->{title_widget}) {
1258 glTranslate 0, $border - $self->{h};
1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1170} 1266}
1171 1267
1172############################################################################# 1268#############################################################################
1173 1269
1174package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1197 1293
1198 $child->set_parent ($self); 1294 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1200 1296
1201 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1202} 1304}
1203 1305
1204# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1307sub clear {
1206 my ($self) = @_; 1308 my ($self) = @_;
… …
1247 (sum @$ws), 1349 (sum @$ws),
1248 (sum @$hs), 1350 (sum @$hs),
1249 ) 1351 )
1250} 1352}
1251 1353
1252sub size_allocate { 1354sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1254 1356
1255 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1256 1358
1257 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
… …
1289 } 1391 }
1290 1392
1291 $y += $row_h; 1393 $y += $row_h;
1292 } 1394 }
1293 1395
1396 1
1294} 1397}
1295 1398
1296sub find_widget { 1399sub find_widget {
1297 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1298 1401
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1440 )
1338} 1441}
1339 1442
1340sub size_allocate { 1443sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1342 1445
1343 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1345 1448
1346 my @req; 1449 my @req;
1347 1450
1348 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1350 } else { 1453 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1353 1456
1354 if ($req > $space) { 1457 if ($req > $space) {
1355 # ah well, not enough space 1458 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1357 } else { 1460 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1462
1360 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1361 1464
1362 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1466 for 0 .. $#children;
1364 } 1467 }
1365 } 1468 }
1366 1469
1367 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1368 1471
1369 my $pos = 0; 1472 my $pos = 0;
1370 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1476
1374 $pos += $alloc; 1477 $pos += $alloc;
1375 } 1478 }
1376 1479
1377 1 1480 1
… …
1467 1570
1468 delete $self->{texture}; 1571 delete $self->{texture};
1469 $self->SUPER::update; 1572 $self->SUPER::update;
1470} 1573}
1471 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1472sub set_text { 1582sub set_text {
1473 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1474 1584
1475 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1477 1587
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1480 1590
1591 delete $self->{size_req};
1481 $self->realloc; 1592 $self->realloc;
1482 $self->update; 1593 $self->update;
1483} 1594}
1484 1595
1485sub set_markup { 1596sub set_markup {
… …
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1603
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1495 1606
1607 delete $self->{size_req};
1496 $self->realloc; 1608 $self->realloc;
1497 $self->update; 1609 $self->update;
1498} 1610}
1499 1611
1500sub size_request { 1612sub size_request {
1501 my ($self) = @_; 1613 my ($self) = @_;
1502 1614
1615 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1621
1509 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1510 1623
1511 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1627
1515 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1516 1629
1517 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1519 } 1635 };
1520 1636
1521 ($w, $h) 1637 @{ $self->{size_req} }
1522} 1638}
1523 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1524sub size_allocate { 1644sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1526 1646
1647 delete $self->{ox};
1648
1527 delete $self->{texture} 1649 delete $self->{texture}
1528 ;#d# 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1529} 1653}
1530 1654
1531sub set_fontsize { 1655sub set_fontsize {
1532 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1533 1657
1534 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1659 delete $self->{size_req};
1535 delete $self->{texture}; 1660 delete $self->{texture};
1536 1661
1537 $self->realloc; 1662 $self->realloc;
1663}
1664
1665sub reconfigure {
1666 my ($self) = @_;
1667
1668 delete $self->{size_req};
1669
1670 $self->SUPER::reconfigure;
1538} 1671}
1539 1672
1540sub _draw { 1673sub _draw {
1541 my ($self) = @_; 1674 my ($self) = @_;
1542 1675
… …
1548 $self->{layout}->set_width ($self->{w}); 1681 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1682 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1685
1553 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1686 new_from_layout CFClient::Texture $self->{layout}
1687 };
1554 1688
1689 unless (exists $self->{ox}) {
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5); 1692 : ($self->{w} - $tex->{w}) * 0.5);
1558 1693
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5); 1696 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1564 }; 1697 };
1565 1698
1566 glEnable GL_TEXTURE_2D; 1699 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1568 1703
1569 if ($tex->{format} == GL_ALPHA) { 1704 if ($tex->{format} == GL_ALPHA) {
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1570 glColor @{$self->{fg}}; 1706 glColor @{$self->{fg}};
1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1572 } else { 1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1574 } 1711 }
1575 1712
1576 glDisable GL_TEXTURE_2D; 1713 glDisable GL_TEXTURE_2D;
1577} 1714}
1578 1715
… …
1595 can_hover => 1, 1732 can_hover => 1,
1596 can_focus => 1, 1733 can_focus => 1,
1597 valign => 0, 1734 valign => 0,
1598 can_events => 1, 1735 can_events => 1,
1599 #text => ... 1736 #text => ...
1737 #hidden => "*",
1600 @_ 1738 @_
1601 ) 1739 )
1602} 1740}
1603 1741
1604sub _set_text { 1742sub _set_text {
… …
1606 1744
1607 delete $self->{cur_h}; 1745 delete $self->{cur_h};
1608 1746
1609 return if $self->{text} eq $text; 1747 return if $self->{text} eq $text;
1610 1748
1611 delete $self->{texture};
1612
1613 $self->{last_activity} = $::NOW; 1749 $self->{last_activity} = $::NOW;
1614 $self->{text} = $text; 1750 $self->{text} = $text;
1615 1751
1616 $text =~ s/./*/g if $self->{hidden}; 1752 $text =~ s/./*/g if $self->{hidden};
1617 $self->{layout}->set_text ("$text "); 1753 $self->{layout}->set_text ("$text ");
1754 delete $self->{size_req};
1618 1755
1619 $self->_emit (changed => $self->{text}); 1756 $self->emit (changed => $self->{text});
1757
1758 $self->realloc;
1759 $self->update;
1620} 1760}
1621 1761
1622sub set_text { 1762sub set_text {
1623 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1624 1764
1625 $self->{cursor} = length $text; 1765 $self->{cursor} = length $text;
1626 $self->_set_text ($text); 1766 $self->_set_text ($text);
1627
1628 $self->realloc;
1629} 1767}
1630 1768
1631sub get_text { 1769sub get_text {
1632 $_[0]{text} 1770 $_[0]{text}
1633} 1771}
… …
1638 my ($w, $h) = $self->SUPER::size_request; 1776 my ($w, $h) = $self->SUPER::size_request;
1639 1777
1640 ($w + 1, $h) # add 1 for cursor 1778 ($w + 1, $h) # add 1 for cursor
1641} 1779}
1642 1780
1643sub key_down { 1781sub invoke_key_down {
1644 my ($self, $ev) = @_; 1782 my ($self, $ev) = @_;
1645 1783
1646 my $mod = $ev->{mod}; 1784 my $mod = $ev->{mod};
1647 my $sym = $ev->{sym}; 1785 my $sym = $ev->{sym};
1648 my $uni = $ev->{unicode}; 1786 my $uni = $ev->{unicode};
… …
1660 } elsif ($sym == CFClient::SDLK_HOME) { 1798 } elsif ($sym == CFClient::SDLK_HOME) {
1661 $self->{cursor} = 0; 1799 $self->{cursor} = 0;
1662 } elsif ($sym == CFClient::SDLK_END) { 1800 } elsif ($sym == CFClient::SDLK_END) {
1663 $self->{cursor} = length $text; 1801 $self->{cursor} = length $text;
1664 } elsif ($uni == 27) { 1802 } elsif ($uni == 27) {
1665 $self->_emit ('escape'); 1803 $self->emit ('escape');
1666 } elsif ($uni) { 1804 } elsif ($uni) {
1667 substr $text, $self->{cursor}++, 0, chr $uni; 1805 substr $text, $self->{cursor}++, 0, chr $uni;
1806 } else {
1807 return 0;
1668 } 1808 }
1669 1809
1670 $self->_set_text ($text); 1810 $self->_set_text ($text);
1671 1811
1672 $self->realloc; 1812 $self->realloc;
1673}
1674 1813
1814 1
1815}
1816
1675sub focus_in { 1817sub invoke_focus_in {
1676 my ($self) = @_; 1818 my ($self) = @_;
1677 1819
1678 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1679 1821
1680 $self->SUPER::focus_in; 1822 $self->SUPER::invoke_focus_in
1681} 1823}
1682 1824
1683sub button_down { 1825sub invoke_button_down {
1684 my ($self, $ev, $x, $y) = @_; 1826 my ($self, $ev, $x, $y) = @_;
1685 1827
1686 $self->SUPER::button_down ($ev, $x, $y); 1828 $self->SUPER::invoke_button_down ($ev, $x, $y);
1687 1829
1688 my $idx = $self->{layout}->xy_to_index ($x, $y); 1830 my $idx = $self->{layout}->xy_to_index ($x, $y);
1689 1831
1690 # byte-index to char-index 1832 # byte-index to char-index
1691 my $text = $self->{text}; 1833 my $text = $self->{text};
1692 utf8::encode $text; 1834 utf8::encode $text;
1693 $self->{cursor} = length substr $text, 0, $idx; 1835 $self->{cursor} = length substr $text, 0, $idx;
1694 1836
1695 $self->_set_text ($self->{text}); 1837 $self->_set_text ($self->{text});
1696 $self->update; 1838 $self->update;
1839
1840 1
1697} 1841}
1698 1842
1699sub mouse_motion { 1843sub invoke_mouse_motion {
1700 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1701# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1845# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1846
1847 1
1702} 1848}
1703 1849
1704sub _draw { 1850sub _draw {
1705 my ($self) = @_; 1851 my ($self) = @_;
1706 1852
1707 local $self->{fg} = $self->{fg}; 1853 local $self->{fg} = $self->{fg};
1708 1854
1709 if ($FOCUS == $self) { 1855 if ($FOCUS == $self) {
1710 glColor @{$self->{active_bg}}; 1856 glColor_premultiply @{$self->{active_bg}};
1711 $self->{fg} = $self->{active_fg}; 1857 $self->{fg} = $self->{active_fg};
1712 } else { 1858 } else {
1713 glColor @{$self->{bg}}; 1859 glColor_premultiply @{$self->{bg}};
1714 } 1860 }
1715 1861
1716 glEnable GL_BLEND; 1862 glEnable GL_BLEND;
1717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1863 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718 glBegin GL_QUADS; 1864 glBegin GL_QUADS;
1719 glVertex 0 , 0; 1865 glVertex 0 , 0;
1720 glVertex 0 , $self->{h}; 1866 glVertex 0 , $self->{h};
1721 glVertex $self->{w}, $self->{h}; 1867 glVertex $self->{w}, $self->{h};
1722 glVertex $self->{w}, 0; 1868 glVertex $self->{w}, 0;
… …
1747 1893
1748our @ISA = CFClient::UI::EntryBase::; 1894our @ISA = CFClient::UI::EntryBase::;
1749 1895
1750use CFClient::OpenGL; 1896use CFClient::OpenGL;
1751 1897
1752sub key_down { 1898sub invoke_key_down {
1753 my ($self, $ev) = @_; 1899 my ($self, $ev) = @_;
1754 1900
1755 my $sym = $ev->{sym}; 1901 my $sym = $ev->{sym};
1756 1902
1757 if ($sym == 13) { 1903 if ($sym == 13) {
1758 unshift @{$self->{history}}, 1904 unshift @{$self->{history}},
1759 my $txt = $self->get_text; 1905 my $txt = $self->get_text;
1906
1760 $self->{history_pointer} = -1; 1907 $self->{history_pointer} = -1;
1761 $self->{history_saveback} = ''; 1908 $self->{history_saveback} = '';
1762 $self->_emit (activate => $txt); 1909 $self->emit (activate => $txt);
1763 $self->update; 1910 $self->update;
1764 1911
1765 } elsif ($sym == CFClient::SDLK_UP) { 1912 } elsif ($sym == CFClient::SDLK_UP) {
1766 if ($self->{history_pointer} < 0) { 1913 if ($self->{history_pointer} < 0) {
1767 $self->{history_saveback} = $self->get_text; 1914 $self->{history_saveback} = $self->get_text;
… …
1783 } else { 1930 } else {
1784 $self->set_text ($self->{history_saveback}); 1931 $self->set_text ($self->{history_saveback});
1785 } 1932 }
1786 1933
1787 } else { 1934 } else {
1788 $self->SUPER::key_down ($ev); 1935 return $self->SUPER::invoke_key_down ($ev)
1936 }
1937
1789 } 1938 1
1790
1791} 1939}
1792 1940
1793############################################################################# 1941#############################################################################
1794 1942
1795package CFClient::UI::Button; 1943package CFClient::UI::Button;
… …
1816 can_events => 1, 1964 can_events => 1,
1817 @_ 1965 @_
1818 ) 1966 )
1819} 1967}
1820 1968
1821sub activate { }
1822
1823sub button_up { 1969sub invoke_button_up {
1824 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1825 1971
1826 $self->emit ("activate") 1972 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w} 1973 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h}; 1974 && $y >= 0 && $y < $self->{h};
1975
1976 1
1829} 1977}
1830 1978
1831sub _draw { 1979sub _draw {
1832 my ($self) = @_; 1980 my ($self) = @_;
1833 1981
1834 local $self->{fg} = $self->{fg}; 1982 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836 if ($GRAB == $self) {
1837 $self->{fg} = $self->{active_fg};
1838 }
1839 1983
1840 glEnable GL_TEXTURE_2D; 1984 glEnable GL_TEXTURE_2D;
1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842 glColor 0, 0, 0, 1; 1986 glColor 0, 0, 0, 1;
1843 1987
1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1988 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1845 1989
1846 glDisable GL_TEXTURE_2D; 1990 glDisable GL_TEXTURE_2D;
1847 1991
1848 $self->SUPER::_draw; 1992 $self->SUPER::_draw;
1993}
1994
1995#############################################################################
1996
1997package CFClient::UI::ImageButton;
1998
1999our @ISA = CFClient::UI::Image::;
2000
2001use CFClient::OpenGL;
2002
2003my %textures;
2004
2005sub new {
2006 my $class = shift;
2007
2008 my $self = $class->SUPER::new (
2009 padding_x => 4,
2010 padding_y => 4,
2011 fg => [1, 1, 1],
2012 active_fg => [0, 0, 1],
2013 can_hover => 1,
2014 align => 0,
2015 valign => 0,
2016 can_events => 1,
2017 @_
2018 );
2019}
2020
2021sub invoke_button_up {
2022 my ($self, $ev, $x, $y) = @_;
2023
2024 $self->emit ("activate")
2025 if $x >= 0 && $x < $self->{w}
2026 && $y >= 0 && $y < $self->{h};
2027
2028 1
1849} 2029}
1850 2030
1851############################################################################# 2031#############################################################################
1852 2032
1853package CFClient::UI::CheckBox; 2033package CFClient::UI::CheckBox;
… …
1880 my ($self) = @_; 2060 my ($self) = @_;
1881 2061
1882 (6) x 2 2062 (6) x 2
1883} 2063}
1884 2064
1885sub button_down { 2065sub invoke_button_down {
1886 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1887 2067
1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890 $self->{state} = !$self->{state}; 2070 $self->{state} = !$self->{state};
1891 $self->_emit (changed => $self->{state}); 2071 $self->emit (changed => $self->{state});
2072 } else {
2073 return 0
2074 }
2075
1892 } 2076 1
1893} 2077}
1894 2078
1895sub _draw { 2079sub _draw {
1896 my ($self) = @_; 2080 my ($self) = @_;
1897 2081
… …
1917package CFClient::UI::Image; 2101package CFClient::UI::Image;
1918 2102
1919our @ISA = CFClient::UI::Base::; 2103our @ISA = CFClient::UI::Base::;
1920 2104
1921use CFClient::OpenGL; 2105use CFClient::OpenGL;
1922use Carp qw/confess/;
1923 2106
1924our %loaded_images; 2107our %texture_cache;
1925 2108
1926sub new { 2109sub new {
1927 my $class = shift; 2110 my $class = shift;
1928 2111
1929 my $self = $class->SUPER::new (can_events => 0, @_); 2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
1930 2116
1931 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
1932 2119
1933 $loaded_images{$self->{image}} ||= 2120 $self->{tex} = $texture_cache{$self->{path}} ||=
1934 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1935 2122
1936 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2123 Scalar::Util::weaken $texture_cache{$self->{path}};
1937 2124
1938 Scalar::Util::weaken $loaded_images{$self->{image}}; 2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1939
1940 $self->{aspect} = $tex->{w} / $tex->{h};
1941 2126
1942 $self 2127 $self
1943} 2128}
1944 2129
1945sub size_request { 2130sub size_request {
1946 my ($self) = @_; 2131 my ($self) = @_;
1947 2132
1948 ($self->{tex}->{w}, $self->{tex}->{h}) 2133 ($self->{tex}{w}, $self->{tex}{h})
1949} 2134}
1950 2135
1951sub _draw { 2136sub _draw {
1952 my ($self) = @_; 2137 my ($self) = @_;
1953 2138
… …
2064 2249
2065 my $h1 = $self->{h} * (1 - $ycut1); 2250 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2251 my $h2 = $self->{h} * (1 - $ycut2);
2067 2252
2068 glEnable GL_BLEND; 2253 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2258
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2259 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2260 glBegin GL_QUADS;
… …
2188 $self->update; 2374 $self->update;
2189 2375
2190 $self 2376 $self
2191} 2377}
2192 2378
2193sub changed { }
2194
2195sub set_range { 2379sub set_range {
2196 my ($self, $range) = @_; 2380 my ($self, $range) = @_;
2197 2381
2198 ($range, $self->{range}) = ($self->{range}, $range); 2382 ($range, $self->{range}) = ($self->{range}, $range);
2199 2383
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}"; 2384 if ("@$range" ne "@{$self->{range}}") {
2385 $self->update;
2386 $self->set_value ($self->{range}[0]);
2387 }
2202} 2388}
2203 2389
2204sub set_value { 2390sub set_value {
2205 my ($self, $value) = @_; 2391 my ($self, $value) = @_;
2206 2392
… …
2217 if $unit; 2403 if $unit;
2218 2404
2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2405 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2220 2406
2221 if ($value != $old_value) { 2407 if ($value != $old_value) {
2222 $self->_emit (changed => $value); 2408 $self->emit (changed => $value);
2223 $self->update; 2409 $self->update;
2224 } 2410 }
2225} 2411}
2226 2412
2227sub size_request { 2413sub size_request {
2228 my ($self) = @_; 2414 my ($self) = @_;
2229 2415
2230 ($self->{req_w}, $self->{req_h}) 2416 ($self->{req_w}, $self->{req_h})
2231} 2417}
2232 2418
2233sub button_down { 2419sub invoke_button_down {
2234 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2235 2421
2236 $self->SUPER::button_down ($ev, $x, $y); 2422 $self->SUPER::invoke_button_down ($ev, $x, $y);
2237 2423
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239 2425
2240 $self->mouse_motion ($ev, $x, $y); 2426 $self->invoke_mouse_motion ($ev, $x, $y)
2241} 2427}
2242 2428
2243sub mouse_motion { 2429sub invoke_mouse_motion {
2244 my ($self, $ev, $x, $y) = @_; 2430 my ($self, $ev, $x, $y) = @_;
2245 2431
2246 if ($GRAB == $self) { 2432 if ($GRAB == $self) {
2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2433 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2248 2434
2249 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2435 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250 2436
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2437 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252 2438
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2439 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2440 } else {
2441 return 0;
2442 }
2443
2254 } 2444 1
2255} 2445}
2256 2446
2257sub update { 2447sub update {
2258 my ($self) = @_; 2448 my ($self) = @_;
2259 2449
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2450 delete $self->{knob_w};
2451 $self->SUPER::update;
2452}
2453
2454sub _draw {
2455 my ($self) = @_;
2456
2457 unless ($self->{knob_w}) {
2261 $self->set_value ($self->{range}[0]); 2458 $self->set_value ($self->{range}[0]);
2262 2459
2263 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2460 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100; 2461 my $range = ($hi - $page - $lo) || 1e-100;
2265 2462
… …
2271 $value = ($value - $lo) / $range; 2468 $value = ($value - $lo) / $range;
2272 $value = $value * $self->{scale} + $self->{offset}; 2469 $value = $value * $self->{scale} + $self->{offset};
2273 2470
2274 $self->{knob_x} = $value - $knob_w * 0.5; 2471 $self->{knob_x} = $value - $knob_w * 0.5;
2275 $self->{knob_w} = $knob_w; 2472 $self->{knob_w} = $knob_w;
2276 }); 2473 }
2277
2278 $self->SUPER::update;
2279}
2280
2281sub _draw {
2282 my ($self) = @_;
2283 2474
2284 $self->SUPER::_draw (); 2475 $self->SUPER::_draw ();
2285 2476
2286 glScale $self->{w}, $self->{h}; 2477 glScale $self->{w}, $self->{h};
2287 2478
… …
2348sub set_range { shift->{slider}->set_range (@_) } 2539sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) } 2540sub set_value { shift->{slider}->set_value (@_) }
2350 2541
2351############################################################################# 2542#############################################################################
2352 2543
2353package CFClient::UI::TextView; 2544package CFClient::UI::TextScroller;
2354 2545
2355our @ISA = CFClient::UI::HBox::; 2546our @ISA = CFClient::UI::HBox::;
2356 2547
2357use CFClient::OpenGL; 2548use CFClient::OpenGL;
2358 2549
… …
2360 my $class = shift; 2551 my $class = shift;
2361 2552
2362 my $self = $class->SUPER::new ( 2553 my $self = $class->SUPER::new (
2363 fontsize => 1, 2554 fontsize => 1,
2364 can_events => 0, 2555 can_events => 0,
2556 indent => 0,
2365 #font => default_font 2557 #font => default_font
2366 @_, 2558 @_,
2367 2559
2368 layout => (new CFClient::Layout 1), 2560 layout => (new CFClient::Layout 1),
2369 par => [], 2561 par => [],
… …
2384 2576
2385 $self->{fontsize} = $fontsize; 2577 $self->{fontsize} = $fontsize;
2386 $self->reflow; 2578 $self->reflow;
2387} 2579}
2388 2580
2581sub size_request {
2582 my ($self) = @_;
2583
2584 my ($empty, $slider) = @{ $self->{children} };
2585
2586 local $self->{children} = [$empty, $slider];
2587 $self->SUPER::size_request
2588}
2589
2389sub size_allocate { 2590sub invoke_size_allocate {
2390 my ($self, $w, $h) = @_; 2591 my ($self, $w, $h) = @_;
2391 2592
2392 $self->SUPER::size_allocate ($w, $h); 2593 my ($empty, $slider, @other) = @{ $self->{children} };
2594 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2393 2595
2394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2596 $self->{layout}->set_font ($self->{font}) if $self->{font};
2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $self->{layout}->set_width ($self->{children}[0]{w}); 2598 $self->{layout}->set_width ($empty->{w});
2599 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 2600
2398 $self->reflow; 2601 $self->reflow;
2399}
2400 2602
2401sub text_size { 2603 local $self->{children} = [$empty, $slider];
2402 my ($self, $text, $indent) = @_; 2604 $self->SUPER::invoke_size_allocate ($w, $h)
2605}
2606
2607sub get_layout {
2608 my ($self, $para) = @_;
2403 2609
2404 my $layout = $self->{layout}; 2610 my $layout = $self->{layout};
2405 2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613 $layout->set_foreground (@{$para->{fg}});
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2614 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent); 2615 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2616 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2408 $layout->set_markup ($text); 2617 $layout->set_markup ($para->{markup});
2618
2619 $layout->set_shapes (
2620 map
2621 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2622 @{$para->{widget}}
2409 2623 );
2624
2410 $layout->size 2625 $layout
2411} 2626}
2412 2627
2413sub reflow { 2628sub reflow {
2414 my ($self) = @_; 2629 my ($self) = @_;
2415 2630
… …
2424 $self->{children}[1]->set_value ($offset); 2639 $self->{children}[1]->set_value ($offset);
2425} 2640}
2426 2641
2427sub clear { 2642sub clear {
2428 my ($self) = @_; 2643 my ($self) = @_;
2644
2645 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other;
2429 2647
2430 $self->{par} = []; 2648 $self->{par} = [];
2431 $self->{height} = 0; 2649 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433} 2651}
2434 2652
2435sub add_paragraph { 2653sub add_paragraph {
2436 my ($self, $color, $text, $indent) = @_; 2654 my ($self, $color, $para, $indent) = @_;
2437 2655
2438 for my $line (split /\n/, $text) { 2656 my ($text, @w) = ref $para ? @$para : $para;
2439 my ($w, $h) = $self->text_size ($line); 2657
2440 $self->{height} += $h; 2658 $para = {
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2659 w => 1e10,
2660 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2442 } 2665 };
2443 2666
2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2667 $self->add (@w) if @w;
2668 push @{$self->{par}}, $para;
2669
2670 $self->{need_reflow}++;
2671 $self->update;
2672}
2673
2674sub scroll_to_bottom {
2675 my ($self) = @_;
2676
2677 $self->{scroll_to_bottom} = 1;
2678 $self->update;
2445} 2679}
2446 2680
2447sub update { 2681sub update {
2448 my ($self) = @_; 2682 my ($self) = @_;
2449 2683
… …
2451 2685
2452 return unless $self->{h} > 0; 2686 return unless $self->{h} > 0;
2453 2687
2454 delete $self->{texture}; 2688 delete $self->{texture};
2455 2689
2456 $ROOT->on_post_alloc ($self, sub { 2690 $ROOT->on_post_alloc ($self => sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458 2692
2459 if (delete $self->{need_reflow}) { 2693 if (delete $self->{need_reflow}) {
2460 my $height = 0; 2694 my $height = 0;
2461 2695
2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2466 for (@{$self->{par}}) { 2696 for my $para (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2468 $layout->set_width ($W - $_->[3]); 2698 my $layout = $self->get_layout ($para);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size; 2699 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3]; 2700
2472 $_->[1] = $h; 2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2473 } 2704 }
2474 2705
2475 $height += $_->[1]; 2706 $height += $para->{h};
2476 } 2707 }
2477 2708
2478 $self->{height} = $height; 2709 $self->{height} = $height;
2479 2710
2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2481 2712
2482 delete $self->{texture}; 2713 delete $self->{texture};
2483 } 2714 }
2484 2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2718 }
2719
2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2486 glClearColor 0.5, 0.5, 0.5, 0; 2721 glClearColor 0, 0, 0, 0;
2487 glClear GL_COLOR_BUFFER_BIT; 2722 glClear GL_COLOR_BUFFER_BIT;
2488 2723
2489 my $top = int $self->{children}[1]{range}[0]; 2724 my $top = int $self->{children}[1]{range}[0];
2490 2725
2491 my $y0 = $top; 2726 my $y0 = $top;
2492 my $y1 = $top + $H; 2727 my $y1 = $top + $H;
2493 2728
2494 my $y = 0; 2729 my $y = 0;
2495
2496 my $layout = $self->{layout};
2497
2498 $layout->set_font ($self->{font}) if $self->{font};
2499 2730
2500 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off 2732 #TODO# not correct in windows where rgba is forced off
2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2503 2734
2504 for my $par (@{$self->{par}}) { 2735 for my $para (@{$self->{par}}) {
2505 my $h = $par->[1]; 2736 my $h = $para->{h};
2506 2737
2507 if ($y0 < $y + $h && $y < $y1) { 2738 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] }); 2739
2509 $layout->set_width ($W - $par->[3]); 2740 my $layout = $self->get_layout ($para);
2510 $layout->set_markup ($par->[4]);
2511 2741
2512 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2513 2743
2514 glRasterPos $par->[3], $y - $y0; 2744 glRasterPos $para->{indent}, $y - $y0;
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 glDisable GL_BLEND;
2751 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, ();
2753
2754 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0;
2756
2757 $_->draw;
2758 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 }
2516 } 2762 }
2517 2763
2518 $y += $h; 2764 $y += $h;
2519 } 2765 }
2520 2766
2521 glDisable GL_BLEND; 2767 glDisable GL_BLEND;
2522 }; 2768 };
2523 }); 2769 });
2524} 2770}
2525 2771
2772sub reconfigure {
2773 my ($self) = @_;
2774
2775 $self->SUPER::reconfigure;
2776
2777 $_->{w} = 1e10 for @{ $self->{par} };
2778 $self->reflow;
2779}
2780
2526sub _draw { 2781sub _draw {
2527 my ($self) = @_; 2782 my ($self) = @_;
2528 2783
2529 glEnable GL_TEXTURE_2D; 2784 glEnable GL_TEXTURE_2D;
2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531 glColor 1, 1, 1, 1; 2786 glColor 0, 0, 0, 1;
2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2787 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533 glDisable GL_TEXTURE_2D; 2788 glDisable GL_TEXTURE_2D;
2534 2789
2535 $self->{children}[1]->draw; 2790 $self->{children}[1]->draw;
2536
2537} 2791}
2538 2792
2539############################################################################# 2793#############################################################################
2540 2794
2541package CFClient::UI::Animator; 2795package CFClient::UI::Animator;
… …
2628 $tooltip .= "\n\n" . (ref $widget) . "\n" 2882 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2883 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n" 2884 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}"; 2885 . "visible $widget->{visible}";
2632 } 2886 }
2887
2888 $tooltip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//;
2633 2890
2634 $self->add (new CFClient::UI::Label 2891 $self->add (new CFClient::UI::Label
2635 markup => $tooltip, 2892 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8, 2894 fontsize => 0.8,
… …
2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2904 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2648 2905
2649 ($w + 4, $h + 4) 2906 ($w + 4, $h + 4)
2650} 2907}
2651 2908
2652sub size_allocate { 2909sub invoke_size_allocate {
2653 my ($self, $w, $h) = @_; 2910 my ($self, $w, $h) = @_;
2654 2911
2655 $self->SUPER::size_allocate ($w - 4, $h - 4); 2912 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2656} 2913}
2657 2914
2658sub visibility_change { 2915sub invoke_visibility_change {
2659 my ($self, $visible) = @_; 2916 my ($self, $visible) = @_;
2660 2917
2661 return unless $visible; 2918 return unless $visible;
2662 2919
2663 $self->{root}->on_post_alloc ("move_$self" => sub { 2920 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2665 or return; 2922 or return;
2666 2923
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668 2925
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH; 2927 if $x + $self->{w} > $self->{root}{w};
2671 2928
2672 $self->move_abs ($x, $y); 2929 $self->move_abs ($x, $y);
2673 }); 2930 });
2674} 2931}
2675 2932
… …
2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3021 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765 3022
2766 if ($tex) { 3023 if ($tex) {
2767 glEnable GL_TEXTURE_2D; 3024 glEnable GL_TEXTURE_2D;
2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769 glColor 1, 1, 1, 1; 3026 glColor 0, 0, 0, 1;
2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3027 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771 glDisable GL_TEXTURE_2D; 3028 glDisable GL_TEXTURE_2D;
2772 } 3029 }
2773} 3030}
2774 3031
2775sub DESTROY { 3032sub destroy {
2776 my ($self) = @_; 3033 my ($self) = @_;
2777 3034
2778 $self->{timer}->cancel 3035 $self->{timer}->cancel
2779 if $self->{timer}; 3036 if $self->{timer};
2780 3037
2781 $self->SUPER::DESTROY; 3038 $self->SUPER::destroy;
2782} 3039}
2783 3040
2784############################################################################# 3041#############################################################################
2785 3042
2786package CFClient::UI::Inventory; 3043package CFClient::UI::Buttonbar;
2787 3044
2788our @ISA = CFClient::UI::ScrolledWindow::; 3045our @ISA = CFClient::UI::HBox::;
2789 3046
2790sub new { 3047# TODO: should actualyl wrap buttons and other goodies.
2791 my $class = shift;
2792
2793 my $self = $class->SUPER::new (
2794 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2795 @_,
2796 );
2797
2798 $self
2799}
2800
2801sub set_items {
2802 my ($self, $items) = @_;
2803
2804 $self->{scrolled}->clear;
2805 return unless $items;
2806
2807 my @items = sort {
2808 ($a->{type} <=> $b->{type})
2809 or ($a->{name} cmp $b->{name})
2810 } @$items;
2811
2812 $self->{real_items} = \@items;
2813
2814 my $row = 0;
2815 for my $item (@items) {
2816 CFClient::Item::update_widgets $item;
2817
2818 $self->{scrolled}->add (0, $row, $item->{face_widget});
2819 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2820 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2821
2822 $row++;
2823 }
2824}
2825 3048
2826############################################################################# 3049#############################################################################
2827 3050
2828package CFClient::UI::Menu; 3051package CFClient::UI::Menu;
2829 3052
… …
2841 ); 3064 );
2842 3065
2843 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3066 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2844 3067
2845 for my $item (@{ $self->{items} }) { 3068 for my $item (@{ $self->{items} }) {
2846 my ($widget, $cb) = @$item; 3069 my ($widget, $cb, $tooltip) = @$item;
2847 3070
2848 # handle various types of items, only text for now 3071 # handle various types of items, only text for now
2849 if (!ref $widget) { 3072 if (!ref $widget) {
2850 $widget = new CFClient::UI::Label 3073 $widget = new CFClient::UI::Label
2851 can_hover => 1, 3074 can_hover => 1,
2852 can_events => 1, 3075 can_events => 1,
2853 text => $widget; 3076 markup => $widget,
3077 tooltip => $tooltip
2854 } 3078 }
2855 3079
2856 $self->{item}{$widget} = $item; 3080 $self->{item}{$widget} = $item;
2857 3081
2858 $self->{vbox}->add ($widget); 3082 $self->{vbox}->add ($widget);
… …
2863 3087
2864# popup given the event (must be a mouse button down event currently) 3088# popup given the event (must be a mouse button down event currently)
2865sub popup { 3089sub popup {
2866 my ($self, $ev) = @_; 3090 my ($self, $ev) = @_;
2867 3091
2868 $self->_emit ("popdown"); 3092 $self->emit ("popdown");
2869 3093
2870 # maybe save $GRAB? must be careful about events... 3094 # maybe save $GRAB? must be careful about events...
2871 $GRAB = $self; 3095 $GRAB = $self;
2872 $self->{button} = $ev->{button}; 3096 $self->{button} = $ev->{button};
2873 3097
2874 $self->show; 3098 $self->show;
2875 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3099 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2876} 3100}
2877 3101
2878sub mouse_motion { 3102sub invoke_mouse_motion {
2879 my ($self, $ev, $x, $y) = @_; 3103 my ($self, $ev, $x, $y) = @_;
2880 3104
2881 # TODO: should use vbox->find_widget or so 3105 # TODO: should use vbox->find_widget or so
2882 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3106 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2883 $self->{hover} = $self->{item}{$HOVER}; 3107 $self->{hover} = $self->{item}{$HOVER};
2884}
2885 3108
3109 0
3110}
3111
2886sub button_up { 3112sub invoke_button_up {
2887 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2888 3114
2889 if ($ev->{button} == $self->{button}) { 3115 if ($ev->{button} == $self->{button}) {
2890 undef $GRAB; 3116 undef $GRAB;
2891 $self->hide; 3117 $self->hide;
2892 3118
2893 $self->_emit ("popdown"); 3119 $self->emit ("popdown");
2894 $self->{hover}[1]->() if $self->{hover}; 3120 $self->{hover}[1]->() if $self->{hover};
3121 } else {
3122 return 0
3123 }
3124
2895 } 3125 1
2896} 3126}
2897 3127
2898############################################################################# 3128#############################################################################
2899 3129
2900package CFClient::UI::Statusbox; 3130package CFClient::UI::Multiplexer;
2901 3131
2902our @ISA = CFClient::UI::VBox::; 3132our @ISA = CFClient::UI::Container::;
2903 3133
2904sub new { 3134sub new {
2905 my $class = shift; 3135 my $class = shift;
2906 3136
2907 $class->SUPER::new ( 3137 my $self = $class->SUPER::new (
3138 @_,
3139 );
3140
3141 $self->{current} = $self->{children}[0]
3142 if @{ $self->{children} };
3143
3144 $self
3145}
3146
3147sub add {
3148 my ($self, @widgets) = @_;
3149
3150 $self->SUPER::add (@widgets);
3151
3152 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} };
3154}
3155
3156sub set_current_page {
3157 my ($self, $page_or_widget) = @_;
3158
3159 my $widget = ref $page_or_widget
3160 ? $page_or_widget
3161 : $self->{children}[$page_or_widget];
3162
3163 $self->{current} = $widget;
3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3165
3166 $self->emit (page_changed => $self->{current});
3167
3168 $self->realloc;
3169}
3170
3171sub visible_children {
3172 $_[0]{current}
3173}
3174
3175sub size_request {
3176 my ($self) = @_;
3177
3178 $self->{current}->size_request
3179}
3180
3181sub invoke_size_allocate {
3182 my ($self, $w, $h) = @_;
3183
3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3187}
3188
3189sub _draw {
3190 my ($self) = @_;
3191
3192 $self->{current}->draw;
3193}
3194
3195#############################################################################
3196
3197package CFClient::UI::Notebook;
3198
3199our @ISA = CFClient::UI::VBox::;
3200
3201sub new {
3202 my $class = shift;
3203
3204 my $self = $class->SUPER::new (
3205 buttonbar => (new CFClient::UI::Buttonbar),
3206 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3207 # filter => # will be put between multiplexer and $self
3208 @_,
3209 );
3210
3211 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3212 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3213
3214 $self
3215}
3216
3217sub add {
3218 my ($self, $title, $widget, $tooltip) = @_;
3219
3220 Scalar::Util::weaken $self;
3221
3222 $self->{buttonbar}->add (new CFClient::UI::Button
3223 markup => $title,
3224 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) },
3226 );
3227
3228 $self->{multiplexer}->add ($widget);
3229}
3230
3231sub set_current_page {
3232 my ($self, $page) = @_;
3233
3234 $self->{multiplexer}->set_current_page ($page);
3235 $self->emit (page_changed => $self->{multiplexer}{current});
3236}
3237
3238#############################################################################
3239
3240package CFClient::UI::Combobox;
3241
3242use utf8;
3243
3244our @ISA = CFClient::UI::Button::;
3245
3246sub new {
3247 my $class = shift;
3248
3249 my $self = $class->SUPER::new (
3250 options => [], # [value, title, longdesc], ...
3251 value => undef,
3252 @_,
3253 );
3254
3255 $self->_set_value ($self->{value});
3256
3257 $self
3258}
3259
3260sub invoke_button_down {
3261 my ($self, $ev) = @_;
3262
3263 my @menu_items;
3264
3265 for (@{ $self->{options} }) {
3266 my ($value, $title, $tooltip) = @$_;
3267
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 }
3270
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272}
3273
3274sub _set_value {
3275 my ($self, $value) = @_;
3276
3277 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3278 or return;
3279
3280 $self->{value} = $item->[0];
3281 $self->set_markup ("$item->[1] ⇓");
3282 $self->set_tooltip ($item->[2]);
3283}
3284
3285sub set_value {
3286 my ($self, $value) = @_;
3287
3288 return unless $self->{value} ne $value;
3289
3290 $self->_set_value ($value);
3291 $self->emit (changed => $value);
3292}
3293
3294#############################################################################
3295
3296package CFClient::UI::Statusbox;
3297
3298our @ISA = CFClient::UI::VBox::;
3299
3300sub new {
3301 my $class = shift;
3302
3303 my $self = $class->SUPER::new (
2908 fontsize => 0.8, 3304 fontsize => 0.8,
2909 @_, 3305 @_,
2910 ) 3306 );
3307
3308 Scalar::Util::weaken (my $this = $self);
3309
3310 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311
3312 $self
2911} 3313}
2912 3314
2913sub reorder { 3315sub reorder {
2914 my ($self) = @_; 3316 my ($self) = @_;
2915 my $NOW = time; 3317 my $NOW = Time::HiRes::time;
3318
3319 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} };
2916 3323
2917 while (my ($k, $v) = each %{ $self->{item} }) { 3324 while (my ($k, $v) = each %{ $self->{item} }) {
2918 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3325 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2919 } 3326 }
2920 3327
… …
2923 my @items = sort { 3330 my @items = sort {
2924 $a->{pri} <=> $b->{pri} 3331 $a->{pri} <=> $b->{pri}
2925 or $b->{id} <=> $a->{id} 3332 or $b->{id} <=> $a->{id}
2926 } values %{ $self->{item} }; 3333 } values %{ $self->{item} };
2927 3334
3335 $self->{timer}->interval (1);
3336
2928 my $count = 10 + 1; 3337 my $count = 10 + 1;
2929 for my $item (@items) { 3338 for my $item (@items) {
2930 last unless --$count; 3339 last unless --$count;
2931 3340
2932 push @widgets, $item->{label} ||= do { 3341 my $label = $item->{label} ||= do {
2933 # TODO: doesn't handle markup well (read as: at all) 3342 # TODO: doesn't handle markup well (read as: at all)
2934 my $short = $item->{count} > 1 3343 my $short = $item->{count} > 1
2935 ? "<b>$item->{count} ×</b> $item->{text}" 3344 ? "<b>$item->{count} ×</b> $item->{text}"
2936 : $item->{text}; 3345 : $item->{text};
2937 3346
… …
2945 tooltip => $item->{tooltip}, 3354 tooltip => $item->{tooltip},
2946 tooltip_font => $::FONT_PROP, 3355 tooltip_font => $::FONT_PROP,
2947 tooltip_width => 0.67, 3356 tooltip_width => 0.67,
2948 fontsize => $item->{fontsize} || $self->{fontsize}, 3357 fontsize => $item->{fontsize} || $self->{fontsize},
2949 max_w => $::WIDTH * 0.44, 3358 max_w => $::WIDTH * 0.44,
2950 fg => $item->{fg}, 3359 fg => [@{ $item->{fg} }],
2951 can_events => 1, 3360 can_events => 1,
2952 can_hover => 1 3361 can_hover => 1
2953 }; 3362 };
3363
3364 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3365 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3366 $label->update;
3367 $label->set_max_size (undef, $label->{req_h} * $diff)
3368 if $diff < 1;
3369 $self->{timer}->interval (1/30);
3370 } else {
3371 $label->{fg}[3] = $item->{fg}[3] || 1;
3372 }
3373
3374 push @widgets, $label;
2954 } 3375 }
2955 3376
2956 $self->clear; 3377 $self->clear;
2957 $self->SUPER::add (reverse @widgets); 3378 $self->SUPER::add (reverse @widgets);
2958} 3379}
… …
2963 $text =~ s/^\s+//; 3384 $text =~ s/^\s+//;
2964 $text =~ s/\s+$//; 3385 $text =~ s/\s+$//;
2965 3386
2966 return unless $text; 3387 return unless $text;
2967 3388
2968 my $timeout = time + ((delete $arg{timeout}) || 60); 3389 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2969 3390
2970 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3391 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2971 3392
2972 if (my $item = $self->{item}{$group}) { 3393 if (my $item = $self->{item}{$group}) {
2973 if ($item->{text} eq $text) { 3394 if ($item->{text} eq $text) {
2974 $item->{count}++; 3395 $item->{count}++;
2975 } else { 3396 } else {
2976 $item->{count} = 1; 3397 $item->{count} = 1;
2977 $item->{text} = $item->{tooltip} = $text; 3398 $item->{text} = $item->{tooltip} = $text;
2978 } 3399 }
2979 $item->{id} = ++$self->{id}; 3400 $item->{id} += 0.2;#d#
2980 $item->{timeout} = $timeout; 3401 $item->{timeout} = $timeout;
2981 delete $item->{label}; 3402 delete $item->{label};
2982 } else { 3403 } else {
2983 $self->{item}{$group} = { 3404 $self->{item}{$group} = {
2984 id => ++$self->{id}, 3405 id => ++$self->{id},
… …
2990 count => 1, 3411 count => 1,
2991 %arg, 3412 %arg,
2992 }; 3413 };
2993 } 3414 }
2994 3415
3416 $ROOT->on_refresh (reorder => sub {
2995 $self->reorder; 3417 $self->reorder;
3418 });
2996} 3419}
2997 3420
2998sub reconfigure { 3421sub reconfigure {
2999 my ($self) = @_; 3422 my ($self) = @_;
3000 3423
… …
3003 3426
3004 $self->reorder; 3427 $self->reorder;
3005 $self->SUPER::reconfigure; 3428 $self->SUPER::reconfigure;
3006} 3429}
3007 3430
3431sub destroy {
3432 my ($self) = @_;
3433
3434 $self->{timer}->cancel;
3435
3436 $self->SUPER::destroy;
3437}
3438
3008############################################################################# 3439#############################################################################
3009 3440
3441package CFClient::UI::Inventory;
3442
3443our @ISA = CFClient::UI::ScrolledWindow::;
3444
3445sub new {
3446 my $class = shift;
3447
3448 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450 @_,
3451 );
3452
3453 $self
3454}
3455
3456sub set_items {
3457 my ($self, $items) = @_;
3458
3459 $self->{child}->clear;
3460 return unless $items;
3461
3462 my @items = sort {
3463 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name})
3465 } values %$items;
3466
3467 $self->{real_items} = \@items;
3468
3469 my $row = 0;
3470 for my $item (@items) {
3471 CFClient::Item::update_widgets $item;
3472
3473 $self->{child}->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget});
3476
3477 $row++;
3478 }
3479}
3480
3481#############################################################################
3482
3483package CFClient::UI::SpellList;
3484
3485our @ISA = CFClient::UI::Table::;
3486
3487sub new {
3488 my $class = shift;
3489
3490 my $self = $class->SUPER::new (
3491 binding => [],
3492 commands => [],
3493 @_,
3494 )
3495}
3496
3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3582sub add_spell {
3583 my ($self, $spell) = @_;
3584
3585 $self->{spell}->{$spell->{name}} = $spell;
3586 $self->rebuild_spell_list;
3587}
3588
3589sub remove_spell {
3590 my ($self, $spell) = @_;
3591
3592 delete $self->{spell}->{$spell->{name}};
3593 $self->rebuild_spell_list;
3594}
3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3603#############################################################################
3604
3010package CFClient::UI::Root; 3605package CFClient::UI::Root;
3011 3606
3012our @ISA = CFClient::UI::Container::; 3607our @ISA = CFClient::UI::Container::;
3608
3609use List::Util qw(min max);
3013 3610
3014use CFClient::OpenGL; 3611use CFClient::OpenGL;
3015 3612
3016sub new { 3613sub new {
3017 my $class = shift; 3614 my $class = shift;
… …
3044 $coord = $max - $size if $coord > $max - $size; 3641 $coord = $max - $size if $coord > $max - $size;
3045 3642
3046 int $coord + 0.5 3643 int $coord + 0.5
3047} 3644}
3048 3645
3049sub size_allocate { 3646sub invoke_size_allocate {
3050 my ($self, $w, $h) = @_; 3647 my ($self, $w, $h) = @_;
3051 3648
3052 for my $child ($self->children) { 3649 for my $child ($self->children) {
3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3650 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054 3651
… …
3058 $X = _to_pixel $X, $W, $self->{w}; 3655 $X = _to_pixel $X, $W, $self->{w};
3059 $Y = _to_pixel $Y, $H, $self->{h}; 3656 $Y = _to_pixel $Y, $H, $self->{h};
3060 3657
3061 $child->configure ($X, $Y, $W, $H); 3658 $child->configure ($X, $Y, $W, $H);
3062 } 3659 }
3660
3661 1
3063} 3662}
3064 3663
3065sub coord2local { 3664sub coord2local {
3066 my ($self, $x, $y) = @_; 3665 my ($self, $x, $y) = @_;
3067 3666
… …
3123 $_->() 3722 $_->()
3124 for values %{delete $self->{refresh_hook}}; 3723 for values %{delete $self->{refresh_hook}};
3125 } 3724 }
3126 3725
3127 if ($self->{realloc}) { 3726 if ($self->{realloc}) {
3727 my %queue;
3128 my @queue; 3728 my @queue;
3729 my $widget;
3129 3730
3731 outer:
3130 while () { 3732 while () {
3131 if ($self->{realloc}) { 3733 if (my $realloc = delete $self->{realloc}) {
3132 #TODO use array-of-depth approach 3734 for $widget (values %$realloc) {
3735 $widget->{visible} or next; # do not resize invisible widgets
3133 3736
3134 use sort 'stable'; 3737 $queue{$widget+0}++ and next; # duplicates are common
3135 3738
3136 @queue = sort { $a->{visible} <=> $b->{visible} } 3739 push @{ $queue[$widget->{visible}] }, $widget;
3137 @queue, values %{delete $self->{realloc}}; 3740 }
3138 } 3741 }
3139 3742
3743 while () {
3744 @queue or last outer;
3745
3140 my $widget = pop @queue || last; 3746 $widget = pop @{ $queue[-1] || [] }
3747 and last;
3748
3749 pop @queue;
3750 }
3141 3751
3142 $widget->{visible} or last; # do not resize invisible widgets 3752 delete $queue{$widget+0};
3143 3753
3144 my ($w, $h) = $widget->size_request; 3754 my ($w, $h) = $widget->size_request;
3145 3755
3146 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3756 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3757 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3758
3759 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3760 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3148 3761
3149 $w = $widget->{force_w} if exists $widget->{force_w}; 3762 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h}; 3763 $h = $widget->{force_h} if exists $widget->{force_h};
3151 3764
3152 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3765 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3155 $widget->{req_h} = $h; 3768 $widget->{req_h} = $h;
3156 3769
3157 $self->{size_alloc}{$widget+0} = $widget; 3770 $self->{size_alloc}{$widget+0} = $widget;
3158 3771
3159 if (my $parent = $widget->{parent}) { 3772 if (my $parent = $widget->{parent}) {
3160 $self->{realloc}{$parent+0} = $parent; 3773 $self->{realloc}{$parent+0} = $parent
3161 #unshift @queue, $parent; 3774 unless $queue{$parent+0};
3775
3162 $parent->{force_size_alloc} = 1; 3776 $parent->{force_size_alloc} = 1;
3163 $self->{size_alloc}{$parent+0} = $parent; 3777 $self->{size_alloc}{$parent+0} = $parent;
3164 } 3778 }
3165 } 3779 }
3166 3780
… …
3182 3796
3183 $w = int $w + 0.5; 3797 $w = int $w + 0.5;
3184 $h = int $h + 0.5; 3798 $h = int $h + 0.5;
3185 3799
3186 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3800 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801 $widget->{old_w} = $widget->{w};
3802 $widget->{old_h} = $widget->{h};
3803
3187 $widget->{w} = $w; 3804 $widget->{w} = $w;
3188 $widget->{h} = $h; 3805 $widget->{h} = $h;
3189 3806
3190 $widget->emit (size_allocate => $w, $h); 3807 $widget->emit (size_allocate => $w, $h);
3191 } 3808 }
… …
3206 glLoadIdentity; 3823 glLoadIdentity;
3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3824 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3208 glMatrixMode GL_MODELVIEW; 3825 glMatrixMode GL_MODELVIEW;
3209 glLoadIdentity; 3826 glLoadIdentity;
3210 3827
3828 {
3829 package CFClient::UI::Base;
3830
3831 ($draw_x, $draw_y, $draw_w, $draw_h) =
3832 (0, 0, $self->{w}, $self->{h});
3833 }
3834
3211 $self->_draw; 3835 $self->_draw;
3212}
3213
3214#############################################################################
3215
3216package CFClient::UI::SpellList;
3217
3218our @ISA = CFClient::UI::FancyFrame::;
3219
3220sub new {
3221 my $class = shift;
3222
3223 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3224
3225 $self->add (new CFClient::UI::ScrolledWindow
3226 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3227
3228 $self;
3229}
3230
3231# XXX: Do sorting? Argl...
3232sub add_spell {
3233 my ($self, $spell) = @_;
3234 $self->{spells}->{$spell->{name}} = $spell;
3235
3236 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3237 face => $spell->{face},
3238 can_hover => 1,
3239 can_events => 1,
3240 tooltip => $spell->{message});
3241
3242 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3243 text => $spell->{name},
3244 can_hover => 1,
3245 can_events => 1,
3246 tooltip => $spell->{message},
3247 expand => 1);
3248
3249 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3251 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3252 expand => 1);
3253
3254 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3255 text => "bind to key",
3256 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3257}
3258
3259sub rebuild_spell_list {
3260 my ($self) = @_;
3261 $self->{tbl_idx} = 0;
3262 $self->add_spell ($_) for values %{$self->{spells}};
3263}
3264
3265sub remove_spell {
3266 my ($self, $spell) = @_;
3267 delete $self->{spells}->{$spell->{name}};
3268 $self->rebuild_spell_list;
3269}
3270
3271#############################################################################
3272
3273package CFClient::UI::BindEditor;
3274
3275our @ISA = CFClient::UI::FancyFrame::;
3276
3277sub new {
3278 my $class = shift;
3279
3280 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3281
3282 $self->add (my $vb = new CFClient::UI::VBox);
3283
3284
3285 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3286 text => "start recording",
3287 tooltip => "Start/Stops recording of actions."
3288 ."All subsequent actions after the recording started will be captured."
3289 ."The actions are displayed after the record was stopped."
3290 ."To bind the action you have to click on the 'Bind' button",
3291 on_activate => sub {
3292 unless ($self->{recording}) {
3293 $self->start;
3294 } else {
3295 $self->stop;
3296 }
3297 });
3298
3299 $vb->add (new CFClient::UI::Label text => "Actions:");
3300 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3301
3302 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3305 $hb->add (new CFClient::UI::Button
3306 text => "bind",
3307 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3308 on_activate => sub {
3309 $self->ask_for_bind;
3310 });
3311
3312 $vb->add (my $hb = new CFClient::UI::HBox);
3313 $hb->add (new CFClient::UI::Button
3314 text => "ok",
3315 expand => 1,
3316 tooltip => "This closes the binding editor and saves the binding",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->commit;
3320 });
3321
3322 $hb->add (new CFClient::UI::Button
3323 text => "cancel",
3324 expand => 1,
3325 tooltip => "This closes the binding editor without saving",
3326 on_activate => sub {
3327 $self->hide;
3328 $self->{binding_cancel}->()
3329 if $self->{binding_cancel};
3330 });
3331
3332 $self->update_binding_widgets;
3333
3334 $self
3335}
3336
3337sub commit {
3338 my ($self) = @_;
3339 my ($mod, $sym, $cmds) = $self->get_binding;
3340 if ($sym != 0 && @$cmds > 0) {
3341 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3342 ."'. Don't forget 'Save Config'!");
3343 $self->{binding_change}->($mod, $sym, $cmds)
3344 if $self->{binding_change};
3345 } else {
3346 $::STATUSBOX->add ("No action bound, no key or action specified!");
3347 $self->{binding_cancel}->()
3348 if $self->{binding_cancel};
3349 }
3350}
3351
3352sub start {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("stop recording");
3356 $self->{recording} = 1;
3357 $self->clear_command_list;
3358 $::CONN->start_record if $::CONN;
3359}
3360
3361sub stop {
3362 my ($self) = @_;
3363
3364 $self->{rec_btn}->set_text ("start recording");
3365 $self->{recording} = 0;
3366
3367 my $rec;
3368 $rec = $::CONN->stop_record if $::CONN;
3369 return unless ref $rec eq 'ARRAY';
3370 $self->set_command_list ($rec);
3371}
3372
3373# if $commit is true, the binding will be set after the user entered a key combo
3374sub ask_for_bind {
3375 my ($self, $commit) = @_;
3376
3377 CFClient::Binder::open_binding_dialog (sub {
3378 my ($mod, $sym) = @_;
3379 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3380 $self->update_binding_widgets;
3381 $self->commit if $commit;
3382 });
3383}
3384
3385# $mod and $sym are the modifiers and key symbol
3386# $cmds is a array ref of strings (the commands)
3387# $cb is the callback that is executed on OK
3388# $ccb is the callback that is executed on CANCEL and
3389# when the binding was unsuccessful on OK
3390sub set_binding {
3391 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3392
3393 $self->clear_command_list;
3394 $self->{recording} = 0;
3395 $self->{rec_btn}->set_text ("start recording");
3396
3397 $self->{binding} = [$mod, $sym];
3398 $self->{commands} = $cmds;
3399
3400 $self->{binding_change} = $cb;
3401 $self->{binding_cancel} = $ccb;
3402
3403 $self->update_binding_widgets;
3404}
3405
3406# this is a shortcut method that asks for a binding
3407# and then just binds it.
3408sub do_quick_binding {
3409 my ($self, $cmds) = @_;
3410 $self->set_binding (undef, undef, $cmds, sub {
3411 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3412 });
3413 $self->ask_for_bind (1);
3414}
3415
3416sub update_binding_widgets {
3417 my ($self) = @_;
3418 my ($mod, $sym, $cmds) = $self->get_binding;
3419 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3420 $self->set_command_list ($cmds);
3421}
3422
3423sub get_binding {
3424 my ($self) = @_;
3425 return (
3426 $self->{binding}->[0],
3427 $self->{binding}->[1],
3428 [ grep { defined $_ } @{$self->{commands}} ]
3429 );
3430}
3431
3432sub clear_command_list {
3433 my ($self) = @_;
3434 $self->{cmdbox}->clear ();
3435}
3436
3437sub set_command_list {
3438 my ($self, $cmds) = @_;
3439
3440 $self->{cmdbox}->clear ();
3441 $self->{commands} = $cmds;
3442
3443 my $idx = 0;
3444
3445 for (@$cmds) {
3446 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3447
3448 my $i = $idx;
3449 $hb->add (new CFClient::UI::Label text => $_);
3450 $hb->add (new CFClient::UI::Button
3451 text => "delete",
3452 tooltip => "Deletes the action from the record",
3453 on_activate => sub {
3454 $self->{cmdbox}->remove ($hb);
3455 $cmds->[$i] = undef;
3456 });
3457
3458
3459 $idx++
3460 }
3461} 3836}
3462 3837
3463############################################################################# 3838#############################################################################
3464 3839
3465package CFClient::UI; 3840package CFClient::UI;

Diff Legend

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