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.314 by root, Mon Jun 26 21:59:04 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;
1535 delete $self->{texture}; 1659 delete $self->{texture};
1536 1660
1537 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1538} 1670}
1539 1671
1540sub _draw { 1672sub _draw {
1541 my ($self) = @_; 1673 my ($self) = @_;
1542 1674
… …
1548 $self->{layout}->set_width ($self->{w}); 1680 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1681 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1684
1553 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1685 new_from_layout CFClient::Texture $self->{layout}
1686 };
1554 1687
1688 unless (exists $self->{ox}) {
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5); 1691 : ($self->{w} - $tex->{w}) * 0.5);
1558 1692
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1564 }; 1696 };
1565 1697
1566 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1568 1702
1569 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1570 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1572 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1574 } 1710 }
1575 1711
1576 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1577} 1713}
1578 1714
… …
1595 can_hover => 1, 1731 can_hover => 1,
1596 can_focus => 1, 1732 can_focus => 1,
1597 valign => 0, 1733 valign => 0,
1598 can_events => 1, 1734 can_events => 1,
1599 #text => ... 1735 #text => ...
1736 #hidden => "*",
1600 @_ 1737 @_
1601 ) 1738 )
1602} 1739}
1603 1740
1604sub _set_text { 1741sub _set_text {
… …
1606 1743
1607 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1608 1745
1609 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1610 1747
1611 delete $self->{texture};
1612
1613 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1614 $self->{text} = $text; 1749 $self->{text} = $text;
1615 1750
1616 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1617 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1618 1754
1619 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1620} 1759}
1621 1760
1622sub set_text { 1761sub set_text {
1623 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1624 1763
1625 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1626 $self->_set_text ($text); 1765 $self->_set_text ($text);
1627
1628 $self->realloc;
1629} 1766}
1630 1767
1631sub get_text { 1768sub get_text {
1632 $_[0]{text} 1769 $_[0]{text}
1633} 1770}
… …
1638 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1639 1776
1640 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1641} 1778}
1642 1779
1643sub key_down { 1780sub invoke_key_down {
1644 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1645 1782
1646 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1647 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1648 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1660 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1661 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1662 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1663 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1664 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1665 $self->_emit ('escape'); 1802 $self->emit ('escape');
1666 } elsif ($uni) { 1803 } elsif ($uni) {
1667 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1668 } 1807 }
1669 1808
1670 $self->_set_text ($text); 1809 $self->_set_text ($text);
1671 1810
1672 $self->realloc; 1811 $self->realloc;
1673}
1674 1812
1813 1
1814}
1815
1675sub focus_in { 1816sub invoke_focus_in {
1676 my ($self) = @_; 1817 my ($self) = @_;
1677 1818
1678 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1679 1820
1680 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1681} 1822}
1682 1823
1683sub button_down { 1824sub invoke_button_down {
1684 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1685 1826
1686 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1687 1828
1688 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1689 1830
1690 # byte-index to char-index 1831 # byte-index to char-index
1691 my $text = $self->{text}; 1832 my $text = $self->{text};
1692 utf8::encode $text; 1833 utf8::encode $text;
1693 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1694 1835
1695 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1696 $self->update; 1837 $self->update;
1838
1839 1
1697} 1840}
1698 1841
1699sub mouse_motion { 1842sub invoke_mouse_motion {
1700 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1701# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1702} 1847}
1703 1848
1704sub _draw { 1849sub _draw {
1705 my ($self) = @_; 1850 my ($self) = @_;
1706 1851
1707 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1708 1853
1709 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1710 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1711 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1712 } else { 1857 } else {
1713 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1714 } 1859 }
1715 1860
1716 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1719 glVertex 0 , 0; 1864 glVertex 0 , 0;
1720 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1721 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1722 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1747 1892
1748our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1749 1894
1750use CFClient::OpenGL; 1895use CFClient::OpenGL;
1751 1896
1752sub key_down { 1897sub invoke_key_down {
1753 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1754 1899
1755 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1756 1901
1757 if ($sym == 13) { 1902 if ($sym == 13) {
1758 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1759 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1760 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1761 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1762 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1763 $self->update; 1909 $self->update;
1764 1910
1765 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1766 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1767 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1783 } else { 1929 } else {
1784 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1785 } 1931 }
1786 1932
1787 } else { 1933 } else {
1788 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1789 } 1937 1
1790
1791} 1938}
1792 1939
1793############################################################################# 1940#############################################################################
1794 1941
1795package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1816 can_events => 1, 1963 can_events => 1,
1817 @_ 1964 @_
1818 ) 1965 )
1819} 1966}
1820 1967
1821sub activate { }
1822
1823sub button_up { 1968sub invoke_button_up {
1824 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1825 1970
1826 $self->emit ("activate") 1971 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1974
1975 1
1829} 1976}
1830 1977
1831sub _draw { 1978sub _draw {
1832 my ($self) = @_; 1979 my ($self) = @_;
1833 1980
1834 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836 if ($GRAB == $self) {
1837 $self->{fg} = $self->{active_fg};
1838 }
1839 1982
1840 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1843 1986
1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1845 1988
1846 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1847 1990
1848 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1849} 2028}
1850 2029
1851############################################################################# 2030#############################################################################
1852 2031
1853package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1880 my ($self) = @_; 2059 my ($self) = @_;
1881 2060
1882 (6) x 2 2061 (6) x 2
1883} 2062}
1884 2063
1885sub button_down { 2064sub invoke_button_down {
1886 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1887 2066
1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1891 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1892 } 2075 1
1893} 2076}
1894 2077
1895sub _draw { 2078sub _draw {
1896 my ($self) = @_; 2079 my ($self) = @_;
1897 2080
… …
1917package CFClient::UI::Image; 2100package CFClient::UI::Image;
1918 2101
1919our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1920 2103
1921use CFClient::OpenGL; 2104use CFClient::OpenGL;
1922use Carp qw/confess/;
1923 2105
1924our %loaded_images; 2106our %texture_cache;
1925 2107
1926sub new { 2108sub new {
1927 my $class = shift; 2109 my $class = shift;
1928 2110
1929 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1930 2115
1931 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
1932 2118
1933 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1934 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1935 2121
1936 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1937 2123
1938 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1939
1940 $self->{aspect} = $tex->{w} / $tex->{h};
1941 2125
1942 $self 2126 $self
1943} 2127}
1944 2128
1945sub size_request { 2129sub size_request {
1946 my ($self) = @_; 2130 my ($self) = @_;
1947 2131
1948 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1949} 2133}
1950 2134
1951sub _draw { 2135sub _draw {
1952 my ($self) = @_; 2136 my ($self) = @_;
1953 2137
… …
2064 2248
2065 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
2067 2251
2068 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2257
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2188 $self->update; 2373 $self->update;
2189 2374
2190 $self 2375 $self
2191} 2376}
2192 2377
2193sub changed { }
2194
2195sub set_range { 2378sub set_range {
2196 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2197 2380
2198 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2199 2382
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2202} 2387}
2203 2388
2204sub set_value { 2389sub set_value {
2205 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2206 2391
… …
2217 if $unit; 2402 if $unit;
2218 2403
2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2220 2405
2221 if ($value != $old_value) { 2406 if ($value != $old_value) {
2222 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2223 $self->update; 2408 $self->update;
2224 } 2409 }
2225} 2410}
2226 2411
2227sub size_request { 2412sub size_request {
2228 my ($self) = @_; 2413 my ($self) = @_;
2229 2414
2230 ($self->{req_w}, $self->{req_h}) 2415 ($self->{req_w}, $self->{req_h})
2231} 2416}
2232 2417
2233sub button_down { 2418sub invoke_button_down {
2234 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2235 2420
2236 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2237 2422
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239 2424
2240 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2241} 2426}
2242 2427
2243sub mouse_motion { 2428sub invoke_mouse_motion {
2244 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2245 2430
2246 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2248 2433
2249 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250 2435
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252 2437
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else {
2440 return 0;
2441 }
2442
2254 } 2443 1
2255} 2444}
2256 2445
2257sub update { 2446sub update {
2258 my ($self) = @_; 2447 my ($self) = @_;
2259 2448
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2261 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2262 2458
2263 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100; 2460 my $range = ($hi - $page - $lo) || 1e-100;
2265 2461
… …
2271 $value = ($value - $lo) / $range; 2467 $value = ($value - $lo) / $range;
2272 $value = $value * $self->{scale} + $self->{offset}; 2468 $value = $value * $self->{scale} + $self->{offset};
2273 2469
2274 $self->{knob_x} = $value - $knob_w * 0.5; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2275 $self->{knob_w} = $knob_w; 2471 $self->{knob_w} = $knob_w;
2276 }); 2472 }
2277
2278 $self->SUPER::update;
2279}
2280
2281sub _draw {
2282 my ($self) = @_;
2283 2473
2284 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2285 2475
2286 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2287 2477
… …
2348sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2350 2540
2351############################################################################# 2541#############################################################################
2352 2542
2353package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2354 2544
2355our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2356 2546
2357use CFClient::OpenGL; 2547use CFClient::OpenGL;
2358 2548
… …
2360 my $class = shift; 2550 my $class = shift;
2361 2551
2362 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2363 fontsize => 1, 2553 fontsize => 1,
2364 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2365 #font => default_font 2556 #font => default_font
2366 @_, 2557 @_,
2367 2558
2368 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2369 par => [], 2560 par => [],
… …
2384 2575
2385 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2386 $self->reflow; 2577 $self->reflow;
2387} 2578}
2388 2579
2580sub size_request {
2581 my ($self) = @_;
2582
2583 my ($empty, $slider) = @{ $self->{children} };
2584
2585 local $self->{children} = [$empty, $slider];
2586 $self->SUPER::size_request
2587}
2588
2389sub size_allocate { 2589sub invoke_size_allocate {
2390 my ($self, $w, $h) = @_; 2590 my ($self, $w, $h) = @_;
2391 2591
2392 $self->SUPER::size_allocate ($w, $h); 2592 my ($empty, $slider, @other) = @{ $self->{children} };
2593 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2393 2594
2394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2595 $self->{layout}->set_font ($self->{font}) if $self->{font};
2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2596 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $self->{layout}->set_width ($self->{children}[0]{w}); 2597 $self->{layout}->set_width ($empty->{w});
2598 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 2599
2398 $self->reflow; 2600 $self->reflow;
2399}
2400 2601
2401sub text_size { 2602 local $self->{children} = [$empty, $slider];
2402 my ($self, $text, $indent) = @_; 2603 $self->SUPER::invoke_size_allocate ($w, $h)
2604}
2605
2606sub get_layout {
2607 my ($self, $para) = @_;
2403 2608
2404 my $layout = $self->{layout}; 2609 my $layout = $self->{layout};
2405 2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612 $layout->set_foreground (@{$para->{fg}});
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2613 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent); 2614 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2615 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2408 $layout->set_markup ($text); 2616 $layout->set_markup ($para->{markup});
2617
2618 $layout->set_shapes (
2619 map
2620 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2621 @{$para->{widget}}
2409 2622 );
2623
2410 $layout->size 2624 $layout
2411} 2625}
2412 2626
2413sub reflow { 2627sub reflow {
2414 my ($self) = @_; 2628 my ($self) = @_;
2415 2629
… …
2424 $self->{children}[1]->set_value ($offset); 2638 $self->{children}[1]->set_value ($offset);
2425} 2639}
2426 2640
2427sub clear { 2641sub clear {
2428 my ($self) = @_; 2642 my ($self) = @_;
2643
2644 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other;
2429 2646
2430 $self->{par} = []; 2647 $self->{par} = [];
2431 $self->{height} = 0; 2648 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433} 2650}
2434 2651
2435sub add_paragraph { 2652sub add_paragraph {
2436 my ($self, $color, $text, $indent) = @_; 2653 my ($self, $color, $para, $indent) = @_;
2437 2654
2438 for my $line (split /\n/, $text) { 2655 my ($text, @w) = ref $para ? @$para : $para;
2439 my ($w, $h) = $self->text_size ($line); 2656
2440 $self->{height} += $h; 2657 $para = {
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2658 w => 1e10,
2659 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2442 } 2664 };
2443 2665
2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2666 $self->add (@w) if @w;
2667 push @{$self->{par}}, $para;
2668
2669 $self->{need_reflow}++;
2670 $self->update;
2671}
2672
2673sub scroll_to_bottom {
2674 my ($self) = @_;
2675
2676 $self->{scroll_to_bottom} = 1;
2677 $self->update;
2445} 2678}
2446 2679
2447sub update { 2680sub update {
2448 my ($self) = @_; 2681 my ($self) = @_;
2449 2682
… …
2451 2684
2452 return unless $self->{h} > 0; 2685 return unless $self->{h} > 0;
2453 2686
2454 delete $self->{texture}; 2687 delete $self->{texture};
2455 2688
2456 $ROOT->on_post_alloc ($self, sub { 2689 $ROOT->on_post_alloc ($self => sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458 2691
2459 if (delete $self->{need_reflow}) { 2692 if (delete $self->{need_reflow}) {
2460 my $height = 0; 2693 my $height = 0;
2461 2694
2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2466 for (@{$self->{par}}) { 2695 for my $para (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2468 $layout->set_width ($W - $_->[3]); 2697 my $layout = $self->get_layout ($para);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size; 2698 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3]; 2699
2472 $_->[1] = $h; 2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2473 } 2703 }
2474 2704
2475 $height += $_->[1]; 2705 $height += $para->{h};
2476 } 2706 }
2477 2707
2478 $self->{height} = $height; 2708 $self->{height} = $height;
2479 2709
2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2481 2711
2482 delete $self->{texture}; 2712 delete $self->{texture};
2483 } 2713 }
2484 2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2486 glClearColor 0.5, 0.5, 0.5, 0; 2720 glClearColor 0, 0, 0, 0;
2487 glClear GL_COLOR_BUFFER_BIT; 2721 glClear GL_COLOR_BUFFER_BIT;
2488 2722
2489 my $top = int $self->{children}[1]{range}[0]; 2723 my $top = int $self->{children}[1]{range}[0];
2490 2724
2491 my $y0 = $top; 2725 my $y0 = $top;
2492 my $y1 = $top + $H; 2726 my $y1 = $top + $H;
2493 2727
2494 my $y = 0; 2728 my $y = 0;
2495
2496 my $layout = $self->{layout};
2497
2498 $layout->set_font ($self->{font}) if $self->{font};
2499 2729
2500 glEnable GL_BLEND; 2730 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off 2731 #TODO# not correct in windows where rgba is forced off
2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2503 2733
2504 for my $par (@{$self->{par}}) { 2734 for my $para (@{$self->{par}}) {
2505 my $h = $par->[1]; 2735 my $h = $para->{h};
2506 2736
2507 if ($y0 < $y + $h && $y < $y1) { 2737 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] }); 2738
2509 $layout->set_width ($W - $par->[3]); 2739 my $layout = $self->get_layout ($para);
2510 $layout->set_markup ($par->[4]);
2511 2740
2512 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2513 2742
2514 glRasterPos $par->[3], $y - $y0; 2743 glRasterPos $para->{indent}, $y - $y0;
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 glDisable GL_BLEND;
2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752
2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0;
2755
2756 $_->draw;
2757 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 }
2516 } 2761 }
2517 2762
2518 $y += $h; 2763 $y += $h;
2519 } 2764 }
2520 2765
2521 glDisable GL_BLEND; 2766 glDisable GL_BLEND;
2522 }; 2767 };
2523 }); 2768 });
2524} 2769}
2525 2770
2771sub reconfigure {
2772 my ($self) = @_;
2773
2774 $self->SUPER::reconfigure;
2775
2776 $_->{w} = 1e10 for @{ $self->{par} };
2777 $self->reflow;
2778}
2779
2526sub _draw { 2780sub _draw {
2527 my ($self) = @_; 2781 my ($self) = @_;
2528 2782
2529 glEnable GL_TEXTURE_2D; 2783 glEnable GL_TEXTURE_2D;
2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2784 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531 glColor 1, 1, 1, 1; 2785 glColor 0, 0, 0, 1;
2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2786 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533 glDisable GL_TEXTURE_2D; 2787 glDisable GL_TEXTURE_2D;
2534 2788
2535 $self->{children}[1]->draw; 2789 $self->{children}[1]->draw;
2536
2537} 2790}
2538 2791
2539############################################################################# 2792#############################################################################
2540 2793
2541package CFClient::UI::Animator; 2794package CFClient::UI::Animator;
… …
2628 $tooltip .= "\n\n" . (ref $widget) . "\n" 2881 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2882 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n" 2883 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}"; 2884 . "visible $widget->{visible}";
2632 } 2885 }
2886
2887 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//;
2633 2889
2634 $self->add (new CFClient::UI::Label 2890 $self->add (new CFClient::UI::Label
2635 markup => $tooltip, 2891 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8, 2893 fontsize => 0.8,
… …
2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2903 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2648 2904
2649 ($w + 4, $h + 4) 2905 ($w + 4, $h + 4)
2650} 2906}
2651 2907
2652sub size_allocate { 2908sub invoke_size_allocate {
2653 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2654 2910
2655 $self->SUPER::size_allocate ($w - 4, $h - 4); 2911 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2656} 2912}
2657 2913
2658sub visibility_change { 2914sub invoke_visibility_change {
2659 my ($self, $visible) = @_; 2915 my ($self, $visible) = @_;
2660 2916
2661 return unless $visible; 2917 return unless $visible;
2662 2918
2663 $self->{root}->on_post_alloc ("move_$self" => sub { 2919 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2665 or return; 2921 or return;
2666 2922
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668 2924
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH; 2926 if $x + $self->{w} > $self->{root}{w};
2671 2927
2672 $self->move_abs ($x, $y); 2928 $self->move_abs ($x, $y);
2673 }); 2929 });
2674} 2930}
2675 2931
… …
2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3020 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765 3021
2766 if ($tex) { 3022 if ($tex) {
2767 glEnable GL_TEXTURE_2D; 3023 glEnable GL_TEXTURE_2D;
2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769 glColor 1, 1, 1, 1; 3025 glColor 0, 0, 0, 1;
2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3026 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771 glDisable GL_TEXTURE_2D; 3027 glDisable GL_TEXTURE_2D;
2772 } 3028 }
2773} 3029}
2774 3030
2775sub DESTROY { 3031sub destroy {
2776 my ($self) = @_; 3032 my ($self) = @_;
2777 3033
2778 $self->{timer}->cancel 3034 $self->{timer}->cancel
2779 if $self->{timer}; 3035 if $self->{timer};
2780 3036
2781 $self->SUPER::DESTROY; 3037 $self->SUPER::destroy;
2782} 3038}
2783 3039
2784############################################################################# 3040#############################################################################
2785 3041
2786package CFClient::UI::Inventory; 3042package CFClient::UI::Buttonbar;
2787 3043
2788our @ISA = CFClient::UI::ScrolledWindow::; 3044our @ISA = CFClient::UI::HBox::;
2789 3045
2790sub new { 3046# 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 3047
2826############################################################################# 3048#############################################################################
2827 3049
2828package CFClient::UI::Menu; 3050package CFClient::UI::Menu;
2829 3051
… …
2841 ); 3063 );
2842 3064
2843 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3065 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2844 3066
2845 for my $item (@{ $self->{items} }) { 3067 for my $item (@{ $self->{items} }) {
2846 my ($widget, $cb) = @$item; 3068 my ($widget, $cb, $tooltip) = @$item;
2847 3069
2848 # handle various types of items, only text for now 3070 # handle various types of items, only text for now
2849 if (!ref $widget) { 3071 if (!ref $widget) {
2850 $widget = new CFClient::UI::Label 3072 $widget = new CFClient::UI::Label
2851 can_hover => 1, 3073 can_hover => 1,
2852 can_events => 1, 3074 can_events => 1,
2853 text => $widget; 3075 markup => $widget,
3076 tooltip => $tooltip
2854 } 3077 }
2855 3078
2856 $self->{item}{$widget} = $item; 3079 $self->{item}{$widget} = $item;
2857 3080
2858 $self->{vbox}->add ($widget); 3081 $self->{vbox}->add ($widget);
… …
2863 3086
2864# popup given the event (must be a mouse button down event currently) 3087# popup given the event (must be a mouse button down event currently)
2865sub popup { 3088sub popup {
2866 my ($self, $ev) = @_; 3089 my ($self, $ev) = @_;
2867 3090
2868 $self->_emit ("popdown"); 3091 $self->emit ("popdown");
2869 3092
2870 # maybe save $GRAB? must be careful about events... 3093 # maybe save $GRAB? must be careful about events...
2871 $GRAB = $self; 3094 $GRAB = $self;
2872 $self->{button} = $ev->{button}; 3095 $self->{button} = $ev->{button};
2873 3096
2874 $self->show; 3097 $self->show;
2875 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3098 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2876} 3099}
2877 3100
2878sub mouse_motion { 3101sub invoke_mouse_motion {
2879 my ($self, $ev, $x, $y) = @_; 3102 my ($self, $ev, $x, $y) = @_;
2880 3103
2881 # TODO: should use vbox->find_widget or so 3104 # TODO: should use vbox->find_widget or so
2882 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3105 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2883 $self->{hover} = $self->{item}{$HOVER}; 3106 $self->{hover} = $self->{item}{$HOVER};
2884}
2885 3107
3108 0
3109}
3110
2886sub button_up { 3111sub invoke_button_up {
2887 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2888 3113
2889 if ($ev->{button} == $self->{button}) { 3114 if ($ev->{button} == $self->{button}) {
2890 undef $GRAB; 3115 undef $GRAB;
2891 $self->hide; 3116 $self->hide;
2892 3117
2893 $self->_emit ("popdown"); 3118 $self->emit ("popdown");
2894 $self->{hover}[1]->() if $self->{hover}; 3119 $self->{hover}[1]->() if $self->{hover};
3120 } else {
3121 return 0
3122 }
3123
2895 } 3124 1
2896} 3125}
2897 3126
2898############################################################################# 3127#############################################################################
2899 3128
2900package CFClient::UI::Statusbox; 3129package CFClient::UI::Multiplexer;
2901 3130
2902our @ISA = CFClient::UI::VBox::; 3131our @ISA = CFClient::UI::Container::;
2903 3132
2904sub new { 3133sub new {
2905 my $class = shift; 3134 my $class = shift;
2906 3135
2907 $class->SUPER::new ( 3136 my $self = $class->SUPER::new (
3137 @_,
3138 );
3139
3140 $self->{current} = $self->{children}[0]
3141 if @{ $self->{children} };
3142
3143 $self
3144}
3145
3146sub add {
3147 my ($self, @widgets) = @_;
3148
3149 $self->SUPER::add (@widgets);
3150
3151 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} };
3153}
3154
3155sub set_current_page {
3156 my ($self, $page_or_widget) = @_;
3157
3158 my $widget = ref $page_or_widget
3159 ? $page_or_widget
3160 : $self->{children}[$page_or_widget];
3161
3162 $self->{current} = $widget;
3163 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3164
3165 $self->emit (page_changed => $self->{current});
3166
3167 $self->realloc;
3168}
3169
3170sub visible_children {
3171 $_[0]{current}
3172}
3173
3174sub size_request {
3175 my ($self) = @_;
3176
3177 $self->{current}->size_request
3178}
3179
3180sub invoke_size_allocate {
3181 my ($self, $w, $h) = @_;
3182
3183 $self->{current}->configure (0, 0, $w, $h);
3184
3185 1
3186}
3187
3188sub _draw {
3189 my ($self) = @_;
3190
3191 $self->{current}->draw;
3192}
3193
3194#############################################################################
3195
3196package CFClient::UI::Notebook;
3197
3198our @ISA = CFClient::UI::VBox::;
3199
3200sub new {
3201 my $class = shift;
3202
3203 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self
3207 @_,
3208 );
3209
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3211 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3212
3213 $self
3214}
3215
3216sub add {
3217 my ($self, $title, $widget, $tooltip) = @_;
3218
3219 Scalar::Util::weaken $self;
3220
3221 $self->{buttonbar}->add (new CFClient::UI::Button
3222 markup => $title,
3223 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) },
3225 );
3226
3227 $self->{multiplexer}->add ($widget);
3228}
3229
3230sub set_current_page {
3231 my ($self, $page) = @_;
3232
3233 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current});
3235}
3236
3237#############################################################################
3238
3239package CFClient::UI::Combobox;
3240
3241use utf8;
3242
3243our @ISA = CFClient::UI::Button::;
3244
3245sub new {
3246 my $class = shift;
3247
3248 my $self = $class->SUPER::new (
3249 options => [], # [value, title, longdesc], ...
3250 value => undef,
3251 @_,
3252 );
3253
3254 $self->_set_value ($self->{value});
3255
3256 $self
3257}
3258
3259sub invoke_button_down {
3260 my ($self, $ev) = @_;
3261
3262 my @menu_items;
3263
3264 for (@{ $self->{options} }) {
3265 my ($value, $title, $tooltip) = @$_;
3266
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 }
3269
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271}
3272
3273sub _set_value {
3274 my ($self, $value) = @_;
3275
3276 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3277 or return;
3278
3279 $self->{value} = $item->[0];
3280 $self->set_markup ("$item->[1] ⇓");
3281 $self->set_tooltip ($item->[2]);
3282}
3283
3284sub set_value {
3285 my ($self, $value) = @_;
3286
3287 return unless $self->{value} ne $value;
3288
3289 $self->_set_value ($value);
3290 $self->emit (changed => $value);
3291}
3292
3293#############################################################################
3294
3295package CFClient::UI::Statusbox;
3296
3297our @ISA = CFClient::UI::VBox::;
3298
3299sub new {
3300 my $class = shift;
3301
3302 my $self = $class->SUPER::new (
2908 fontsize => 0.8, 3303 fontsize => 0.8,
2909 @_, 3304 @_,
2910 ) 3305 );
3306
3307 Scalar::Util::weaken (my $this = $self);
3308
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310
3311 $self
2911} 3312}
2912 3313
2913sub reorder { 3314sub reorder {
2914 my ($self) = @_; 3315 my ($self) = @_;
2915 my $NOW = time; 3316 my $NOW = Time::HiRes::time;
3317
3318 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} };
2916 3322
2917 while (my ($k, $v) = each %{ $self->{item} }) { 3323 while (my ($k, $v) = each %{ $self->{item} }) {
2918 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3324 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2919 } 3325 }
2920 3326
… …
2923 my @items = sort { 3329 my @items = sort {
2924 $a->{pri} <=> $b->{pri} 3330 $a->{pri} <=> $b->{pri}
2925 or $b->{id} <=> $a->{id} 3331 or $b->{id} <=> $a->{id}
2926 } values %{ $self->{item} }; 3332 } values %{ $self->{item} };
2927 3333
3334 $self->{timer}->interval (1);
3335
2928 my $count = 10 + 1; 3336 my $count = 10 + 1;
2929 for my $item (@items) { 3337 for my $item (@items) {
2930 last unless --$count; 3338 last unless --$count;
2931 3339
2932 push @widgets, $item->{label} ||= do { 3340 my $label = $item->{label} ||= do {
2933 # TODO: doesn't handle markup well (read as: at all) 3341 # TODO: doesn't handle markup well (read as: at all)
2934 my $short = $item->{count} > 1 3342 my $short = $item->{count} > 1
2935 ? "<b>$item->{count} ×</b> $item->{text}" 3343 ? "<b>$item->{count} ×</b> $item->{text}"
2936 : $item->{text}; 3344 : $item->{text};
2937 3345
… …
2945 tooltip => $item->{tooltip}, 3353 tooltip => $item->{tooltip},
2946 tooltip_font => $::FONT_PROP, 3354 tooltip_font => $::FONT_PROP,
2947 tooltip_width => 0.67, 3355 tooltip_width => 0.67,
2948 fontsize => $item->{fontsize} || $self->{fontsize}, 3356 fontsize => $item->{fontsize} || $self->{fontsize},
2949 max_w => $::WIDTH * 0.44, 3357 max_w => $::WIDTH * 0.44,
2950 fg => $item->{fg}, 3358 fg => [@{ $item->{fg} }],
2951 can_events => 1, 3359 can_events => 1,
2952 can_hover => 1 3360 can_hover => 1
2953 }; 3361 };
3362
3363 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3364 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3365 $label->update;
3366 $label->set_max_size (undef, $label->{req_h} * $diff)
3367 if $diff < 1;
3368 $self->{timer}->interval (1/30);
3369 } else {
3370 $label->{fg}[3] = $item->{fg}[3] || 1;
3371 }
3372
3373 push @widgets, $label;
2954 } 3374 }
2955 3375
2956 $self->clear; 3376 $self->clear;
2957 $self->SUPER::add (reverse @widgets); 3377 $self->SUPER::add (reverse @widgets);
2958} 3378}
… …
2963 $text =~ s/^\s+//; 3383 $text =~ s/^\s+//;
2964 $text =~ s/\s+$//; 3384 $text =~ s/\s+$//;
2965 3385
2966 return unless $text; 3386 return unless $text;
2967 3387
2968 my $timeout = time + ((delete $arg{timeout}) || 60); 3388 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2969 3389
2970 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3390 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2971 3391
2972 if (my $item = $self->{item}{$group}) { 3392 if (my $item = $self->{item}{$group}) {
2973 if ($item->{text} eq $text) { 3393 if ($item->{text} eq $text) {
2974 $item->{count}++; 3394 $item->{count}++;
2975 } else { 3395 } else {
2976 $item->{count} = 1; 3396 $item->{count} = 1;
2977 $item->{text} = $item->{tooltip} = $text; 3397 $item->{text} = $item->{tooltip} = $text;
2978 } 3398 }
2979 $item->{id} = ++$self->{id}; 3399 $item->{id} += 0.2;#d#
2980 $item->{timeout} = $timeout; 3400 $item->{timeout} = $timeout;
2981 delete $item->{label}; 3401 delete $item->{label};
2982 } else { 3402 } else {
2983 $self->{item}{$group} = { 3403 $self->{item}{$group} = {
2984 id => ++$self->{id}, 3404 id => ++$self->{id},
… …
3003 3423
3004 $self->reorder; 3424 $self->reorder;
3005 $self->SUPER::reconfigure; 3425 $self->SUPER::reconfigure;
3006} 3426}
3007 3427
3428sub destroy {
3429 my ($self) = @_;
3430
3431 $self->{timer}->cancel;
3432
3433 $self->SUPER::destroy;
3434}
3435
3008############################################################################# 3436#############################################################################
3009 3437
3438package CFClient::UI::Inventory;
3439
3440our @ISA = CFClient::UI::ScrolledWindow::;
3441
3442sub new {
3443 my $class = shift;
3444
3445 my $self = $class->SUPER::new (
3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3447 @_,
3448 );
3449
3450 $self
3451}
3452
3453sub set_items {
3454 my ($self, $items) = @_;
3455
3456 $self->{child}->clear;
3457 return unless $items;
3458
3459 my @items = sort {
3460 ($a->{type} <=> $b->{type})
3461 or ($a->{name} cmp $b->{name})
3462 } @$items;
3463
3464 $self->{real_items} = \@items;
3465
3466 my $row = 0;
3467 for my $item (@items) {
3468 CFClient::Item::update_widgets $item;
3469
3470 $self->{child}->add (0, $row, $item->{face_widget});
3471 $self->{child}->add (1, $row, $item->{desc_widget});
3472 $self->{child}->add (2, $row, $item->{weight_widget});
3473
3474 $row++;
3475 }
3476}
3477
3478#############################################################################
3479
3480package CFClient::UI::SpellList;
3481
3482our @ISA = CFClient::UI::Table::;
3483
3484sub new {
3485 my $class = shift;
3486
3487 my $self = $class->SUPER::new (
3488 binding => [],
3489 commands => [],
3490 @_,
3491 )
3492}
3493
3494my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506
3507sub rebuild_spell_list {
3508 my ($self) = @_;
3509
3510 $CFClient::UI::ROOT->on_refresh ($self => sub {
3511 $self->clear;
3512
3513 return unless $::CONN;
3514
3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521 my $row = 0;
3522
3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524 my $spell = $self->{spell}{$_};
3525
3526 $row++;
3527
3528 my $spell_cb = sub {
3529 my ($widget, $ev) = @_;
3530
3531 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu
3537 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ],
3541 )->popup ($ev);
3542 } else {
3543 return 0;
3544 }
3545
3546 1
3547 };
3548
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554 $self->add (0, $row, new CFClient::UI::Face
3555 face => $spell->{face},
3556 can_hover => 1,
3557 can_events => 1,
3558 tooltip => $tooltip,
3559 on_button_down => $spell_cb,
3560 );
3561
3562 $self->add (1, $row, new CFClient::UI::Label
3563 expand => 1,
3564 text => $spell->{name},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575 }
3576 });
3577}
3578
3579sub add_spell {
3580 my ($self, $spell) = @_;
3581
3582 $self->{spell}->{$spell->{name}} = $spell;
3583 $self->rebuild_spell_list;
3584}
3585
3586sub remove_spell {
3587 my ($self, $spell) = @_;
3588
3589 delete $self->{spell}->{$spell->{name}};
3590 $self->rebuild_spell_list;
3591}
3592
3593sub clear_spells {
3594 my ($self) = @_;
3595
3596 $self->{spell} = {};
3597 $self->rebuild_spell_list;
3598}
3599
3600#############################################################################
3601
3010package CFClient::UI::Root; 3602package CFClient::UI::Root;
3011 3603
3012our @ISA = CFClient::UI::Container::; 3604our @ISA = CFClient::UI::Container::;
3605
3606use List::Util qw(min max);
3013 3607
3014use CFClient::OpenGL; 3608use CFClient::OpenGL;
3015 3609
3016sub new { 3610sub new {
3017 my $class = shift; 3611 my $class = shift;
… …
3044 $coord = $max - $size if $coord > $max - $size; 3638 $coord = $max - $size if $coord > $max - $size;
3045 3639
3046 int $coord + 0.5 3640 int $coord + 0.5
3047} 3641}
3048 3642
3049sub size_allocate { 3643sub invoke_size_allocate {
3050 my ($self, $w, $h) = @_; 3644 my ($self, $w, $h) = @_;
3051 3645
3052 for my $child ($self->children) { 3646 for my $child ($self->children) {
3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3647 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054 3648
… …
3058 $X = _to_pixel $X, $W, $self->{w}; 3652 $X = _to_pixel $X, $W, $self->{w};
3059 $Y = _to_pixel $Y, $H, $self->{h}; 3653 $Y = _to_pixel $Y, $H, $self->{h};
3060 3654
3061 $child->configure ($X, $Y, $W, $H); 3655 $child->configure ($X, $Y, $W, $H);
3062 } 3656 }
3657
3658 1
3063} 3659}
3064 3660
3065sub coord2local { 3661sub coord2local {
3066 my ($self, $x, $y) = @_; 3662 my ($self, $x, $y) = @_;
3067 3663
… …
3123 $_->() 3719 $_->()
3124 for values %{delete $self->{refresh_hook}}; 3720 for values %{delete $self->{refresh_hook}};
3125 } 3721 }
3126 3722
3127 if ($self->{realloc}) { 3723 if ($self->{realloc}) {
3724 my %queue;
3128 my @queue; 3725 my @queue;
3726 my $widget;
3129 3727
3728 outer:
3130 while () { 3729 while () {
3131 if ($self->{realloc}) { 3730 if (my $realloc = delete $self->{realloc}) {
3132 #TODO use array-of-depth approach 3731 for $widget (values %$realloc) {
3732 $widget->{visible} or next; # do not resize invisible widgets
3133 3733
3134 use sort 'stable'; 3734 $queue{$widget+0}++ and next; # duplicates are common
3135 3735
3136 @queue = sort { $a->{visible} <=> $b->{visible} } 3736 push @{ $queue[$widget->{visible}] }, $widget;
3137 @queue, values %{delete $self->{realloc}}; 3737 }
3138 } 3738 }
3139 3739
3740 while () {
3741 @queue or last outer;
3742
3140 my $widget = pop @queue || last; 3743 $widget = pop @{ $queue[-1] || [] }
3744 and last;
3745
3746 pop @queue;
3747 }
3141 3748
3142 $widget->{visible} or last; # do not resize invisible widgets 3749 delete $queue{$widget+0};
3143 3750
3144 my ($w, $h) = $widget->size_request; 3751 my ($w, $h) = $widget->size_request;
3145 3752
3146 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3753 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3754 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3755
3756 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3757 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3148 3758
3149 $w = $widget->{force_w} if exists $widget->{force_w}; 3759 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h}; 3760 $h = $widget->{force_h} if exists $widget->{force_h};
3151 3761
3152 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3762 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3155 $widget->{req_h} = $h; 3765 $widget->{req_h} = $h;
3156 3766
3157 $self->{size_alloc}{$widget+0} = $widget; 3767 $self->{size_alloc}{$widget+0} = $widget;
3158 3768
3159 if (my $parent = $widget->{parent}) { 3769 if (my $parent = $widget->{parent}) {
3160 $self->{realloc}{$parent+0} = $parent; 3770 $self->{realloc}{$parent+0} = $parent
3161 #unshift @queue, $parent; 3771 unless $queue{$parent+0};
3772
3162 $parent->{force_size_alloc} = 1; 3773 $parent->{force_size_alloc} = 1;
3163 $self->{size_alloc}{$parent+0} = $parent; 3774 $self->{size_alloc}{$parent+0} = $parent;
3164 } 3775 }
3165 } 3776 }
3166 3777
… …
3182 3793
3183 $w = int $w + 0.5; 3794 $w = int $w + 0.5;
3184 $h = int $h + 0.5; 3795 $h = int $h + 0.5;
3185 3796
3186 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3797 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798 $widget->{old_w} = $widget->{w};
3799 $widget->{old_h} = $widget->{h};
3800
3187 $widget->{w} = $w; 3801 $widget->{w} = $w;
3188 $widget->{h} = $h; 3802 $widget->{h} = $h;
3189 3803
3190 $widget->emit (size_allocate => $w, $h); 3804 $widget->emit (size_allocate => $w, $h);
3191 } 3805 }
… …
3206 glLoadIdentity; 3820 glLoadIdentity;
3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3821 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3208 glMatrixMode GL_MODELVIEW; 3822 glMatrixMode GL_MODELVIEW;
3209 glLoadIdentity; 3823 glLoadIdentity;
3210 3824
3825 {
3826 package CFClient::UI::Base;
3827
3828 ($draw_x, $draw_y, $draw_w, $draw_h) =
3829 (0, 0, $self->{w}, $self->{h});
3830 }
3831
3211 $self->_draw; 3832 $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} 3833}
3462 3834
3463############################################################################# 3835#############################################################################
3464 3836
3465package CFClient::UI; 3837package CFClient::UI;

Diff Legend

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