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.207 by elmex, Mon May 15 18:23:33 2006 UTC vs.
Revision 1.237 by root, Thu May 25 21:36:45 2006 UTC

… …
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51} 51}
52 52
53# class methods for events 53# class methods for events
54sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 56 if $FOCUS;
57} 57}
58 58
59sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 61 if $FOCUS;
62} 62}
63 63
64sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
65 my ($ev) = @_; 65 my ($ev) = @_;
… …
74 check_tooltip; 74 check_tooltip;
75 } 75 }
76 76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 78
79 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 81}
84 82
85sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
86 my ($ev) = @_; 84 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
88 86
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 88
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 90
93 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 93
98 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 96 $grab->update if $grab;
101 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 114
119 check_tooltip; 115 check_tooltip;
120 } 116 }
121 117
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 119 if $HOVER;
126} 120}
127 121
128# convert position array to integers 122# convert position array to integers
129sub harmonize { 123sub harmonize {
130 my ($vals) = @_; 124 my ($vals) = @_;
… …
136 $rem += $_ - $i; 130 $rem += $_ - $i;
137 $_ = $i; 131 $_ = $i;
138 } 132 }
139} 133}
140 134
135sub full_refresh {
136 # make a copy, otherwise for complains about freed values.
137 my @widgets = values %WIDGET;
138
139 $_->update
140 for @widgets;
141}
142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
141# call when resolution changes etc. 151# call when resolution changes etc.
142sub rescale_widgets { 152sub rescale_widgets {
143 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
144 154
145 for my $widget (values %WIDGET) { 155 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 } 165 }
156
157 $widget->reconfigure;
158 } 166 }
167
168 reconfigure_widgets;
159} 169}
160 170
161############################################################################# 171#############################################################################
162 172
163package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
195 %$self = (); 205 %$self = ();
196} 206}
197 207
198sub show { 208sub show {
199 my ($self) = @_; 209 my ($self) = @_;
200
201 return if $self->{parent}; 210 return if $self->{parent};
202 211
203 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
204} 213}
205 214
206sub hide { 215sub show_centered {
207 my ($self) = @_; 216 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220
221 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 },
225 );
226}
227
228sub set_invisible {
229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
208 234
209 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
211 248
212 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
213 if $self->{parent}; 250 if $self->{parent};
214} 251}
215 252
… …
282 319
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
285} 322}
286 323
324sub set_tooltip {
325 my ($self, $tooltip) = @_;
326
327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
330 return if $self->{tooltip} eq $tooltip;
331
332 $self->{tooltip} = $tooltip;
333
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip;
337 }
338}
339
287# translate global coordinates to local coordinate system 340# translate global coordinates to local coordinate system
288sub coord2local { 341sub coord2local {
289 my ($self, $x, $y) = @_; 342 my ($self, $x, $y) = @_;
290 343
291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
… …
304 return if $FOCUS == $self; 357 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
306 359
307 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
308 361
309 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
310 363
311 $focus->update if $focus; 364 $focus->update if $focus;
312 $FOCUS->update; 365 $FOCUS->update;
313} 366}
314 367
… …
317 370
318 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
319 372
320 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
321 374
322 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
323 376
324 $focus->update if $focus; #? 377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS;
325} 381}
326 382
327sub mouse_motion { } 383sub mouse_motion { }
328sub button_up { } 384sub button_up { }
329sub key_down { } 385sub key_down { }
330sub key_up { } 386sub key_up { }
331 387
332sub button_down { 388sub button_down {
333 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
334 390
335 $self->focus_in; 391 $self->focus_in;
… …
369 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
370 glPushMatrix; 426 glPushMatrix;
371 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0; 430 glVertex 0 , 0;
375 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
376 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
377 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
378 glEnd; 434 glEnd;
379 glPopMatrix; 435 glPopMatrix;
380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381 } 437 }
382} 438}
… …
402sub set_parent { 458sub set_parent {
403 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
404 460
405 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
406 462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
407 # TODO: req_w _does_change after ->reconfigure 466 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size 467 $self->check_size
409 unless exists $self->{req_w}; 468 unless exists $self->{req_w};
469
470 $self->show;
410} 471}
411 472
412sub check_size { 473sub check_size {
413 my ($self, $forced) = @_; 474 my ($self, $forced) = @_;
414 475
… …
427 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
428 489
429 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
430} 491}
431 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
432sub emit { 499sub emit {
433 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
434 501
435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
436} 504}
437 505
438sub DESTROY { 506sub DESTROY {
439 my ($self) = @_; 507 my ($self) = @_;
440 508
… …
455 my $class = shift; 523 my $class = shift;
456 524
457 # range [value, low, high, page] 525 # range [value, low, high, page]
458 526
459 $class->SUPER::new ( 527 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 528 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 529 #active_bg => [1, 1, 1, 0.5],
462 @_ 530 @_
463 ) 531 )
464} 532}
465 533
466sub _draw { 534sub _draw {
467 my ($self) = @_; 535 my ($self) = @_;
468 536
537 my $color = $FOCUS == $self && $self->{active_bg}
538 ? $self->{active_bg}
539 : $self->{bg};
540
541 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 542 my ($w, $h) = @$self{qw(w h)};
470 543
471 glEnable GL_BLEND; 544 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 546 glColor @$color;
474 547
475 glBegin GL_QUADS; 548 glBegin GL_QUADS;
476 glVertex 0 , 0; 549 glVertex 0 , 0;
477 glVertex 0 , $h; 550 glVertex 0 , $h;
478 glVertex $w, $h; 551 glVertex $w, $h;
479 glVertex $w, 0; 552 glVertex $w, 0;
480 glEnd; 553 glEnd;
481 554
482 glDisable GL_BLEND; 555 glDisable GL_BLEND;
556 }
483} 557}
484 558
485############################################################################# 559#############################################################################
486 560
487package CFClient::UI::Empty; 561package CFClient::UI::Empty;
… …
547 delete $child->{parent}; 621 delete $child->{parent};
548 $child->hide; 622 $child->hide;
549 623
550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551 625
552 $self->check_size; 626 $self->check_size (1);
553 $self->update; 627 $self->update;
554} 628}
555 629
556sub clear { 630sub clear {
557 my ($self) = @_; 631 my ($self) = @_;
… …
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0; 746 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 747 glClear GL_COLOR_BUFFER_BIT;
674 748
675 $self->_render; 749 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 750 };
684} 751}
685 752
686sub _draw { 753sub _draw {
687 my ($self) = @_; 754 my ($self) = @_;
… …
691 my $tex = $self->{texture} 758 my $tex = $self->{texture}
692 or return; 759 or return;
693 760
694 glEnable GL_TEXTURE_2D; 761 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 763 glColor 1, 1, 1, 1;
697 764
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 766
700 glDisable GL_TEXTURE_2D; 767 glDisable GL_TEXTURE_2D;
701} 768}
… …
704 771
705package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
706 773
707our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
708 775
776sub new {
777 my $class = shift;
778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
709sub size_request { 786sub size_request {
710 my ($self) = @_; 787 my ($self) = @_;
711 788
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 790
715 @$self{qw(child_w child_h)} 791 @$self{qw(child_w child_h)}
716} 792}
717 793
718sub size_allocate { 794sub size_allocate {
719 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
720 796
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
800 $self->child->configure (0, 0, $w, $h);
721 $self->update; 801 $self->update;
722} 802}
723 803
724sub set_offset { 804sub set_offset {
725 my ($self, $x, $y) = @_; 805 my ($self, $x, $y) = @_;
… …
779 859
780 my $slider = new CFClient::UI::Slider 860 my $slider = new CFClient::UI::Slider
781 vertical => 1, 861 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 862 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 863 connect_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 864 $self->{vp}->set_offset (0, $_[1]);
785 }, 865 },
786 ; 866 ;
787 867
788 $self = $class->SUPER::new ( 868 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 869 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 870 slider => $slider,
791 @_, 871 @_,
792 ); 872 );
793 873
794 $self->{vp}->add ($self->{scrolled}); 874 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp}); 875 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 876 $self->add ($self->{slider});
797 877
798 $self 878 $self
879}
880
881sub size_allocate {
882 my ($self, $w, $h) = @_;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 my $child = $self->{vp}->child;
887 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799} 888}
800 889
801#TODO# update range on size_allocate depending on child 890#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 891# update viewport offset on scroll
803 892
… …
857 my $class = shift; 946 my $class = shift;
858 947
859 # TODO: user_x, user_y, overwrite moveto? 948 # TODO: user_x, user_y, overwrite moveto?
860 949
861 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 951 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 952 border_bg => [1, 1, 1, 1],
864 border => 0.6, 953 border => 0.6,
865 toplevel => 1, 954 is_toplevel => 1,
866 can_events => 1, 955 can_events => 1,
867 @_ 956 @_
868 ); 957 );
869 958
870 $self->{title} &&= new CFClient::UI::Label 959 $self->{title} &&= new CFClient::UI::Label
871 align => 0, 960 align => 0,
… …
895 my ($self, $w, $h) = @_; 984 my ($self, $w, $h) = @_;
896 985
897 $h -= List::Util::max 0, $self->border * 2; 986 $h -= List::Util::max 0, $self->border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 987 $w -= List::Util::max 0, $self->border * 2;
899 988
900 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 989 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901 if $self->{title}; 990 if $self->{title};
902 991
903 $self->child->configure ($self->border, $self->border, $w, $h); 992 $self->child->configure ($self->border, $self->border, $w, $h);
904} 993}
905 994
… …
1011sub new { 1100sub new {
1012 my $class = shift; 1101 my $class = shift;
1013 1102
1014 $class->SUPER::new ( 1103 $class->SUPER::new (
1015 col_expand => [], 1104 col_expand => [],
1016 @_ 1105 @_,
1017 ) 1106 )
1107}
1108
1109sub children {
1110 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018} 1111}
1019 1112
1020sub add { 1113sub add {
1021 my ($self, $x, $y, $child) = @_; 1114 my ($self, $x, $y, $child) = @_;
1022 1115
1023 $child->set_parent ($self); 1116 $child->set_parent ($self);
1024 $self->{children}[$y][$x] = $child; 1117 $self->{children}[$y][$x] = $child;
1025 1118
1026 $child->check_size; 1119 $self->check_size (1);
1027} 1120}
1028 1121
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
1033# TODO: move to container class maybe? send childs a signal on removal? 1122# TODO: move to container class maybe? send children a signal on removal?
1034sub clear { 1123sub clear {
1035 my ($self) = @_; 1124 my ($self) = @_;
1036 1125
1037 my @children = $self->children; 1126 my @children = $self->children;
1038 delete $self->{children}; 1127 delete $self->{children};
… …
1040 for (@children) { 1129 for (@children) {
1041 delete $_->{parent}; 1130 delete $_->{parent};
1042 $_->hide; 1131 $_->hide;
1043 } 1132 }
1044 1133
1134 $self->check_size (1);
1045 $self->update; 1135 $self->update;
1046} 1136}
1047 1137
1048sub get_wh { 1138sub get_wh {
1049 my ($self) = @_; 1139 my ($self) = @_;
… …
1266 1356
1267############################################################################# 1357#############################################################################
1268 1358
1269package CFClient::UI::Label; 1359package CFClient::UI::Label;
1270 1360
1271our @ISA = CFClient::UI::Base::; 1361our @ISA = CFClient::UI::DrawBG::;
1272 1362
1273use CFClient::OpenGL; 1363use CFClient::OpenGL;
1274 1364
1275sub new { 1365sub new {
1276 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1277 1367
1278 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1369 fg => [1, 1, 1],
1370 #bg => none
1371 #active_bg => none
1280 #font => default_font 1372 #font => default_font
1281 #text => initial text 1373 #text => initial text
1282 #markup => initial narkup 1374 #markup => initial narkup
1375 #max_w => maximum pixel width
1376 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1377 layout => (new CFClient::Layout),
1284 fontsize => 1, 1378 fontsize => 1,
1285 align => -1, 1379 align => -1,
1286 valign => -1, 1380 valign => -1,
1287 padding => 2, 1381 padding => 2,
… …
1302 } 1396 }
1303 1397
1304 $self 1398 $self
1305} 1399}
1306 1400
1307sub escape { 1401sub escape($) {
1308 local $_ = $_[1]; 1402 local $_ = $_[0];
1309 1403
1310 s/&/&amp;/g; 1404 s/&/&amp;/g;
1311 s/>/&gt;/g; 1405 s/>/&gt;/g;
1312 s/</&lt;/g; 1406 s/</&lt;/g;
1313 1407
1314 $_[1] 1408 $_
1315} 1409}
1316 1410
1317sub update { 1411sub update {
1318 my ($self) = @_; 1412 my ($self) = @_;
1319 1413
… …
1352sub size_request { 1446sub size_request {
1353 my ($self) = @_; 1447 my ($self) = @_;
1354 1448
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1449 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1450 $self->{layout}->set_width ($self->{max_w} || -1);
1451 $self->{layout}->set_ellipsise ($self->{ellipsise});
1452 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1453 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1454
1359 my ($w, $h) = $self->{layout}->size; 1455 my ($w, $h) = $self->{layout}->size;
1360 1456
1361 if (exists $self->{template}) { 1457 if (exists $self->{template}) {
… …
1391} 1487}
1392 1488
1393sub _draw { 1489sub _draw {
1394 my ($self) = @_; 1490 my ($self) = @_;
1395 1491
1492 $self->SUPER::_draw; # draw background, if applicable
1493
1396 my $tex = $self->{texture} ||= do { 1494 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1495 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1496 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1497 $self->{layout}->set_width ($self->{w});
1498 $self->{layout}->set_ellipsise ($self->{ellipsise});
1499 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1501
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1502 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1503
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1504 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1505 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5; 1506 : ($self->{w} - $tex->{w}) * 0.5);
1407 1507
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1508 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1509 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5; 1510 : ($self->{h} - $tex->{h}) * 0.5);
1411 1511
1412 $tex 1512 $tex
1413 }; 1513 };
1414 1514
1415 glEnable GL_TEXTURE_2D; 1515 glEnable GL_TEXTURE_2D;
… …
1443 active_fg => [0, 0, 0], 1543 active_fg => [0, 0, 0],
1444 can_hover => 1, 1544 can_hover => 1,
1445 can_focus => 1, 1545 can_focus => 1,
1446 valign => 0, 1546 valign => 0,
1447 can_events => 1, 1547 can_events => 1,
1548 #text => ...
1448 @_ 1549 @_
1449 ) 1550 )
1450} 1551}
1451 1552
1452sub _set_text { 1553sub _set_text {
… …
1462 $self->{text} = $text; 1563 $self->{text} = $text;
1463 1564
1464 $text =~ s/./*/g if $self->{hidden}; 1565 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1566 $self->{layout}->set_text ("$text ");
1466 1567
1467 $self->emit (changed => $self->{text}); 1568 $self->_emit (changed => $self->{text});
1468} 1569}
1469 1570
1470sub set_text { 1571sub set_text {
1471 my ($self, $text) = @_; 1572 my ($self, $text) = @_;
1472 1573
1473 $self->{cursor} = length $text; 1574 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1575 $self->_set_text ($text);
1576 $self->update;
1475 $self->check_size; 1577 $self->check_size;
1476 $self->update;
1477} 1578}
1478 1579
1479sub get_text { 1580sub get_text {
1480 $_[0]{text} 1581 $_[0]{text}
1481} 1582}
… …
1484 my ($self) = @_; 1585 my ($self) = @_;
1485 1586
1486 my ($w, $h) = $self->SUPER::size_request; 1587 my ($w, $h) = $self->SUPER::size_request;
1487 1588
1488 ($w + 1, $h) # add 1 for cursor 1589 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495} 1590}
1496 1591
1497sub key_down { 1592sub key_down {
1498 my ($self, $ev) = @_; 1593 my ($self, $ev) = @_;
1499 1594
… …
1514 } elsif ($sym == CFClient::SDLK_HOME) { 1609 } elsif ($sym == CFClient::SDLK_HOME) {
1515 $self->{cursor} = 0; 1610 $self->{cursor} = 0;
1516 } elsif ($sym == CFClient::SDLK_END) { 1611 } elsif ($sym == CFClient::SDLK_END) {
1517 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1613 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1614 $self->_emit ('escape');
1520 } elsif ($uni) { 1615 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1616 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1617 }
1523 1618
1524 $self->_set_text ($text); 1619 $self->_set_text ($text);
1525 $self->update; 1620 $self->update;
1621 $self->check_size;
1526} 1622}
1527 1623
1528sub focus_in { 1624sub focus_in {
1529 my ($self) = @_; 1625 my ($self) = @_;
1530 1626
… …
1610 if ($sym == 13) { 1706 if ($sym == 13) {
1611 unshift @{$self->{history}}, 1707 unshift @{$self->{history}},
1612 my $txt = $self->get_text; 1708 my $txt = $self->get_text;
1613 $self->{history_pointer} = -1; 1709 $self->{history_pointer} = -1;
1614 $self->{history_saveback} = ''; 1710 $self->{history_saveback} = '';
1615 $self->emit (activate => $txt); 1711 $self->_emit (activate => $txt);
1616 $self->update; 1712 $self->update;
1617 1713
1618 } elsif ($sym == CFClient::SDLK_UP) { 1714 } elsif ($sym == CFClient::SDLK_UP) {
1619 if ($self->{history_pointer} < 0) { 1715 if ($self->{history_pointer} < 0) {
1620 $self->{history_saveback} = $self->get_text; 1716 $self->{history_saveback} = $self->get_text;
… …
1659 my $class = shift; 1755 my $class = shift;
1660 1756
1661 $class->SUPER::new ( 1757 $class->SUPER::new (
1662 padding => 4, 1758 padding => 4,
1663 fg => [1, 1, 1], 1759 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 1760 active_fg => [0, 0, 1],
1666 can_hover => 1, 1761 can_hover => 1,
1667 align => 0, 1762 align => 0,
1668 valign => 0, 1763 valign => 0,
1669 can_events => 1, 1764 can_events => 1,
1670 @_ 1765 @_
1671 ) 1766 )
1672} 1767}
1673 1768
1769sub activate { }
1770
1674sub button_up { 1771sub button_up {
1675 my ($self, $ev, $x, $y) = @_; 1772 my ($self, $ev, $x, $y) = @_;
1676 1773
1774 $self->emit ("activate")
1677 if ($x >= 0 && $x < $self->{w} 1775 if $x >= 0 && $x < $self->{w}
1678 && $y >= 0 && $y < $self->{h}) { 1776 && $y >= 0 && $y < $self->{h};
1679 $self->emit ("activate");
1680 }
1681} 1777}
1682 1778
1683sub _draw { 1779sub _draw {
1684 my ($self) = @_; 1780 my ($self) = @_;
1685 1781
… …
1717 1813
1718 $class->SUPER::new ( 1814 $class->SUPER::new (
1719 padding => 2, 1815 padding => 2,
1720 fg => [1, 1, 1], 1816 fg => [1, 1, 1],
1721 active_fg => [1, 1, 0], 1817 active_fg => [1, 1, 0],
1818 bg => [0, 0, 0, 0.2],
1819 active_bg => [1, 1, 1, 0.5],
1722 state => 0, 1820 state => 0,
1723 can_hover => 1, 1821 can_hover => 1,
1724 @_ 1822 @_
1725 ) 1823 )
1726} 1824}
… …
1735 my ($self, $ev, $x, $y) = @_; 1833 my ($self, $ev, $x, $y) = @_;
1736 1834
1737 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1738 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1739 $self->{state} = !$self->{state}; 1837 $self->{state} = !$self->{state};
1740 $self->emit (changed => $self->{state}); 1838 $self->_emit (changed => $self->{state});
1741 } 1839 }
1742} 1840}
1743 1841
1744sub _draw { 1842sub _draw {
1745 my ($self) = @_; 1843 my ($self) = @_;
… …
2018 # TODO: req_w/h are wrong with vertical 2116 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2117 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2118 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2119 fg => [1, 1, 1],
2022 active_fg => [0, 0, 0], 2120 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5],
2023 range => [0, 0, 100, 10], 2123 range => [0, 0, 100, 10, 0],
2024 req_w => $::WIDTH / 80, 2124 req_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2125 req_h => $::WIDTH / 80,
2026 vertical => 0, 2126 vertical => 0,
2027 can_hover => 1, 2127 can_hover => 1,
2028 inner_pad => .05, 2128 inner_pad => 0.02,
2029 @_ 2129 @_
2030 ); 2130 );
2031 2131
2032 $self->set_value ($self->{range}[0]); 2132 $self->set_value ($self->{range}[0]);
2033 $self->update; 2133 $self->update;
2034 2134
2035 $self 2135 $self
2036} 2136}
2037 2137
2138sub set_range {
2139 my ($self, $range) = @_;
2140
2141 $self->{range} = $range;
2142
2143 $self->update;
2144}
2145
2038sub set_value { 2146sub set_value {
2039 my ($self, $value) = @_; 2147 my ($self, $value) = @_;
2040 2148
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2149 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042 2150
2043 $hi = $lo + 1 if $hi <= $lo; 2151 $hi = $lo + 1 if $hi <= $lo;
2044 2152
2153 $page = $hi - $lo if $page > $hi - $lo;
2154
2045 $value = $lo if $value < $lo; 2155 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi; 2156 $value = $hi - $page if $value > $hi - $page;
2047 2157
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2158 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit; 2159 if $unit;
2050 2160
2051 $page = $hi - $lo if $page > $hi - $lo;
2052
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2161 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054 2162
2055 if ($value != $old_value) { 2163 if ($value != $old_value) {
2056 $self->emit (changed => $value); 2164 $self->_emit (changed => $value);
2057 $self->update; 2165 $self->update;
2058 } 2166 }
2059} 2167}
2060 2168
2061sub size_request { 2169sub size_request {
… …
2069 2177
2070sub button_down { 2178sub button_down {
2071 my ($self, $ev, $x, $y) = @_; 2179 my ($self, $ev, $x, $y) = @_;
2072 2180
2073 $self->SUPER::button_down ($ev, $x, $y); 2181 $self->SUPER::button_down ($ev, $x, $y);
2182
2183 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184
2074 $self->mouse_motion ($ev, $x, $y); 2185 $self->mouse_motion ($ev, $x, $y);
2075} 2186}
2076 2187
2077sub mouse_motion { 2188sub mouse_motion {
2078 my ($self, $ev, $x, $y) = @_; 2189 my ($self, $ev, $x, $y) = @_;
… …
2080 if ($GRAB == $self) { 2191 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2192 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082 2193
2083 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2194 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084 2195
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086 2197
2087 $self->set_value ($x * ($hi - $lo) + $lo); 2198 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2088 } 2199 }
2089} 2200}
2090 2201
2091sub update { 2202sub update {
2092 my ($self) = @_; 2203 my ($self) = @_;
2093 2204
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2205 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095 $self->set_value ($self->{range}[0]); 2206 $self->set_value ($self->{range}[0]);
2096 2207
2097 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2208 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100;
2098 2210
2099 my $inner_w = 1 - 2 * $self->{inner_pad}; 2211 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100 2212
2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2213 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2214 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2102 2215
2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2216 $value = ($value - $lo) / $range;
2104 $value = $self->{scale} * ($value - $lo); 2217 $value = $value * $self->{scale} + $self->{offset};
2105 2218
2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value; 2219 $self->{knob_x} = $value - $knob_w * 0.5;
2112 $self->{knob_w} = $page; 2220 $self->{knob_w} = $knob_w;
2113 }); 2221 });
2114 2222
2115 $self->SUPER::update; 2223 $self->SUPER::update;
2116} 2224}
2117 2225
… …
2123 glScale $self->{w}, $self->{h}; 2231 glScale $self->{w}, $self->{h};
2124 2232
2125 if ($self->{vertical}) { 2233 if ($self->{vertical}) {
2126 # draw a vertical slider like a rotated horizontal slider 2234 # draw a vertical slider like a rotated horizontal slider
2127 2235
2236 glTranslate 1, 0, 0;
2128 glRotate 90, 0, 0, 1; 2237 glRotate 90, 0, 0, 1;
2129 glTranslate 0, 1, 0;
2130 } 2238 }
2131 2239
2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2240 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2241 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134 2242
… …
2141 # draw handle 2249 # draw handle
2142 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2250 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2143 2251
2144 glDisable GL_TEXTURE_2D; 2252 glDisable GL_TEXTURE_2D;
2145} 2253}
2254
2255#############################################################################
2256
2257package CFClient::UI::ValSlider;
2258
2259our @ISA = CFClient::UI::HBox::;
2260
2261sub new {
2262 my ($class, %arg) = @_;
2263
2264 my $range = delete $arg{range};
2265
2266 my $self = $class->SUPER::new (
2267 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2268 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2269 to_value => sub { shift },
2270 from_value => sub { shift },
2271 %arg,
2272 );
2273
2274 $self->{slider}->connect (changed => sub {
2275 my ($self, $value) = @_;
2276 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2277 $self->{parent}->emit (changed => $value);
2278 });
2279
2280# $self->{entry}->connect (changed => sub {
2281# my ($self, $value) = @_;
2282# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2283# $self->{parent}->emit (changed => $value);
2284# });
2285
2286 $self->add ($self->{slider}, $self->{entry});
2287
2288 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2289
2290 $self
2291}
2292
2293sub set_range { shift->{slider}->set_range (@_) }
2294sub set_value { shift->{slider}->set_value (@_) }
2146 2295
2147############################################################################# 2296#############################################################################
2148 2297
2149package CFClient::UI::TextView; 2298package CFClient::UI::TextView;
2150 2299
… …
2180 2329
2181 $self->{fontsize} = $fontsize; 2330 $self->{fontsize} = $fontsize;
2182 $self->reflow; 2331 $self->reflow;
2183} 2332}
2184 2333
2185sub text_height {
2186 my ($self, $text) = @_;
2187
2188 my $layout = $self->{layout};
2189
2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2191 $layout->set_width ($self->{children}[0]{w});
2192 $layout->set_markup ($text);
2193
2194 ($layout->size)[1]
2195}
2196
2197sub reflow {
2198 my ($self) = @_;
2199
2200 $self->{need_reflow}++;
2201 $self->update;
2202}
2203
2204sub size_allocate { 2334sub size_allocate {
2205 my ($self, $w, $h) = @_; 2335 my ($self, $w, $h) = @_;
2206 2336
2207 $self->SUPER::size_allocate ($w, $h); 2337 $self->SUPER::size_allocate ($w, $h);
2208 2338
… …
2211 $self->{layout}->set_width ($self->{children}[0]{w}); 2341 $self->{layout}->set_width ($self->{children}[0]{w});
2212 2342
2213 $self->reflow; 2343 $self->reflow;
2214} 2344}
2215 2345
2346sub text_size {
2347 my ($self, $text, $indent) = @_;
2348
2349 my $layout = $self->{layout};
2350
2351 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2352 $layout->set_width ($self->{children}[0]{w} - $indent);
2353 $layout->set_markup ($text);
2354
2355 $layout->size
2356}
2357
2358sub reflow {
2359 my ($self) = @_;
2360
2361 $self->{need_reflow}++;
2362 $self->update;
2363}
2364
2365sub set_offset {
2366 my ($self, $offset) = @_;
2367
2368 # todo: base offset on lines or so, not on pixels
2369 $self->{children}[1]->set_value ($offset);
2370}
2371
2372sub clear {
2373 my ($self) = @_;
2374
2375 $self->{par} = [];
2376 $self->{height} = 0;
2377 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2378}
2379
2216sub add_paragraph { 2380sub add_paragraph {
2217 my ($self, $color, $text) = @_; 2381 my ($self, $color, $text, $indent) = @_;
2218 2382
2219 #TODO: intelligently "reformat" paragraph 2383 for my $line (split /\n/, $text) {
2220 2384 my ($w, $h) = $self->text_size ($line);
2221 my $height = $self->text_height ($text);
2222
2223 $self->{height} += $height; 2385 $self->{height} += $h;
2386 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2387 }
2224 2388
2225 push @{$self->{par}}, [$height, $color, $text];
2226
2227 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2389 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2228 $self->{children}[1]->update;
2229} 2390}
2230 2391
2231sub update { 2392sub update {
2232 my ($self) = @_; 2393 my ($self) = @_;
2233 2394
… …
2236 return unless $self->{h} > 0; 2397 return unless $self->{h} > 0;
2237 2398
2238 delete $self->{texture}; 2399 delete $self->{texture};
2239 2400
2240 $ROOT->on_post_alloc ($self, sub { 2401 $ROOT->on_post_alloc ($self, sub {
2402 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2403
2241 if (delete $self->{need_reflow}) { 2404 if (delete $self->{need_reflow}) {
2242 my $height = 0; 2405 my $height = 0;
2243 2406
2244 $height += $_->[0] = $self->text_height ($_->[2]) 2407 my $layout = $self->{layout};
2408
2409 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2410
2245 for @{$self->{par}}; 2411 for (@{$self->{par}}) {
2412 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2413 $layout->set_width ($W - $_->[3]);
2414 $layout->set_markup ($_->[4]);
2415 my ($w, $h) = $layout->size;
2416 $_->[0] = $w + $_->[3];
2417 $_->[1] = $h;
2418 }
2419
2420 $height += $_->[1];
2421 }
2246 2422
2247 $self->{height} = $height; 2423 $self->{height} = $height;
2248 2424
2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2425 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2250 2426
2251 delete $self->{texture}; 2427 delete $self->{texture};
2252 } 2428 }
2253 2429
2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2255 glClearColor 0, 0, 0, 0; 2431 glClearColor 0.5, 0.5, 0.5, 0;
2256 glClear GL_COLOR_BUFFER_BIT; 2432 glClear GL_COLOR_BUFFER_BIT;
2257 2433
2258 glEnable GL_TEXTURE_2D;
2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2260
2261 my $top = int $self->{children}[1]{range}[0]; 2434 my $top = int $self->{children}[1]{range}[0];
2262 2435
2263 my $y0 = $top; 2436 my $y0 = $top;
2264 my $y1 = $top + $self->{h}; 2437 my $y1 = $top + $H;
2265 2438
2266 my $y = 0; 2439 my $y = 0;
2267 2440
2268 my $layout = $self->{layout}; 2441 my $layout = $self->{layout};
2269 2442
2270 $layout->set_font ($self->{font}) if $self->{font}; 2443 $layout->set_font ($self->{font}) if $self->{font};
2271 2444
2445 glEnable GL_BLEND;
2446 #TODO# not correct in windows where rgba is forced off
2447 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2448
2272 for my $par (@{$self->{par}}) { 2449 for my $par (@{$self->{par}}) {
2273 my $h = $par->[0]; 2450 my $h = $par->[1];
2274 2451
2275 if ($y0 < $y + $h && $y < $y1) { 2452 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] }); 2453 $layout->set_foreground (@{ $par->[2] });
2454 $layout->set_width ($W - $par->[3]);
2277 $layout->set_markup ($par->[2]); 2455 $layout->set_markup ($par->[4]);
2278 2456
2279 my ($W, $H) = $layout->size; 2457 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2458
2459 glRasterPos $par->[3], $y - $y0;
2460 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2281 } 2461 }
2282 2462
2283 $y += $h; 2463 $y += $h;
2284 } 2464 }
2285 2465
2286 glDisable GL_TEXTURE_2D; 2466 glDisable GL_BLEND;
2287 }; 2467 };
2288 }); 2468 });
2289} 2469}
2290 2470
2291sub _draw { 2471sub _draw {
2292 my ($self) = @_; 2472 my ($self) = @_;
2293 2473
2294 glEnable GL_TEXTURE_2D; 2474 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2476 glColor 1, 1, 1, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2477 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2298 glDisable GL_TEXTURE_2D; 2478 glDisable GL_TEXTURE_2D;
2299 2479
2300 $self->{children}[1]->draw; 2480 $self->{children}[1]->draw;
2301 2481
2302} 2482}
… …
2371 2551
2372 # TODO: use animation 2552 # TODO: use animation
2373 if ($self->{state} = !$self->{state}) { 2553 if ($self->{state} = !$self->{state}) {
2374 $CFClient::UI::ROOT->add ($self->{other}); 2554 $CFClient::UI::ROOT->add ($self->{other});
2375 $self->{other}->move ($self->coord2global (0, $self->{h})); 2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2376 $self->emit ("open"); 2556 $self->_emit ("open");
2377 } else { 2557 } else {
2378 $CFClient::UI::ROOT->remove ($self->{other}); 2558 $CFClient::UI::ROOT->remove ($self->{other});
2379 $self->emit ("close"); 2559 $self->_emit ("close");
2380 } 2560 }
2381 2561
2382 $self->emit (changed => $self->{state}); 2562 $self->_emit (changed => $self->{state});
2383} 2563}
2384 2564
2385############################################################################# 2565#############################################################################
2386 2566
2387package CFClient::UI::Tooltip; 2567package CFClient::UI::Tooltip;
… …
2401 2581
2402sub set_tooltip_from { 2582sub set_tooltip_from {
2403 my ($self, $widget) = @_; 2583 my ($self, $widget) = @_;
2404 2584
2405 $self->add (new CFClient::UI::Label 2585 $self->add (new CFClient::UI::Label
2406 markup => $widget->{tooltip}, 2586 markup => $widget->{tooltip},
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2587 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8, 2588 fontsize => 0.8,
2409 fg => [0, 0, 0, 1], 2589 fg => [0, 0, 0, 1],
2590 ellipsise => 0,
2410 font => ($widget->{tooltip_font} || $::FONT_PROP), 2591 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 ); 2592 );
2412} 2593}
2413 2594
2414sub size_request { 2595sub size_request {
2415 my ($self) = @_; 2596 my ($self) = @_;
… …
2461use CFClient::OpenGL; 2642use CFClient::OpenGL;
2462 2643
2463sub new { 2644sub new {
2464 my $class = shift; 2645 my $class = shift;
2465 2646
2466 $class->SUPER::new ( 2647 my $self = $class->SUPER::new (
2467 aspect => 1, 2648 aspect => 1,
2649 can_events => 0,
2468 @_, 2650 @_,
2469 ) 2651 );
2652
2653 if ($self->{anim} && $self->{animspeed}) {
2654 Scalar::Util::weaken (my $widget = $self);
2655
2656 $self->{timer} = Event->timer (
2657 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2658 hard => 1,
2659 interval => $self->{animspeed},
2660 cb => sub {
2661 ++$widget->{frame};
2662 $widget->update;
2663 },
2664 );
2665 }
2666
2667 $self
2470} 2668}
2471 2669
2472sub size_request { 2670sub size_request {
2473 (32, 8) 2671 (32, 8)
2474} 2672}
2475 2673
2674sub update {
2675 my ($self) = @_;
2676
2677 return unless $self->{visible};
2678
2679 $self->SUPER::update;
2680}
2681
2476sub _draw { 2682sub _draw {
2477 my ($self) = @_; 2683 my ($self) = @_;
2478 2684
2479 return unless $::CONN;#d# manage and cache textures differently 2685 return unless $::CONN;
2686
2687 my $face;
2688
2689 if ($self->{frame}) {
2690 my $anim = $::CONN->{anim}[$self->{anim}];
2691
2692 $face = $anim->[ $self->{frame} % @$anim ]
2693 if $anim && @$anim;
2694 }
2695
2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2696 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481 2697
2482 # TODO animation
2483 if ($tex) { 2698 if ($tex) {
2484 glEnable GL_TEXTURE_2D; 2699 glEnable GL_TEXTURE_2D;
2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486 glColor 1, 1, 1, 1; 2701 glColor 1, 1, 1, 1;
2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2702 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488 glDisable GL_TEXTURE_2D; 2703 glDisable GL_TEXTURE_2D;
2489 } 2704 }
2490} 2705}
2491 2706
2707sub DESTROY {
2708 my ($self) = @_;
2709
2710 $self->{timer}->cancel
2711 if $self->{timer};
2712
2713 $self->SUPER::DESTROY;
2714}
2715
2492############################################################################# 2716#############################################################################
2493 2717
2494package CFClient::UI::InventoryItem; 2718package CFClient::UI::Inventory;
2495 2719
2496our @ISA = CFClient::UI::HBox::; 2720our @ISA = CFClient::UI::ScrolledWindow::;
2497 2721
2498sub new { 2722sub new {
2499 my $class = shift; 2723 my $class = shift;
2500 2724
2501 my %args = @_;
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2
2506 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}";
2508
2509 $item->{flags} & Crossfire::Protocol::F_OPEN
2510 and $desc .= " (open)";
2511 $item->{flags} & Crossfire::Protocol::F_APPLIED
2512 and $desc .= " (applied)";
2513 $item->{flags} & Crossfire::Protocol::F_UNPAID
2514 and $desc .= " (unpaid)";
2515 $item->{flags} & Crossfire::Protocol::F_MAGIC
2516 and $desc .= " (magic)";
2517 $item->{flags} & Crossfire::Protocol::F_CURSED
2518 and $desc .= " (cursed)";
2519 $item->{flags} & Crossfire::Protocol::F_DAMNED
2520 and $desc .= " (damned)";
2521 $item->{flags} & Crossfire::Protocol::F_LOCKED
2522 and $desc .= " *";
2523
2524 my $self = $class->SUPER::new ( 2725 my $self = $class->SUPER::new (
2525 can_hover => 1, 2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2526 can_events => 1,
2527 tooltip => (CFClient::UI::Label->escape ($desc)
2528 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2529 connect_button_down => sub {
2530 my ($self, $ev, $x, $y) = @_;
2531
2532 # todo: maybe put examine on 1? but should just be a tooltip :(
2533 if ($ev->{button} == 1) {
2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2535 } elsif ($ev->{button} == 2) {
2536 $::CONN->send ("apply $item->{tag}");
2537 } elsif ($ev->{button} == 3) {
2538 my @menu_items = (
2539 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2543 [
2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2546 ],
2547 );
2548
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2550 }
2551
2552 1
2553 },
2554 %args
2555 );
2556
2557 $self->add (new CFClient::UI::Face
2558 can_events => 0,
2559 face => $item->{face},
2560 anim => $item->{anim},
2561 animspeed => $item->{animspeed},
2562 );
2563
2564 $self->add (new CFClient::UI::Label
2565 can_events => 0,
2566 text => $desc,
2567 );
2568
2569 $self
2570}
2571
2572#############################################################################
2573
2574package CFClient::UI::Inventory;
2575
2576our @ISA = CFClient::UI::ScrolledWindow::;
2577
2578sub new {
2579 my $class = shift;
2580
2581 my $self = $class->SUPER::new (
2582 scrolled => (new CFClient::UI::VBox),
2583 @_, 2727 @_,
2584 ); 2728 );
2585 2729
2586 $self 2730 $self
2587} 2731}
… …
2597 or ($a->{name} cmp $b->{name}) 2741 or ($a->{name} cmp $b->{name})
2598 } @$items; 2742 } @$items;
2599 2743
2600 $self->{real_items} = \@items; 2744 $self->{real_items} = \@items;
2601 2745
2746 my $row = 0;
2602 for my $item (@items) { 2747 for my $item (@items) {
2603 my $desc = $item->{nrof} < 2 2748 CFClient::Item::update_widgets $item;
2604 ? $item->{name}
2605 : "$item->{nrof} $item->{name_pl}";
2606 2749
2607 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2608 } 2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2609 2753
2610 $self->{scrolled}->add (@items); 2754 $row++;
2755 }
2611 2756
2612# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2613} 2758}
2614 2759
2615sub size_request { 2760sub size_request {
… …
2657 2802
2658# popup given the event (must be a mouse button down event currently) 2803# popup given the event (must be a mouse button down event currently)
2659sub popup { 2804sub popup {
2660 my ($self, $ev) = @_; 2805 my ($self, $ev) = @_;
2661 2806
2662 $self->emit ("popdown"); 2807 $self->_emit ("popdown");
2663 2808
2664 # maybe save $GRAB? must be careful about events... 2809 # maybe save $GRAB? must be careful about events...
2665 $GRAB = $self; 2810 $GRAB = $self;
2666 $self->{button} = $ev->{button}; 2811 $self->{button} = $ev->{button};
2667 2812
… …
2682 2827
2683 if ($ev->{button} == $self->{button}) { 2828 if ($ev->{button} == $self->{button}) {
2684 undef $GRAB; 2829 undef $GRAB;
2685 $self->hide; 2830 $self->hide;
2686 2831
2687 $self->emit ("popdown"); 2832 $self->_emit ("popdown");
2688 $self->{hover}[1]->() if $self->{hover}; 2833 $self->{hover}[1]->() if $self->{hover};
2689 } 2834 }
2690} 2835}
2691 2836
2692############################################################################# 2837#############################################################################
2693 2838
2694package CFClient::UI::Statusbox; 2839package CFClient::UI::Statusbox;
2695 2840
2696our @ISA = CFClient::UI::VBox::; 2841our @ISA = CFClient::UI::VBox::;
2842
2843sub new {
2844 my $class = shift;
2845
2846 $class->SUPER::new (
2847 fontsize => 0.8,
2848 @_,
2849 )
2850}
2697 2851
2698sub reorder { 2852sub reorder {
2699 my ($self) = @_; 2853 my ($self) = @_;
2700 my $NOW = time; 2854 my $NOW = time;
2701 2855
… …
2721 : $item->{text}; 2875 : $item->{text};
2722 2876
2723 for ($short) { 2877 for ($short) {
2724 s/^\s+//; 2878 s/^\s+//;
2725 s/\s+/ /g; 2879 s/\s+/ /g;
2726 my $len = int 40 / $item->{fontsize};
2727 substr $_, $len, length, "…" if $len < length;
2728 } 2880 }
2729 2881
2730 new CFClient::UI::Label 2882 new CFClient::UI::Label
2731 markup => $short, 2883 markup => $short,
2732 tooltip => $item->{tooltip}, 2884 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP, 2885 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67, 2886 tooltip_width => 0.67,
2735 fontsize => $item->{fontsize}, 2887 fontsize => $item->{fontsize} || $self->{fontsize},
2888 max_w => $::WIDTH * 0.44,
2736 fg => $item->{fg}, 2889 fg => $item->{fg},
2737 can_events => 1, 2890 can_events => 1,
2738 can_hover => 1 2891 can_hover => 1
2739 }; 2892 };
2740 } 2893 }
… …
2746sub add { 2899sub add {
2747 my ($self, $text, %arg) = @_; 2900 my ($self, $text, %arg) = @_;
2748 2901
2749 $text =~ s/^\s+//; 2902 $text =~ s/^\s+//;
2750 $text =~ s/\s+$//; 2903 $text =~ s/\s+$//;
2904
2905 return unless $text;
2751 2906
2752 my $timeout = time + ((delete $arg{timeout}) || 60); 2907 my $timeout = time + ((delete $arg{timeout}) || 60);
2753 2908
2754 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2755 2910
… …
2767 $self->{item}{$group} = { 2922 $self->{item}{$group} = {
2768 id => ++$self->{id}, 2923 id => ++$self->{id},
2769 text => $text, 2924 text => $text,
2770 timeout => $timeout, 2925 timeout => $timeout,
2771 tooltip => $text, 2926 tooltip => $text,
2772 fontsize => 0.8,
2773 fg => [0.8, 0.8, 0.8, 0.8], 2927 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0, 2928 pri => 0,
2775 count => 1, 2929 count => 1,
2776 %arg, 2930 %arg,
2777 }; 2931 };
2778 } 2932 }
2779 2933
2780 $self->reorder; 2934 $self->reorder;
2781} 2935}
2782 2936
2937sub reconfigure {
2938 my ($self) = @_;
2939
2940 delete $_->{label}
2941 for values %{ $self->{item} || {} };
2942
2943 $self->reorder;
2944 $self->SUPER::reconfigure;
2945}
2946
2783############################################################################# 2947#############################################################################
2784 2948
2785package CFClient::UI::Root; 2949package CFClient::UI::Root;
2786 2950
2787our @ISA = CFClient::UI::Container::; 2951our @ISA = CFClient::UI::Container::;
… …
2817} 2981}
2818 2982
2819sub size_allocate { 2983sub size_allocate {
2820 my ($self, $w, $h) = @_; 2984 my ($self, $w, $h) = @_;
2821 2985
2822 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2823 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2824
2825 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2826 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2827
2828 for my $child ($self->children) { 2986 for my $child ($self->children) {
2829 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2830 2988
2831 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2832 if exists $child->{req_x}; 2990 if exists $child->{req_x};
… …
2861} 3019}
2862 3020
2863sub add { 3021sub add {
2864 my ($self, @children) = @_; 3022 my ($self, @children) = @_;
2865 3023
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
2866 for my $child (@children) { 3030 for my $child (@children) {
2867 $child->{toplevel} = 1; 3031 $child->{is_toplevel} = 1;
2868 3032
2869 # integerise window positions 3033 # integerise window positions
2870 $child->{x} = int $child->{x}; 3034 $child->{x} = int $child->{x};
2871 $child->{y} = int $child->{y}; 3035 $child->{y} = int $child->{y};
2872 } 3036 }
2873 3037
2874 $self->SUPER::add (@children); 3038 $self->SUPER::add (@children);
3039}
3040
3041sub remove {
3042 my ($self, @children) = @_;
3043
3044 $self->SUPER::remove (@children);
3045
3046 while (@children) {
3047 my $w = pop @children;
3048 push @children, $w->children;
3049 $w->set_invisible;
3050 }
2875} 3051}
2876 3052
2877sub on_refresh { 3053sub on_refresh {
2878 my ($self, $id, $cb) = @_; 3054 my ($self, $id, $cb) = @_;
2879 3055
… …
2932 $w = 0 if $w < 0; 3108 $w = 0 if $w < 0;
2933 $h = 0 if $h < 0; 3109 $h = 0 if $h < 0;
2934 3110
2935 $widget->{w} = $w; 3111 $widget->{w} = $w;
2936 $widget->{h} = $h; 3112 $widget->{h} = $h;
2937 $widget->size_allocate ($w, $h);
2938 $widget->emit (size_allocate => $w, $h); 3113 $widget->emit (size_allocate => $w, $h);
2939 } 3114 }
2940 } 3115 }
2941 3116
2942 while ($self->{post_alloc_hook}) { 3117 while ($self->{post_alloc_hook}) {
… …
2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2949 glClear GL_COLOR_BUFFER_BIT; 3124 glClear GL_COLOR_BUFFER_BIT;
2950 3125
2951 glMatrixMode GL_PROJECTION; 3126 glMatrixMode GL_PROJECTION;
2952 glLoadIdentity; 3127 glLoadIdentity;
2953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2954 glMatrixMode GL_MODELVIEW; 3129 glMatrixMode GL_MODELVIEW;
2955 glLoadIdentity; 3130 glLoadIdentity;
2956 3131
2957 $self->_draw; 3132 $self->_draw;
2958} 3133}
… …
2960############################################################################# 3135#############################################################################
2961 3136
2962package CFClient::UI; 3137package CFClient::UI;
2963 3138
2964$ROOT = new CFClient::UI::Root; 3139$ROOT = new CFClient::UI::Root;
2965$TOOLTIP = new CFClient::UI::Tooltip; 3140$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2966 3141
29671 31421
2968 3143

Diff Legend

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