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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.316 by root, Sun Jul 2 13:57:58 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
171sub rescale_widgets { 172sub rescale_widgets {
172 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
173 174
174 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178 179
179 $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.]+$/;
180 $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};
181 $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};
182 $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.]+$/;
183 $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};
184 $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};
185 186
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188 189
189 } 190 }
190 } 191 }
191 192
192 reconfigure_widgets; 193 reconfigure_widgets;
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $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;
320 $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;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
383} 390}
384 391
385sub set_tooltip { 392sub set_tooltip {
386 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
387 394
… …
392 399
393 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
394 401
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 405 }
399} 406}
400 407
401# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
402sub coord2local { 409sub coord2local {
… …
410 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
411 418
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 420}
414 421
415sub focus_in { 422sub invoke_focus_in {
416 my ($self) = @_; 423 my ($self) = @_;
417 424
418 return if $FOCUS == $self; 425 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
420 427
421 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
422 429
423 $self->_emit (focus_in => $focus);
424
425 $focus->update if $focus; 430 $focus->update if $focus;
426 $FOCUS->update; 431 $FOCUS->update;
427}
428 432
433 0
434}
435
429sub focus_out { 436sub invoke_focus_out {
430 my ($self) = @_; 437 my ($self) = @_;
431 438
432 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
433 440
434 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
435 442
436 $self->_emit (focus_out => $focus);
437
438 $focus->update if $focus; #? 443 $focus->update if $focus; #?
439 444
440 $::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
441 unless $FOCUS; 446 unless $FOCUS;
442}
443 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
444sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
445sub button_up { } 458sub invoke_button_up { 1 }
446sub key_down { } 459sub invoke_key_down { 1 }
447sub key_up { } 460sub invoke_key_up { 1 }
448 461
449sub button_down { 462sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
451 464
452 $self->focus_in; 465 $self->grab_focus;
466
467 1
468}
469
470sub connect {
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
453} 483}
454 484
455sub find_widget { 485sub find_widget {
456 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
457 487
… …
467sub set_parent { 497sub set_parent {
468 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
469 499
470 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495} 502}
496 503
497sub realloc { 504sub realloc {
498 my ($self) = @_; 505 my ($self) = @_;
499 506
… …
529sub draw { 536sub draw {
530 my ($self) = @_; 537 my ($self) = @_;
531 538
532 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
533 540
541 # update screen rectangle
534 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
536 544
537 return if $draw_x + $self->{w} < 0; 545 # skip widgets that are entirely outside the drawing area
538 return if $draw_x >= $draw_w; 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
539 return if $draw_y + $self->{h} < 0; 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
540 return if $draw_y >= $draw_h;
541 548
542 glPushMatrix; 549 glPushMatrix;
543 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
544 $self->_draw;
545 glPopMatrix;
546 551
547 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
548 my ($x, $y) = @$self{qw(x y)};
549
550 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
551 glEnable GL_BLEND; 554 glEnable GL_BLEND;
552 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
553 glBegin GL_QUADS; 556 glBegin GL_QUADS;
554 glVertex $x , $y; 557 glVertex 0 , 0;
555 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
556 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
557 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
558 glEnd; 561 glEnd;
559 glDisable GL_BLEND; 562 glDisable GL_BLEND;
560 } 563 }
561 564
562 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
563 glPushMatrix; 566 glPushMatrix;
564 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
566 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
567 glVertex 0 , 0; 570 glVertex 0 , 0;
568 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
571 glEnd; 574 glEnd;
572 glPopMatrix; 575 glPopMatrix;
573 #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;
574 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
575} 581}
576 582
577sub _draw { 583sub _draw {
578 my ($self) = @_; 584 my ($self) = @_;
579 585
… …
582 588
583sub DESTROY { 589sub DESTROY {
584 my ($self) = @_; 590 my ($self) = @_;
585 591
586 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
587 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
588} 596}
589 597
590############################################################################# 598#############################################################################
591 599
592package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
617 625
618 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
619 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
620 628
621 glEnable GL_BLEND; 629 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glColor @$color; 631 glColor_premultiply @$color;
624 632
625 glBegin GL_QUADS; 633 glBegin GL_QUADS;
626 glVertex 0 , 0; 634 glVertex 0 , 0;
627 glVertex 0 , $h; 635 glVertex 0 , $h;
628 glVertex $w, $h; 636 glVertex $w, $h;
… …
659our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
660 668
661sub new { 669sub new {
662 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
663 671
664 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
665 673
666 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
667 children => [], 675 children => [],
668 can_events => 0, 676 can_events => 0,
669 %arg, 677 %arg,
670 ); 678 );
679
671 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
672 682
673 $self 683 $self
674} 684}
675 685
676sub add { 686sub add {
… …
724 $x -= $self->{x}; 734 $x -= $self->{x};
725 $y -= $self->{y}; 735 $y -= $self->{y};
726 736
727 my $res; 737 my $res;
728 738
729 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
730 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
731 and return $res; 741 and return $res;
732 } 742 }
733 743
734 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
755} 765}
756 766
757sub add { 767sub add {
758 my ($self, $child) = @_; 768 my ($self, $child) = @_;
759 769
760 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
761
762 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
763} 772}
764 773
765sub remove { 774sub remove {
766 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
775 784
776sub size_request { 785sub size_request {
777 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
778} 787}
779 788
780sub size_allocate { 789sub invoke_size_allocate {
781 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
782 791
783 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
784} 795}
785 796
786############################################################################# 797#############################################################################
798
799# back-buffered drawing area
787 800
788package CFClient::UI::Window; 801package CFClient::UI::Window;
789 802
790our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
791 804
… …
802 815
803 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
804 $self->SUPER::update; 817 $self->SUPER::update;
805} 818}
806 819
807sub size_allocate { 820sub invoke_size_allocate {
808 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
809 822
810 $self->SUPER::size_allocate ($w, $h);
811 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
812} 826}
813 827
814sub _render { 828sub _render {
815 my ($self) = @_; 829 my ($self) = @_;
816 830
… …
843 my $tex = $self->{texture} 857 my $tex = $self->{texture}
844 or return; 858 or return;
845 859
846 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
848 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
849 863
850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
851 865
852 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
853} 867}
… …
877 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
878 892
879 ($w, $h) 893 ($w, $h)
880} 894}
881 895
882sub size_allocate { 896sub invoke_size_allocate {
883 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
884 898
885 my $child = $self->child; 899 my $child = $self->child;
886 900
887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
889 903
890 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
891 $self->update; 905 $self->update;
906
907 1
892} 908}
893 909
894sub set_offset { 910sub set_offset {
895 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
896 912
… …
944package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
945 961
946our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
947 963
948sub new { 964sub new {
949 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
950 968
951 my $self; 969 my $self;
952 970
953 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
954 vertical => 1, 972 vertical => 1,
… …
959 ; 977 ;
960 978
961 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
962 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
963 slider => $slider, 981 slider => $slider,
964 @_, 982 %arg,
965 ); 983 );
966 984
967 $self->{vp}->add ($self->{scrolled});
968 $self->add ($self->{vp});
969 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
970 987
971 $self 988 $self
972} 989}
973 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
974sub update { 1005sub update {
975 my ($self) = @_; 1006 my ($self) = @_;
976 1007
977 $self->SUPER::update; 1008 $self->SUPER::update;
978 1009
979 # todo: overwrite size_allocate of child 1010 $self->update_slider;
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982} 1011}
983 1012
984sub size_allocate { 1013sub invoke_size_allocate {
985 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
986 1015
1016 $self->update_slider;
1017
987 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
988
989 my $child = $self->{vp}->child;
990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
991} 1019}
992
993#TODO# update range on size_allocate depending on child
994# update viewport offset on scroll
995 1020
996############################################################################# 1021#############################################################################
997 1022
998package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
999 1024
… …
1015 1040
1016 if ($self->{bg}) { 1041 if ($self->{bg}) {
1017 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
1018 1043
1019 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
1020 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1021 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
1022 1047
1023 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
1024 glVertex 0 , 0; 1049 glVertex 0 , 0;
1025 glVertex 0 , $h; 1050 glVertex 0 , $h;
1026 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1048my @border = 1073my @border =
1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1050 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);
1051 1076
1052sub new { 1077sub new {
1053 my $class = shift; 1078 my ($class, %arg) = @_;
1054 1079
1055 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1056 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1057 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1058 border => 0.6, 1083 border => 0.6,
1059 can_events => 1, 1084 can_events => 1,
1060 min_w => 16, 1085 min_w => 16,
1061 min_h => 16, 1086 min_h => 16,
1062 @_ 1087 %arg,
1063 ); 1088 );
1064 1089
1065 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1066 align => 0, 1091 align => 0,
1067 valign => 1, 1092 valign => 1,
1068 text => $self->{title}, 1093 text => $self->{title},
1069 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 }
1070 1105
1071 $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};
1072} 1115}
1073 1116
1074sub border { 1117sub border {
1075 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1076} 1119}
1077 1120
1078sub size_request { 1121sub size_request {
1079 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};
1080 1129
1081 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1082 1131
1083 ( 1132 (
1084 $w + $self->border * 2, 1133 $w + $self->border * 2,
1085 $h + $self->border * 2, 1134 $h + $self->border * 2,
1086 ) 1135 )
1087} 1136}
1088 1137
1089sub size_allocate { 1138sub invoke_size_allocate {
1090 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1091 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
1092 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1093 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1094 1151
1095 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1096 if $self->{title};
1097
1098 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1099}
1100 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1101sub button_down { 1160sub invoke_button_down {
1102 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1103 1162
1104 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1105 my $border = $self->border; 1164 my $border = $self->border;
1106 1165
… …
1122 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
1123 1182
1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126 1185
1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1127 $self->realloc; 1187 $self->realloc;
1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 }; 1188 };
1130 1189
1131 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1132 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1133 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1136 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1137 1196
1138 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1139 1198
1140 $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});
1141 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
1142 } 1207 1
1143} 1208}
1144 1209
1145sub button_up { 1210sub invoke_button_up {
1146 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1147 1212
1148 delete $self->{motion}; 1213 ! ! delete $self->{motion}
1149} 1214}
1150 1215
1151sub mouse_motion { 1216sub invoke_mouse_motion {
1152 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1153 1218
1154 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
1155} 1222}
1156 1223
1157sub _draw { 1224sub _draw {
1158 my ($self) = @_; 1225 my ($self) = @_;
1159 1226
1227 my $child = $self->{children}[0];
1228
1160 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
1161 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
1162 1231
1163 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1165 1234
1166 my $border = $self->border; 1235 my $border = $self->border;
… …
1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182 } 1251 }
1183 1252
1184 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1185 1254
1186 $self->{title}->draw if $self->{title};
1187
1188 $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};
1189} 1266}
1190 1267
1191############################################################################# 1268#############################################################################
1192 1269
1193package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1216 1293
1217 $child->set_parent ($self); 1294 $child->set_parent ($self);
1218 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1219 1296
1220 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1221} 1304}
1222 1305
1223# 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?
1224sub clear { 1307sub clear {
1225 my ($self) = @_; 1308 my ($self) = @_;
… …
1266 (sum @$ws), 1349 (sum @$ws),
1267 (sum @$hs), 1350 (sum @$hs),
1268 ) 1351 )
1269} 1352}
1270 1353
1271sub size_allocate { 1354sub invoke_size_allocate {
1272 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1273 1356
1274 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1275 1358
1276 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
… …
1308 } 1391 }
1309 1392
1310 $y += $row_h; 1393 $y += $row_h;
1311 } 1394 }
1312 1395
1396 1
1313} 1397}
1314 1398
1315sub find_widget { 1399sub find_widget {
1316 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1317 1401
… …
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 ) 1440 )
1357} 1441}
1358 1442
1359sub size_allocate { 1443sub invoke_size_allocate {
1360 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1361 1445
1362 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1363 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1364 1448
1365 my @req; 1449 my @req;
1366 1450
1367 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1368 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1369 } else { 1453 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1371 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1372 1456
1373 if ($req > $space) { 1457 if ($req > $space) {
1374 # ah well, not enough space 1458 # ah well, not enough space
1375 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1376 } else { 1460 } else {
1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1378 1462
1379 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1380 1464
1381 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1382 for 0 .. $#$children; 1466 for 0 .. $#children;
1383 } 1467 }
1384 } 1468 }
1385 1469
1386 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1387 1471
1388 my $pos = 0; 1472 my $pos = 0;
1389 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1390 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1391 $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));
1392 1476
1393 $pos += $alloc; 1477 $pos += $alloc;
1394 } 1478 }
1395 1479
1396 1 1480 1
… …
1486 1570
1487 delete $self->{texture}; 1571 delete $self->{texture};
1488 $self->SUPER::update; 1572 $self->SUPER::update;
1489} 1573}
1490 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1491sub set_text { 1582sub set_text {
1492 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1493 1584
1494 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1495 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1496 1587
1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1498 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1499 1590
1591 delete $self->{size_req};
1500 $self->realloc; 1592 $self->realloc;
1501 $self->update; 1593 $self->update;
1502} 1594}
1503 1595
1504sub set_markup { 1596sub set_markup {
… …
1510 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1511 1603
1512 $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;
1513 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1514 1606
1607 delete $self->{size_req};
1515 $self->realloc; 1608 $self->realloc;
1516 $self->update; 1609 $self->update;
1517} 1610}
1518 1611
1519sub size_request { 1612sub size_request {
1520 my ($self) = @_; 1613 my ($self) = @_;
1521 1614
1615 $self->{size_req} ||= do {
1522 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1523 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1527 1621
1528 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1529 1623
1530 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1531 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1532 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1533 1627
1534 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1535 1629
1536 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1537 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1538 } 1635 };
1539 1636
1540 ($w, $h) 1637 @{ $self->{size_req} }
1541} 1638}
1542 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1543sub size_allocate { 1644sub invoke_size_allocate {
1544 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1646
1647 delete $self->{ox};
1545 1648
1546 delete $self->{texture} 1649 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1548} 1653}
1549 1654
1550sub set_fontsize { 1655sub set_fontsize {
1551 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1552 1657
1553 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1659 delete $self->{size_req};
1554 delete $self->{texture}; 1660 delete $self->{texture};
1555 1661
1556 $self->realloc; 1662 $self->realloc;
1663}
1664
1665sub reconfigure {
1666 my ($self) = @_;
1667
1668 delete $self->{size_req};
1669
1670 $self->SUPER::reconfigure;
1557} 1671}
1558 1672
1559sub _draw { 1673sub _draw {
1560 my ($self) = @_; 1674 my ($self) = @_;
1561 1675
… …
1567 $self->{layout}->set_width ($self->{w}); 1681 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1682 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571 1685
1572 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1686 new_from_layout CFClient::Texture $self->{layout}
1687 };
1573 1688
1689 unless (exists $self->{ox}) {
1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1576 : ($self->{w} - $tex->{w}) * 0.5); 1692 : ($self->{w} - $tex->{w}) * 0.5);
1577 1693
1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1580 : ($self->{h} - $tex->{h}) * 0.5); 1696 : ($self->{h} - $tex->{h}) * 0.5);
1581
1582 $tex
1583 }; 1697 };
1584 1698
1585 glEnable GL_TEXTURE_2D; 1699 glEnable GL_TEXTURE_2D;
1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1587 1703
1588 if ($tex->{format} == GL_ALPHA) { 1704 if ($tex->{format} == GL_ALPHA) {
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1589 glColor @{$self->{fg}}; 1706 glColor @{$self->{fg}};
1590 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1591 } else { 1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1593 } 1711 }
1594 1712
1595 glDisable GL_TEXTURE_2D; 1713 glDisable GL_TEXTURE_2D;
1596} 1714}
1597 1715
… …
1614 can_hover => 1, 1732 can_hover => 1,
1615 can_focus => 1, 1733 can_focus => 1,
1616 valign => 0, 1734 valign => 0,
1617 can_events => 1, 1735 can_events => 1,
1618 #text => ... 1736 #text => ...
1737 #hidden => "*",
1619 @_ 1738 @_
1620 ) 1739 )
1621} 1740}
1622 1741
1623sub _set_text { 1742sub _set_text {
… …
1625 1744
1626 delete $self->{cur_h}; 1745 delete $self->{cur_h};
1627 1746
1628 return if $self->{text} eq $text; 1747 return if $self->{text} eq $text;
1629 1748
1630 delete $self->{texture};
1631
1632 $self->{last_activity} = $::NOW; 1749 $self->{last_activity} = $::NOW;
1633 $self->{text} = $text; 1750 $self->{text} = $text;
1634 1751
1635 $text =~ s/./*/g if $self->{hidden}; 1752 $text =~ s/./*/g if $self->{hidden};
1636 $self->{layout}->set_text ("$text "); 1753 $self->{layout}->set_text ("$text ");
1754 delete $self->{size_req};
1637 1755
1638 $self->_emit (changed => $self->{text}); 1756 $self->emit (changed => $self->{text});
1757
1758 $self->realloc;
1759 $self->update;
1639} 1760}
1640 1761
1641sub set_text { 1762sub set_text {
1642 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1643 1764
1644 $self->{cursor} = length $text; 1765 $self->{cursor} = length $text;
1645 $self->_set_text ($text); 1766 $self->_set_text ($text);
1646
1647 $self->realloc;
1648} 1767}
1649 1768
1650sub get_text { 1769sub get_text {
1651 $_[0]{text} 1770 $_[0]{text}
1652} 1771}
… …
1657 my ($w, $h) = $self->SUPER::size_request; 1776 my ($w, $h) = $self->SUPER::size_request;
1658 1777
1659 ($w + 1, $h) # add 1 for cursor 1778 ($w + 1, $h) # add 1 for cursor
1660} 1779}
1661 1780
1662sub key_down { 1781sub invoke_key_down {
1663 my ($self, $ev) = @_; 1782 my ($self, $ev) = @_;
1664 1783
1665 my $mod = $ev->{mod}; 1784 my $mod = $ev->{mod};
1666 my $sym = $ev->{sym}; 1785 my $sym = $ev->{sym};
1667 my $uni = $ev->{unicode}; 1786 my $uni = $ev->{unicode};
… …
1679 } elsif ($sym == CFClient::SDLK_HOME) { 1798 } elsif ($sym == CFClient::SDLK_HOME) {
1680 $self->{cursor} = 0; 1799 $self->{cursor} = 0;
1681 } elsif ($sym == CFClient::SDLK_END) { 1800 } elsif ($sym == CFClient::SDLK_END) {
1682 $self->{cursor} = length $text; 1801 $self->{cursor} = length $text;
1683 } elsif ($uni == 27) { 1802 } elsif ($uni == 27) {
1684 $self->_emit ('escape'); 1803 $self->emit ('escape');
1685 } elsif ($uni) { 1804 } elsif ($uni) {
1686 substr $text, $self->{cursor}++, 0, chr $uni; 1805 substr $text, $self->{cursor}++, 0, chr $uni;
1806 } else {
1807 return 0;
1687 } 1808 }
1688 1809
1689 $self->_set_text ($text); 1810 $self->_set_text ($text);
1690 1811
1691 $self->realloc; 1812 $self->realloc;
1692}
1693 1813
1814 1
1815}
1816
1694sub focus_in { 1817sub invoke_focus_in {
1695 my ($self) = @_; 1818 my ($self) = @_;
1696 1819
1697 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1698 1821
1699 $self->SUPER::focus_in; 1822 $self->SUPER::invoke_focus_in
1700} 1823}
1701 1824
1702sub button_down { 1825sub invoke_button_down {
1703 my ($self, $ev, $x, $y) = @_; 1826 my ($self, $ev, $x, $y) = @_;
1704 1827
1705 $self->SUPER::button_down ($ev, $x, $y); 1828 $self->SUPER::invoke_button_down ($ev, $x, $y);
1706 1829
1707 my $idx = $self->{layout}->xy_to_index ($x, $y); 1830 my $idx = $self->{layout}->xy_to_index ($x, $y);
1708 1831
1709 # byte-index to char-index 1832 # byte-index to char-index
1710 my $text = $self->{text}; 1833 my $text = $self->{text};
1711 utf8::encode $text; 1834 utf8::encode $text;
1712 $self->{cursor} = length substr $text, 0, $idx; 1835 $self->{cursor} = length substr $text, 0, $idx;
1713 1836
1714 $self->_set_text ($self->{text}); 1837 $self->_set_text ($self->{text});
1715 $self->update; 1838 $self->update;
1839
1840 1
1716} 1841}
1717 1842
1718sub mouse_motion { 1843sub invoke_mouse_motion {
1719 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1720# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1845# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1846
1847 1
1721} 1848}
1722 1849
1723sub _draw { 1850sub _draw {
1724 my ($self) = @_; 1851 my ($self) = @_;
1725 1852
1726 local $self->{fg} = $self->{fg}; 1853 local $self->{fg} = $self->{fg};
1727 1854
1728 if ($FOCUS == $self) { 1855 if ($FOCUS == $self) {
1729 glColor @{$self->{active_bg}}; 1856 glColor_premultiply @{$self->{active_bg}};
1730 $self->{fg} = $self->{active_fg}; 1857 $self->{fg} = $self->{active_fg};
1731 } else { 1858 } else {
1732 glColor @{$self->{bg}}; 1859 glColor_premultiply @{$self->{bg}};
1733 } 1860 }
1734 1861
1735 glEnable GL_BLEND; 1862 glEnable GL_BLEND;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1863 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1737 glBegin GL_QUADS; 1864 glBegin GL_QUADS;
1738 glVertex 0 , 0; 1865 glVertex 0 , 0;
1739 glVertex 0 , $self->{h}; 1866 glVertex 0 , $self->{h};
1740 glVertex $self->{w}, $self->{h}; 1867 glVertex $self->{w}, $self->{h};
1741 glVertex $self->{w}, 0; 1868 glVertex $self->{w}, 0;
… …
1766 1893
1767our @ISA = CFClient::UI::EntryBase::; 1894our @ISA = CFClient::UI::EntryBase::;
1768 1895
1769use CFClient::OpenGL; 1896use CFClient::OpenGL;
1770 1897
1771sub key_down { 1898sub invoke_key_down {
1772 my ($self, $ev) = @_; 1899 my ($self, $ev) = @_;
1773 1900
1774 my $sym = $ev->{sym}; 1901 my $sym = $ev->{sym};
1775 1902
1776 if ($sym == 13) { 1903 if ($sym == 13) {
1777 unshift @{$self->{history}}, 1904 unshift @{$self->{history}},
1778 my $txt = $self->get_text; 1905 my $txt = $self->get_text;
1906
1779 $self->{history_pointer} = -1; 1907 $self->{history_pointer} = -1;
1780 $self->{history_saveback} = ''; 1908 $self->{history_saveback} = '';
1781 $self->_emit (activate => $txt); 1909 $self->emit (activate => $txt);
1782 $self->update; 1910 $self->update;
1783 1911
1784 } elsif ($sym == CFClient::SDLK_UP) { 1912 } elsif ($sym == CFClient::SDLK_UP) {
1785 if ($self->{history_pointer} < 0) { 1913 if ($self->{history_pointer} < 0) {
1786 $self->{history_saveback} = $self->get_text; 1914 $self->{history_saveback} = $self->get_text;
… …
1802 } else { 1930 } else {
1803 $self->set_text ($self->{history_saveback}); 1931 $self->set_text ($self->{history_saveback});
1804 } 1932 }
1805 1933
1806 } else { 1934 } else {
1807 $self->SUPER::key_down ($ev); 1935 return $self->SUPER::invoke_key_down ($ev)
1936 }
1937
1808 } 1938 1
1809
1810} 1939}
1811 1940
1812############################################################################# 1941#############################################################################
1813 1942
1814package CFClient::UI::Button; 1943package CFClient::UI::Button;
… …
1835 can_events => 1, 1964 can_events => 1,
1836 @_ 1965 @_
1837 ) 1966 )
1838} 1967}
1839 1968
1840sub activate { }
1841
1842sub button_up { 1969sub invoke_button_up {
1843 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1844 1971
1845 $self->emit ("activate") 1972 $self->emit ("activate")
1846 if $x >= 0 && $x < $self->{w} 1973 if $x >= 0 && $x < $self->{w}
1847 && $y >= 0 && $y < $self->{h}; 1974 && $y >= 0 && $y < $self->{h};
1975
1976 1
1848} 1977}
1849 1978
1850sub _draw { 1979sub _draw {
1851 my ($self) = @_; 1980 my ($self) = @_;
1852 1981
1853 local $self->{fg} = $self->{fg}; 1982 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1854
1855 if ($GRAB == $self) {
1856 $self->{fg} = $self->{active_fg};
1857 }
1858 1983
1859 glEnable GL_TEXTURE_2D; 1984 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 glColor 0, 0, 0, 1; 1986 glColor 0, 0, 0, 1;
1862 1987
1863 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1988 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1864 1989
1865 glDisable GL_TEXTURE_2D; 1990 glDisable GL_TEXTURE_2D;
1866 1991
1867 $self->SUPER::_draw; 1992 $self->SUPER::_draw;
1993}
1994
1995#############################################################################
1996
1997package CFClient::UI::ImageButton;
1998
1999our @ISA = CFClient::UI::Image::;
2000
2001use CFClient::OpenGL;
2002
2003my %textures;
2004
2005sub new {
2006 my $class = shift;
2007
2008 my $self = $class->SUPER::new (
2009 padding_x => 4,
2010 padding_y => 4,
2011 fg => [1, 1, 1],
2012 active_fg => [0, 0, 1],
2013 can_hover => 1,
2014 align => 0,
2015 valign => 0,
2016 can_events => 1,
2017 @_
2018 );
2019}
2020
2021sub invoke_button_up {
2022 my ($self, $ev, $x, $y) = @_;
2023
2024 $self->emit ("activate")
2025 if $x >= 0 && $x < $self->{w}
2026 && $y >= 0 && $y < $self->{h};
2027
2028 1
1868} 2029}
1869 2030
1870############################################################################# 2031#############################################################################
1871 2032
1872package CFClient::UI::CheckBox; 2033package CFClient::UI::CheckBox;
… …
1899 my ($self) = @_; 2060 my ($self) = @_;
1900 2061
1901 (6) x 2 2062 (6) x 2
1902} 2063}
1903 2064
1904sub button_down { 2065sub invoke_button_down {
1905 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1906 2067
1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1909 $self->{state} = !$self->{state}; 2070 $self->{state} = !$self->{state};
1910 $self->_emit (changed => $self->{state}); 2071 $self->emit (changed => $self->{state});
2072 } else {
2073 return 0
2074 }
2075
1911 } 2076 1
1912} 2077}
1913 2078
1914sub _draw { 2079sub _draw {
1915 my ($self) = @_; 2080 my ($self) = @_;
1916 2081
… …
1936package CFClient::UI::Image; 2101package CFClient::UI::Image;
1937 2102
1938our @ISA = CFClient::UI::Base::; 2103our @ISA = CFClient::UI::Base::;
1939 2104
1940use CFClient::OpenGL; 2105use CFClient::OpenGL;
1941use Carp qw/confess/;
1942 2106
1943our %loaded_images; 2107our %texture_cache;
1944 2108
1945sub new { 2109sub new {
1946 my $class = shift; 2110 my $class = shift;
1947 2111
1948 my $self = $class->SUPER::new (can_events => 0, @_); 2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
1949 2116
1950 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
1951 2119
1952 $loaded_images{$self->{image}} ||= 2120 $self->{tex} = $texture_cache{$self->{path}} ||=
1953 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1954 2122
1955 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2123 Scalar::Util::weaken $texture_cache{$self->{path}};
1956 2124
1957 Scalar::Util::weaken $loaded_images{$self->{image}}; 2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1958
1959 $self->{aspect} = $tex->{w} / $tex->{h};
1960 2126
1961 $self 2127 $self
1962} 2128}
1963 2129
1964sub size_request { 2130sub size_request {
1965 my ($self) = @_; 2131 my ($self) = @_;
1966 2132
1967 ($self->{tex}->{w}, $self->{tex}->{h}) 2133 ($self->{tex}{w}, $self->{tex}{h})
1968} 2134}
1969 2135
1970sub _draw { 2136sub _draw {
1971 my ($self) = @_; 2137 my ($self) = @_;
1972 2138
… …
2083 2249
2084 my $h1 = $self->{h} * (1 - $ycut1); 2250 my $h1 = $self->{h} * (1 - $ycut1);
2085 my $h2 = $self->{h} * (1 - $ycut2); 2251 my $h2 = $self->{h} * (1 - $ycut2);
2086 2252
2087 glEnable GL_BLEND; 2253 glEnable GL_BLEND;
2088 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2089 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091 2258
2092 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2259 glBindTexture GL_TEXTURE_2D, $t1->{name};
2093 glBegin GL_QUADS; 2260 glBegin GL_QUADS;
… …
2207 $self->update; 2374 $self->update;
2208 2375
2209 $self 2376 $self
2210} 2377}
2211 2378
2212sub changed { }
2213
2214sub set_range { 2379sub set_range {
2215 my ($self, $range) = @_; 2380 my ($self, $range) = @_;
2216 2381
2217 ($range, $self->{range}) = ($self->{range}, $range); 2382 ($range, $self->{range}) = ($self->{range}, $range);
2218 2383
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}"; 2384 if ("@$range" ne "@{$self->{range}}") {
2385 $self->update;
2386 $self->set_value ($self->{range}[0]);
2387 }
2221} 2388}
2222 2389
2223sub set_value { 2390sub set_value {
2224 my ($self, $value) = @_; 2391 my ($self, $value) = @_;
2225 2392
… …
2236 if $unit; 2403 if $unit;
2237 2404
2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2405 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2239 2406
2240 if ($value != $old_value) { 2407 if ($value != $old_value) {
2241 $self->_emit (changed => $value); 2408 $self->emit (changed => $value);
2242 $self->update; 2409 $self->update;
2243 } 2410 }
2244} 2411}
2245 2412
2246sub size_request { 2413sub size_request {
2247 my ($self) = @_; 2414 my ($self) = @_;
2248 2415
2249 ($self->{req_w}, $self->{req_h}) 2416 ($self->{req_w}, $self->{req_h})
2250} 2417}
2251 2418
2252sub button_down { 2419sub invoke_button_down {
2253 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2254 2421
2255 $self->SUPER::button_down ($ev, $x, $y); 2422 $self->SUPER::invoke_button_down ($ev, $x, $y);
2256 2423
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258 2425
2259 $self->mouse_motion ($ev, $x, $y); 2426 $self->invoke_mouse_motion ($ev, $x, $y)
2260} 2427}
2261 2428
2262sub mouse_motion { 2429sub invoke_mouse_motion {
2263 my ($self, $ev, $x, $y) = @_; 2430 my ($self, $ev, $x, $y) = @_;
2264 2431
2265 if ($GRAB == $self) { 2432 if ($GRAB == $self) {
2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2433 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2267 2434
2268 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2435 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269 2436
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2437 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271 2438
2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2439 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2440 } else {
2441 return 0;
2442 }
2443
2273 } 2444 1
2274} 2445}
2275 2446
2276sub update { 2447sub update {
2277 my ($self) = @_; 2448 my ($self) = @_;
2278 2449
2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2450 delete $self->{knob_w};
2451 $self->SUPER::update;
2452}
2453
2454sub _draw {
2455 my ($self) = @_;
2456
2457 unless ($self->{knob_w}) {
2280 $self->set_value ($self->{range}[0]); 2458 $self->set_value ($self->{range}[0]);
2281 2459
2282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2460 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100; 2461 my $range = ($hi - $page - $lo) || 1e-100;
2284 2462
… …
2290 $value = ($value - $lo) / $range; 2468 $value = ($value - $lo) / $range;
2291 $value = $value * $self->{scale} + $self->{offset}; 2469 $value = $value * $self->{scale} + $self->{offset};
2292 2470
2293 $self->{knob_x} = $value - $knob_w * 0.5; 2471 $self->{knob_x} = $value - $knob_w * 0.5;
2294 $self->{knob_w} = $knob_w; 2472 $self->{knob_w} = $knob_w;
2295 }); 2473 }
2296
2297 $self->SUPER::update;
2298}
2299
2300sub _draw {
2301 my ($self) = @_;
2302 2474
2303 $self->SUPER::_draw (); 2475 $self->SUPER::_draw ();
2304 2476
2305 glScale $self->{w}, $self->{h}; 2477 glScale $self->{w}, $self->{h};
2306 2478
… …
2367sub set_range { shift->{slider}->set_range (@_) } 2539sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) } 2540sub set_value { shift->{slider}->set_value (@_) }
2369 2541
2370############################################################################# 2542#############################################################################
2371 2543
2372package CFClient::UI::TextView; 2544package CFClient::UI::TextScroller;
2373 2545
2374our @ISA = CFClient::UI::HBox::; 2546our @ISA = CFClient::UI::HBox::;
2375 2547
2376use CFClient::OpenGL; 2548use CFClient::OpenGL;
2377 2549
… …
2379 my $class = shift; 2551 my $class = shift;
2380 2552
2381 my $self = $class->SUPER::new ( 2553 my $self = $class->SUPER::new (
2382 fontsize => 1, 2554 fontsize => 1,
2383 can_events => 0, 2555 can_events => 0,
2556 indent => 0,
2384 #font => default_font 2557 #font => default_font
2385 @_, 2558 @_,
2386 2559
2387 layout => (new CFClient::Layout 1), 2560 layout => (new CFClient::Layout 1),
2388 par => [], 2561 par => [],
… …
2403 2576
2404 $self->{fontsize} = $fontsize; 2577 $self->{fontsize} = $fontsize;
2405 $self->reflow; 2578 $self->reflow;
2406} 2579}
2407 2580
2581sub size_request {
2582 my ($self) = @_;
2583
2584 my ($empty, $slider) = @{ $self->{children} };
2585
2586 local $self->{children} = [$empty, $slider];
2587 $self->SUPER::size_request
2588}
2589
2408sub size_allocate { 2590sub invoke_size_allocate {
2409 my ($self, $w, $h) = @_; 2591 my ($self, $w, $h) = @_;
2410 2592
2411 $self->SUPER::size_allocate ($w, $h); 2593 my ($empty, $slider, @other) = @{ $self->{children} };
2594 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2412 2595
2413 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2596 $self->{layout}->set_font ($self->{font}) if $self->{font};
2414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2415 $self->{layout}->set_width ($self->{children}[0]{w}); 2598 $self->{layout}->set_width ($empty->{w});
2599 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2416 2600
2417 $self->reflow; 2601 $self->reflow;
2418}
2419 2602
2420sub text_size { 2603 local $self->{children} = [$empty, $slider];
2421 my ($self, $text, $indent) = @_; 2604 $self->SUPER::invoke_size_allocate ($w, $h)
2605}
2606
2607sub get_layout {
2608 my ($self, $para) = @_;
2422 2609
2423 my $layout = $self->{layout}; 2610 my $layout = $self->{layout};
2424 2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613 $layout->set_foreground (@{$para->{fg}});
2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2614 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426 $layout->set_width ($self->{children}[0]{w} - $indent); 2615 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2616 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2427 $layout->set_markup ($text); 2617 $layout->set_markup ($para->{markup});
2618
2619 $layout->set_shapes (
2620 map
2621 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2622 @{$para->{widget}}
2428 2623 );
2624
2429 $layout->size 2625 $layout
2430} 2626}
2431 2627
2432sub reflow { 2628sub reflow {
2433 my ($self) = @_; 2629 my ($self) = @_;
2434 2630
… …
2443 $self->{children}[1]->set_value ($offset); 2639 $self->{children}[1]->set_value ($offset);
2444} 2640}
2445 2641
2446sub clear { 2642sub clear {
2447 my ($self) = @_; 2643 my ($self) = @_;
2644
2645 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other;
2448 2647
2449 $self->{par} = []; 2648 $self->{par} = [];
2450 $self->{height} = 0; 2649 $self->{height} = 0;
2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452} 2651}
2453 2652
2454sub add_paragraph { 2653sub add_paragraph {
2455 my ($self, $color, $text, $indent) = @_; 2654 my ($self, $color, $para, $indent) = @_;
2456 2655
2457 for my $line (split /\n/, $text) { 2656 my ($text, @w) = ref $para ? @$para : $para;
2458 my ($w, $h) = $self->text_size ($line); 2657
2459 $self->{height} += $h; 2658 $para = {
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2659 w => 1e10,
2660 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2461 } 2665 };
2462 2666
2463 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2667 $self->add (@w) if @w;
2668 push @{$self->{par}}, $para;
2669
2670 $self->{need_reflow}++;
2671 $self->update;
2672}
2673
2674sub scroll_to_bottom {
2675 my ($self) = @_;
2676
2677 $self->{scroll_to_bottom} = 1;
2678 $self->update;
2464} 2679}
2465 2680
2466sub update { 2681sub update {
2467 my ($self) = @_; 2682 my ($self) = @_;
2468 2683
… …
2470 2685
2471 return unless $self->{h} > 0; 2686 return unless $self->{h} > 0;
2472 2687
2473 delete $self->{texture}; 2688 delete $self->{texture};
2474 2689
2475 $ROOT->on_post_alloc ($self, sub { 2690 $ROOT->on_post_alloc ($self => sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477 2692
2478 if (delete $self->{need_reflow}) { 2693 if (delete $self->{need_reflow}) {
2479 my $height = 0; 2694 my $height = 0;
2480 2695
2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2485 for (@{$self->{par}}) { 2696 for my $para (@{$self->{par}}) {
2486 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2487 $layout->set_width ($W - $_->[3]); 2698 my $layout = $self->get_layout ($para);
2488 $layout->set_markup ($_->[4]);
2489 my ($w, $h) = $layout->size; 2699 my ($w, $h) = $layout->size;
2490 $_->[0] = $w + $_->[3]; 2700
2491 $_->[1] = $h; 2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2492 } 2704 }
2493 2705
2494 $height += $_->[1]; 2706 $height += $para->{h};
2495 } 2707 }
2496 2708
2497 $self->{height} = $height; 2709 $self->{height} = $height;
2498 2710
2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2500 2712
2501 delete $self->{texture}; 2713 delete $self->{texture};
2502 } 2714 }
2503 2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2718 }
2719
2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2505 glClearColor 0.5, 0.5, 0.5, 0; 2721 glClearColor 0, 0, 0, 0;
2506 glClear GL_COLOR_BUFFER_BIT; 2722 glClear GL_COLOR_BUFFER_BIT;
2507 2723
2508 my $top = int $self->{children}[1]{range}[0]; 2724 my $top = int $self->{children}[1]{range}[0];
2509 2725
2510 my $y0 = $top; 2726 my $y0 = $top;
2511 my $y1 = $top + $H; 2727 my $y1 = $top + $H;
2512 2728
2513 my $y = 0; 2729 my $y = 0;
2514
2515 my $layout = $self->{layout};
2516
2517 $layout->set_font ($self->{font}) if $self->{font};
2518 2730
2519 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2520 #TODO# not correct in windows where rgba is forced off 2732 #TODO# not correct in windows where rgba is forced off
2521 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2522 2734
2523 for my $par (@{$self->{par}}) { 2735 for my $para (@{$self->{par}}) {
2524 my $h = $par->[1]; 2736 my $h = $para->{h};
2525 2737
2526 if ($y0 < $y + $h && $y < $y1) { 2738 if ($y0 < $y + $h && $y < $y1) {
2527 $layout->set_foreground (@{ $par->[2] }); 2739
2528 $layout->set_width ($W - $par->[3]); 2740 my $layout = $self->get_layout ($para);
2529 $layout->set_markup ($par->[4]);
2530 2741
2531 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2532 2743
2533 glRasterPos $par->[3], $y - $y0; 2744 glRasterPos $para->{indent}, $y - $y0;
2534 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 glDisable GL_BLEND;
2751 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, ();
2753
2754 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0;
2756
2757 $_->draw;
2758 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 }
2535 } 2762 }
2536 2763
2537 $y += $h; 2764 $y += $h;
2538 } 2765 }
2539 2766
2540 glDisable GL_BLEND; 2767 glDisable GL_BLEND;
2541 }; 2768 };
2542 }); 2769 });
2543} 2770}
2544 2771
2772sub reconfigure {
2773 my ($self) = @_;
2774
2775 $self->SUPER::reconfigure;
2776
2777 $_->{w} = 1e10 for @{ $self->{par} };
2778 $self->reflow;
2779}
2780
2545sub _draw { 2781sub _draw {
2546 my ($self) = @_; 2782 my ($self) = @_;
2547 2783
2548 glEnable GL_TEXTURE_2D; 2784 glEnable GL_TEXTURE_2D;
2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550 glColor 1, 1, 1, 1; 2786 glColor 0, 0, 0, 1;
2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2787 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2552 glDisable GL_TEXTURE_2D; 2788 glDisable GL_TEXTURE_2D;
2553 2789
2554 $self->{children}[1]->draw; 2790 $self->{children}[1]->draw;
2555
2556} 2791}
2557 2792
2558############################################################################# 2793#############################################################################
2559 2794
2560package CFClient::UI::Animator; 2795package CFClient::UI::Animator;
… …
2647 $tooltip .= "\n\n" . (ref $widget) . "\n" 2882 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2883 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n" 2884 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}"; 2885 . "visible $widget->{visible}";
2651 } 2886 }
2887
2888 $tooltip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//;
2652 2890
2653 $self->add (new CFClient::UI::Label 2891 $self->add (new CFClient::UI::Label
2654 markup => $tooltip, 2892 markup => $tooltip,
2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2656 fontsize => 0.8, 2894 fontsize => 0.8,
… …
2666 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2904 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2667 2905
2668 ($w + 4, $h + 4) 2906 ($w + 4, $h + 4)
2669} 2907}
2670 2908
2671sub size_allocate { 2909sub invoke_size_allocate {
2672 my ($self, $w, $h) = @_; 2910 my ($self, $w, $h) = @_;
2673 2911
2674 $self->SUPER::size_allocate ($w - 4, $h - 4); 2912 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2675} 2913}
2676 2914
2677sub visibility_change { 2915sub invoke_visibility_change {
2678 my ($self, $visible) = @_; 2916 my ($self, $visible) = @_;
2679 2917
2680 return unless $visible; 2918 return unless $visible;
2681 2919
2682 $self->{root}->on_post_alloc ("move_$self" => sub { 2920 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2684 or return; 2922 or return;
2685 2923
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687 2925
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH; 2927 if $x + $self->{w} > $self->{root}{w};
2690 2928
2691 $self->move_abs ($x, $y); 2929 $self->move_abs ($x, $y);
2692 }); 2930 });
2693} 2931}
2694 2932
… …
2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3021 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2784 3022
2785 if ($tex) { 3023 if ($tex) {
2786 glEnable GL_TEXTURE_2D; 3024 glEnable GL_TEXTURE_2D;
2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2788 glColor 1, 1, 1, 1; 3026 glColor 0, 0, 0, 1;
2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3027 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2790 glDisable GL_TEXTURE_2D; 3028 glDisable GL_TEXTURE_2D;
2791 } 3029 }
2792} 3030}
2793 3031
2794sub DESTROY { 3032sub destroy {
2795 my ($self) = @_; 3033 my ($self) = @_;
2796 3034
2797 $self->{timer}->cancel 3035 $self->{timer}->cancel
2798 if $self->{timer}; 3036 if $self->{timer};
2799 3037
2800 $self->SUPER::DESTROY; 3038 $self->SUPER::destroy;
2801} 3039}
3040
3041#############################################################################
3042
3043package CFClient::UI::Buttonbar;
3044
3045our @ISA = CFClient::UI::HBox::;
3046
3047# TODO: should actualyl wrap buttons and other goodies.
2802 3048
2803############################################################################# 3049#############################################################################
2804 3050
2805package CFClient::UI::Menu; 3051package CFClient::UI::Menu;
2806 3052
… …
2818 ); 3064 );
2819 3065
2820 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3066 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2821 3067
2822 for my $item (@{ $self->{items} }) { 3068 for my $item (@{ $self->{items} }) {
2823 my ($widget, $cb) = @$item; 3069 my ($widget, $cb, $tooltip) = @$item;
2824 3070
2825 # handle various types of items, only text for now 3071 # handle various types of items, only text for now
2826 if (!ref $widget) { 3072 if (!ref $widget) {
2827 $widget = new CFClient::UI::Label 3073 $widget = new CFClient::UI::Label
2828 can_hover => 1, 3074 can_hover => 1,
2829 can_events => 1, 3075 can_events => 1,
2830 text => $widget; 3076 markup => $widget,
3077 tooltip => $tooltip
2831 } 3078 }
2832 3079
2833 $self->{item}{$widget} = $item; 3080 $self->{item}{$widget} = $item;
2834 3081
2835 $self->{vbox}->add ($widget); 3082 $self->{vbox}->add ($widget);
… …
2840 3087
2841# popup given the event (must be a mouse button down event currently) 3088# popup given the event (must be a mouse button down event currently)
2842sub popup { 3089sub popup {
2843 my ($self, $ev) = @_; 3090 my ($self, $ev) = @_;
2844 3091
2845 $self->_emit ("popdown"); 3092 $self->emit ("popdown");
2846 3093
2847 # maybe save $GRAB? must be careful about events... 3094 # maybe save $GRAB? must be careful about events...
2848 $GRAB = $self; 3095 $GRAB = $self;
2849 $self->{button} = $ev->{button}; 3096 $self->{button} = $ev->{button};
2850 3097
2851 $self->show; 3098 $self->show;
2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3099 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2853} 3100}
2854 3101
2855sub mouse_motion { 3102sub invoke_mouse_motion {
2856 my ($self, $ev, $x, $y) = @_; 3103 my ($self, $ev, $x, $y) = @_;
2857 3104
2858 # TODO: should use vbox->find_widget or so 3105 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3106 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER}; 3107 $self->{hover} = $self->{item}{$HOVER};
2861}
2862 3108
3109 0
3110}
3111
2863sub button_up { 3112sub invoke_button_up {
2864 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2865 3114
2866 if ($ev->{button} == $self->{button}) { 3115 if ($ev->{button} == $self->{button}) {
2867 undef $GRAB; 3116 undef $GRAB;
2868 $self->hide; 3117 $self->hide;
2869 3118
2870 $self->_emit ("popdown"); 3119 $self->emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover}; 3120 $self->{hover}[1]->() if $self->{hover};
3121 } else {
3122 return 0
3123 }
3124
2872 } 3125 1
2873} 3126}
2874 3127
2875############################################################################# 3128#############################################################################
2876 3129
2877package CFClient::UI::Statusbox; 3130package CFClient::UI::Multiplexer;
2878 3131
2879our @ISA = CFClient::UI::VBox::; 3132our @ISA = CFClient::UI::Container::;
2880 3133
2881sub new { 3134sub new {
2882 my $class = shift; 3135 my $class = shift;
2883 3136
2884 $class->SUPER::new ( 3137 my $self = $class->SUPER::new (
3138 @_,
3139 );
3140
3141 $self->{current} = $self->{children}[0]
3142 if @{ $self->{children} };
3143
3144 $self
3145}
3146
3147sub add {
3148 my ($self, @widgets) = @_;
3149
3150 $self->SUPER::add (@widgets);
3151
3152 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} };
3154}
3155
3156sub set_current_page {
3157 my ($self, $page_or_widget) = @_;
3158
3159 my $widget = ref $page_or_widget
3160 ? $page_or_widget
3161 : $self->{children}[$page_or_widget];
3162
3163 $self->{current} = $widget;
3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3165
3166 $self->emit (page_changed => $self->{current});
3167
3168 $self->realloc;
3169}
3170
3171sub visible_children {
3172 $_[0]{current}
3173}
3174
3175sub size_request {
3176 my ($self) = @_;
3177
3178 $self->{current}->size_request
3179}
3180
3181sub invoke_size_allocate {
3182 my ($self, $w, $h) = @_;
3183
3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3187}
3188
3189sub _draw {
3190 my ($self) = @_;
3191
3192 $self->{current}->draw;
3193}
3194
3195#############################################################################
3196
3197package CFClient::UI::Notebook;
3198
3199our @ISA = CFClient::UI::VBox::;
3200
3201sub new {
3202 my $class = shift;
3203
3204 my $self = $class->SUPER::new (
3205 buttonbar => (new CFClient::UI::Buttonbar),
3206 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3207 # filter => # will be put between multiplexer and $self
3208 @_,
3209 );
3210
3211 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3212 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3213
3214 $self
3215}
3216
3217sub add {
3218 my ($self, $title, $widget, $tooltip) = @_;
3219
3220 Scalar::Util::weaken $self;
3221
3222 $self->{buttonbar}->add (new CFClient::UI::Button
3223 markup => $title,
3224 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) },
3226 );
3227
3228 $self->{multiplexer}->add ($widget);
3229}
3230
3231sub set_current_page {
3232 my ($self, $page) = @_;
3233
3234 $self->{multiplexer}->set_current_page ($page);
3235 $self->emit (page_changed => $self->{multiplexer}{current});
3236}
3237
3238#############################################################################
3239
3240package CFClient::UI::Combobox;
3241
3242use utf8;
3243
3244our @ISA = CFClient::UI::Button::;
3245
3246sub new {
3247 my $class = shift;
3248
3249 my $self = $class->SUPER::new (
3250 options => [], # [value, title, longdesc], ...
3251 value => undef,
3252 @_,
3253 );
3254
3255 $self->_set_value ($self->{value});
3256
3257 $self
3258}
3259
3260sub invoke_button_down {
3261 my ($self, $ev) = @_;
3262
3263 my @menu_items;
3264
3265 for (@{ $self->{options} }) {
3266 my ($value, $title, $tooltip) = @$_;
3267
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 }
3270
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272}
3273
3274sub _set_value {
3275 my ($self, $value) = @_;
3276
3277 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3278 or return;
3279
3280 $self->{value} = $item->[0];
3281 $self->set_markup ("$item->[1] ⇓");
3282 $self->set_tooltip ($item->[2]);
3283}
3284
3285sub set_value {
3286 my ($self, $value) = @_;
3287
3288 return unless $self->{value} ne $value;
3289
3290 $self->_set_value ($value);
3291 $self->emit (changed => $value);
3292}
3293
3294#############################################################################
3295
3296package CFClient::UI::Statusbox;
3297
3298our @ISA = CFClient::UI::VBox::;
3299
3300sub new {
3301 my $class = shift;
3302
3303 my $self = $class->SUPER::new (
2885 fontsize => 0.8, 3304 fontsize => 0.8,
2886 @_, 3305 @_,
2887 ) 3306 );
3307
3308 Scalar::Util::weaken (my $this = $self);
3309
3310 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311
3312 $self
2888} 3313}
2889 3314
2890sub reorder { 3315sub reorder {
2891 my ($self) = @_; 3316 my ($self) = @_;
2892 my $NOW = time; 3317 my $NOW = Time::HiRes::time;
3318
3319 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} };
2893 3323
2894 while (my ($k, $v) = each %{ $self->{item} }) { 3324 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3325 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 } 3326 }
2897 3327
… …
2900 my @items = sort { 3330 my @items = sort {
2901 $a->{pri} <=> $b->{pri} 3331 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id} 3332 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} }; 3333 } values %{ $self->{item} };
2904 3334
3335 $self->{timer}->interval (1);
3336
2905 my $count = 10 + 1; 3337 my $count = 10 + 1;
2906 for my $item (@items) { 3338 for my $item (@items) {
2907 last unless --$count; 3339 last unless --$count;
2908 3340
2909 push @widgets, $item->{label} ||= do { 3341 my $label = $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all) 3342 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1 3343 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}" 3344 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text}; 3345 : $item->{text};
2914 3346
… …
2922 tooltip => $item->{tooltip}, 3354 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP, 3355 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67, 3356 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize}, 3357 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44, 3358 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg}, 3359 fg => [@{ $item->{fg} }],
2928 can_events => 1, 3360 can_events => 1,
2929 can_hover => 1 3361 can_hover => 1
2930 }; 3362 };
3363
3364 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3365 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3366 $label->update;
3367 $label->set_max_size (undef, $label->{req_h} * $diff)
3368 if $diff < 1;
3369 $self->{timer}->interval (1/30);
3370 } else {
3371 $label->{fg}[3] = $item->{fg}[3] || 1;
3372 }
3373
3374 push @widgets, $label;
2931 } 3375 }
2932 3376
2933 $self->clear; 3377 $self->clear;
2934 $self->SUPER::add (reverse @widgets); 3378 $self->SUPER::add (reverse @widgets);
2935} 3379}
… …
2940 $text =~ s/^\s+//; 3384 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//; 3385 $text =~ s/\s+$//;
2942 3386
2943 return unless $text; 3387 return unless $text;
2944 3388
2945 my $timeout = time + ((delete $arg{timeout}) || 60); 3389 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2946 3390
2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3391 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948 3392
2949 if (my $item = $self->{item}{$group}) { 3393 if (my $item = $self->{item}{$group}) {
2950 if ($item->{text} eq $text) { 3394 if ($item->{text} eq $text) {
2951 $item->{count}++; 3395 $item->{count}++;
2952 } else { 3396 } else {
2953 $item->{count} = 1; 3397 $item->{count} = 1;
2954 $item->{text} = $item->{tooltip} = $text; 3398 $item->{text} = $item->{tooltip} = $text;
2955 } 3399 }
2956 $item->{id} = ++$self->{id}; 3400 $item->{id} += 0.2;#d#
2957 $item->{timeout} = $timeout; 3401 $item->{timeout} = $timeout;
2958 delete $item->{label}; 3402 delete $item->{label};
2959 } else { 3403 } else {
2960 $self->{item}{$group} = { 3404 $self->{item}{$group} = {
2961 id => ++$self->{id}, 3405 id => ++$self->{id},
… …
2967 count => 1, 3411 count => 1,
2968 %arg, 3412 %arg,
2969 }; 3413 };
2970 } 3414 }
2971 3415
3416 $ROOT->on_refresh (reorder => sub {
2972 $self->reorder; 3417 $self->reorder;
3418 });
2973} 3419}
2974 3420
2975sub reconfigure { 3421sub reconfigure {
2976 my ($self) = @_; 3422 my ($self) = @_;
2977 3423
… …
2980 3426
2981 $self->reorder; 3427 $self->reorder;
2982 $self->SUPER::reconfigure; 3428 $self->SUPER::reconfigure;
2983} 3429}
2984 3430
3431sub destroy {
3432 my ($self) = @_;
3433
3434 $self->{timer}->cancel;
3435
3436 $self->SUPER::destroy;
3437}
3438
2985############################################################################# 3439#############################################################################
2986 3440
2987package CFClient::UI::Inventory; 3441package CFClient::UI::Inventory;
2988 3442
2989our @ISA = CFClient::UI::ScrolledWindow::; 3443our @ISA = CFClient::UI::ScrolledWindow::;
2990 3444
2991sub new { 3445sub new {
2992 my $class = shift; 3446 my $class = shift;
2993 3447
2994 my $self = $class->SUPER::new ( 3448 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2996 @_, 3450 @_,
2997 ); 3451 );
2998 3452
2999 $self 3453 $self
3000} 3454}
3001 3455
3002sub set_items { 3456sub set_items {
3003 my ($self, $items) = @_; 3457 my ($self, $items) = @_;
3004 3458
3005 $self->{scrolled}->clear; 3459 $self->{child}->clear;
3006 return unless $items; 3460 return unless $items;
3007 3461
3008 my @items = sort { 3462 my @items = sort {
3009 ($a->{type} <=> $b->{type}) 3463 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name}) 3464 or ($a->{name} cmp $b->{name})
3011 } @$items; 3465 } values %$items;
3012 3466
3013 $self->{real_items} = \@items; 3467 $self->{real_items} = \@items;
3014 3468
3015 my $row = 0; 3469 my $row = 0;
3016 for my $item (@items) { 3470 for my $item (@items) {
3017 CFClient::Item::update_widgets $item; 3471 CFClient::Item::update_widgets $item;
3018 3472
3019 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3473 $self->{child}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3474 $self->{child}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3475 $self->{child}->add (2, $row, $item->{weight_widget});
3022 3476
3023 $row++; 3477 $row++;
3024 } 3478 }
3025} 3479}
3026 3480
3027############################################################################# 3481#############################################################################
3028 3482
3029package CFClient::UI::BindEditor; 3483package CFClient::UI::SpellList;
3030 3484
3031our @ISA = CFClient::UI::FancyFrame::; 3485our @ISA = CFClient::UI::Table::;
3032 3486
3033sub new { 3487sub new {
3034 my $class = shift; 3488 my $class = shift;
3035 3489
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3490 my $self = $class->SUPER::new (
3491 binding => [],
3492 commands => [],
3493 @_,
3494 )
3495}
3037 3496
3038 $self->add (my $vb = new CFClient::UI::VBox); 3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3039 3498
3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3040 3509
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3510sub rebuild_spell_list {
3042 text => "start recording", 3511 my ($self) = @_;
3043 tooltip => "Start/Stops recording of actions." 3512
3044 ."All subsequent actions after the recording started will be captured." 3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3045 ."The actions are displayed after the record was stopped." 3514 $self->clear;
3046 ."To bind the action you have to click on the 'Bind' button", 3515
3047 on_activate => sub { 3516 return unless $::CONN;
3048 unless ($self->{recording}) { 3517
3049 $self->start; 3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3050 } else { 3545 } else {
3051 $self->stop; 3546 return 0;
3547 }
3548
3549 1
3052 } 3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3053 }); 3578 }
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 }); 3579 });
3139} 3580}
3140 3581
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3148
3149 $self->clear_command_list;
3150 $self->{recording} = 0;
3151 $self->{rec_btn}->set_text ("start recording");
3152
3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
3171
3172sub update_binding_widgets {
3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell { 3582sub add_spell {
3238 my ($self, $spell) = @_; 3583 my ($self, $spell) = @_;
3584
3239 $self->{spells}->{$spell->{name}} = $spell; 3585 $self->{spell}->{$spell->{name}} = $spell;
3240 3586 $self->rebuild_spell_list;
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268} 3587}
3269 3588
3270sub remove_spell { 3589sub remove_spell {
3271 my ($self, $spell) = @_; 3590 my ($self, $spell) = @_;
3591
3272 delete $self->{spells}->{$spell->{name}}; 3592 delete $self->{spell}->{$spell->{name}};
3273 $self->rebuild_spell_list; 3593 $self->rebuild_spell_list;
3274} 3594}
3275 3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3276############################################################################# 3603#############################################################################
3277 3604
3278package CFClient::UI::Root; 3605package CFClient::UI::Root;
3279 3606
3280our @ISA = CFClient::UI::Container::; 3607our @ISA = CFClient::UI::Container::;
3608
3609use List::Util qw(min max);
3281 3610
3282use CFClient::OpenGL; 3611use CFClient::OpenGL;
3283 3612
3284sub new { 3613sub new {
3285 my $class = shift; 3614 my $class = shift;
… …
3312 $coord = $max - $size if $coord > $max - $size; 3641 $coord = $max - $size if $coord > $max - $size;
3313 3642
3314 int $coord + 0.5 3643 int $coord + 0.5
3315} 3644}
3316 3645
3317sub size_allocate { 3646sub invoke_size_allocate {
3318 my ($self, $w, $h) = @_; 3647 my ($self, $w, $h) = @_;
3319 3648
3320 for my $child ($self->children) { 3649 for my $child ($self->children) {
3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3650 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3322 3651
… …
3326 $X = _to_pixel $X, $W, $self->{w}; 3655 $X = _to_pixel $X, $W, $self->{w};
3327 $Y = _to_pixel $Y, $H, $self->{h}; 3656 $Y = _to_pixel $Y, $H, $self->{h};
3328 3657
3329 $child->configure ($X, $Y, $W, $H); 3658 $child->configure ($X, $Y, $W, $H);
3330 } 3659 }
3660
3661 1
3331} 3662}
3332 3663
3333sub coord2local { 3664sub coord2local {
3334 my ($self, $x, $y) = @_; 3665 my ($self, $x, $y) = @_;
3335 3666
… …
3420 3751
3421 delete $queue{$widget+0}; 3752 delete $queue{$widget+0};
3422 3753
3423 my ($w, $h) = $widget->size_request; 3754 my ($w, $h) = $widget->size_request;
3424 3755
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3756 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3757 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3758
3759 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3760 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3427 3761
3428 $w = $widget->{force_w} if exists $widget->{force_w}; 3762 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h}; 3763 $h = $widget->{force_h} if exists $widget->{force_h};
3430 3764
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3765 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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