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.37 by root, Sun Apr 9 21:05:50 2006 UTC vs.
Revision 1.173 by root, Tue Apr 25 10:30:48 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
6 7
7use SDL::OpenGL; 8use CFClient;
8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11
12our $ROOT;
13our $TOOLTIP;
14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show;
31 }
32
33 return;
34 }
35 }
36 }
37
38 $TOOLTIP->hide;
39 delete $TOOLTIP->{owner};
40}
11 41
12# class methods for events 42# class methods for events
13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 43sub feed_sdl_key_down_event {
14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
46}
47
48sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
51}
52
15sub feed_sdl_button_down_event { } 53sub feed_sdl_button_down_event {
54 my ($ev) = @_;
55 my ($x, $y) = ($ev->{x}, $ev->{y});
56
57 if (!$BUTTON_STATE) {
58 my $widget = $ROOT->find_widget ($x, $y);
59
60 $GRAB = $widget;
61 $GRAB->update if $GRAB;
62
63 check_tooltip;
64 }
65
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67
68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72}
73
16sub feed_sdl_button_up_event { } 74sub feed_sdl_button_up_event {
75 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y});
77
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81
82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86
87 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab;
90 $GRAB->update if $GRAB;
91
92 check_tooltip;
93 }
94}
95
96sub feed_sdl_motion_event {
97 my ($ev) = @_;
98 my ($x, $y) = ($ev->{x}, $ev->{y});
99
100 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
101
102 if ($widget != $HOVER) {
103 my $hover = $HOVER; $HOVER = $widget;
104
105 $hover->update if $hover && $hover->{can_hover};
106 $HOVER->update if $HOVER && $HOVER->{can_hover};
107
108 check_tooltip;
109 }
110
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
115}
116
117# convert position array to integers
118sub harmonize {
119 my ($vals) = @_;
120
121 my $rem = 0;
122
123 for (@$vals) {
124 my $i = int $_ + $rem;
125 $rem += $_ - $i;
126 $_ = $i;
127 }
128}
129
130#############################################################################
131
132package CFClient::UI::Base;
133
134use strict;
135
136use CFClient::OpenGL;
17 137
18sub new { 138sub new {
19 my $class = shift; 139 my $class = shift;
20 140
21 bless { @_ }, $class 141 my $self = bless {
142 x => 0,
143 y => 0,
144 z => 0,
145 can_events => 1,
146 @_
147 }, $class;
148
149 for (keys %$self) {
150 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_});
152 }
153 }
154
155 $self
156}
157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
165sub show {
166 my ($self) = @_;
167
168 return if $self->{parent};
169
170 $CFClient::UI::ROOT->add ($self);
171}
172
173sub hide {
174 my ($self) = @_;
175
176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
178
179 $self->{parent}->remove ($self)
180 if $self->{parent};
22} 181}
23 182
24sub move { 183sub move {
25 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
185
26 $self->{x} = $x; 186 $self->{x} = int $x;
27 $self->{y} = $y; 187 $self->{y} = int $y;
28 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
29}
30 189
31sub needs_redraw { 190 $self->update;
32 0 191}
192
193sub set_size {
194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
33} 200}
34 201
35sub size_request { 202sub size_request {
36 require Carp; 203 require Carp;
37 Carp::confess "size_request is abtract"; 204 Carp::confess "size_request is abstract";
205}
206
207sub configure {
208 my ($self, $x, $y, $w, $h) = @_;
209
210 if ($self->{aspect}) {
211 my $w2 = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect};
213
214 # use alignment to adjust x, y
215
216 $x += int +($w - $w2) * 0.5;
217 $y += int +($h - $h2) * 0.5;
218
219 ($w, $h) = ($w2, $h2);
220 }
221
222 if ($self->{x} != $x || $self->{y} != $y) {
223 $self->{x} = $x;
224 $self->{y} = $y;
225 $self->update;
226 }
227
228 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w;
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 }
38} 235}
39 236
40sub size_allocate { 237sub size_allocate {
238 # nothing to be done
239}
240
241sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252}
253
254sub set_max_size {
41 my ($self, $w, $h) = @_; 255 my ($self, $w, $h) = @_;
42 $self->w ($w); 256
43 $self->h ($h); 257 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h;
259}
260
261# return top left coordinates
262sub _topleft {
263 my ($self, $x, $y) = @_;
264
265 $self->{parent}
266 or Carp::confess "no parent widget in _topleft\n";#d#
267
268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
269}
270
271# translate global coordinates to local coordinate system
272sub coord2local {
273 my ($self, $x, $y) = @_;
274
275 my ($X, $Y) = $self->_topleft;
276 ($x - $X, $y - $Y)
277}
278
279# translate local coordinates to global coordinate system
280sub coord2global {
281 my ($self, $x, $y) = @_;
282
283 my ($X, $Y) = $self->_topleft;
284 ($x + $X, $y + $Y)
44} 285}
45 286
46sub focus_in { 287sub focus_in {
47 my ($widget) = @_; 288 my ($self) = @_;
48 $FOCUS = $widget; 289
290 return if $FOCUS == $self;
291 return unless $self->{can_focus};
292
293 my $focus = $FOCUS; $FOCUS = $self;
294
295 $self->emit (focus_in => $focus);
296
297 $focus->update if $focus;
298 $FOCUS->update;
49} 299}
50 300
51sub focus_out { 301sub focus_out {
52 my ($widget) = @_; 302 my ($self) = @_;
53}
54 303
304 return unless $FOCUS == $self;
305
306 my $focus = $FOCUS; undef $FOCUS;
307
308 $self->emit (focus_out => $focus);
309
310 $focus->update if $focus; #?
311}
312
313sub mouse_motion { }
314sub button_up { }
55sub key_down { 315sub key_down { }
56 my ($widget, $sdlev) = @_;
57}
58
59sub key_up { 316sub key_up { }
60 my ($widget, $sdlev) = @_;
61}
62 317
63sub button_down { 318sub button_down {
64 my ($widget, $sdlev) = @_; 319 my ($self, $ev, $x, $y) = @_;
65}
66 320
67sub button_up { 321 $self->focus_in;
68 my ($widget, $sdlev) = @_;
69} 322}
70 323
71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 324sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 325sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 326sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 327sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 328sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
76 329
77sub draw { 330sub draw {
78 my ($self) = @_; 331 my ($self) = @_;
332
333 return unless $self->{h} && $self->{w};
79 334
80 glPushMatrix; 335 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 336 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 337 $self->_draw;
83 glPopMatrix; 338 glPopMatrix;
339
340 if ($self == $HOVER && $self->{can_hover}) {
341 my ($x, $y) = @$self{qw(x y)};
342
343 glColor 1, 0.8, 0.5, 0.2;
344 glEnable GL_BLEND;
345 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
346 glBegin GL_QUADS;
347 glVertex $x , $y;
348 glVertex $x + $self->{w}, $y;
349 glVertex $x + $self->{w}, $y + $self->{h};
350 glVertex $x , $y + $self->{h};
351 glEnd;
352 glDisable GL_BLEND;
353 }
354
355 if ($ENV{PCLIENT_DEBUG}) {
356 glPushMatrix;
357 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0;
361 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h};
364 glEnd;
365 glPopMatrix;
366 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
367 }
84} 368}
85 369
86sub _draw { 370sub _draw {
87 my ($widget) = @_; 371 my ($self) = @_;
88}
89 372
90sub bbox { 373 warn "no draw defined for $self\n";
374}
375
376sub find_widget {
91 my ($self) = @_; 377 my ($self, $x, $y) = @_;
92 my ($w, $h) = $self->size_request; 378
379 return () unless $self->{can_events};
380
381 return $self
382 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
383 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
384
93 ( 385 ()
94 $self->{x},
95 $self->{y},
96 $self->{x} = $w,
97 $self->{y} = $h
98 )
99} 386}
100
101sub del_parent { $_[0]->{parent} = undef }
102 387
103sub set_parent { 388sub set_parent {
104 my ($self, $par) = @_; 389 my ($self, $parent) = @_;
105 390
106 $self->{parent} = $par;
107 Scalar::Util::weaken $self->{parent}; 391 Scalar::Util::weaken ($self->{parent} = $parent);
108} 392}
109 393
110sub get_parent { 394sub check_size {
395 my ($self) = @_;
396
111 $_[0]->{parent} 397 $self->{parent}
398 or return 1;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
112} 418}
113 419
114sub update { 420sub update {
115 my ($self) = @_; 421 my ($self) = @_;
116 422
117 $self->{parent}->update 423 $self->{parent}->update
118 if $self->{parent}; 424 if $self->{parent};
119} 425}
120 426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437}
438
121sub DESTROY { 439sub DESTROY {
122 my ($self) = @_; 440 my ($self) = @_;
123 441
124 #$self->deactivate; 442 #$self->deactivate;
125} 443}
126 444
127package Crossfire::Client::Widget::Bin; 445#############################################################################
128 446
129our @ISA = Crossfire::Client::Widget::; 447package CFClient::UI::DrawBG;
130 448
131sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->{expand} = $_[2] } 449our @ISA = CFClient::UI::Base::;
132sub get { $_[0]->{child} } 450
451use strict;
452use CFClient::OpenGL;
453
454sub new {
455 my $class = shift;
456
457 # range [value, low, high, page]
458
459 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5],
462 @_
463 )
464}
465
466sub _draw {
467 my ($self) = @_;
468
469 my ($w, $h) = @$self{qw(w h)};
470
471 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
474
475 glBegin GL_QUADS;
476 glVertex 0 , 0;
477 glVertex 0 , $h;
478 glVertex $w, $h;
479 glVertex $w, 0;
480 glEnd;
481
482 glDisable GL_BLEND;
483}
484
485#############################################################################
486
487package CFClient::UI::Empty;
488
489our @ISA = CFClient::UI::Base::;
490
491sub new {
492 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg);
494}
495
496sub size_request {
497 (0, 0)
498}
499
500sub draw { }
501
502#############################################################################
503
504package CFClient::UI::Container;
505
506our @ISA = CFClient::UI::Base::;
507
508sub new {
509 my ($class, %arg) = @_;
510
511 my $children = delete $arg{children} || [];
512
513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
518 $self->add ($_) for @$children;
519
520 $self
521}
522
523sub add {
524 my ($self, $child) = @_;
525
526 $child->set_parent ($self);
527
528 use sort 'stable';
529
530 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child
533 ];
534
535 $child->check_size;
536}
537
538sub children {
539 @{ $_[0]{children} }
540}
133 541
134sub remove { 542sub remove {
135 my ($self, $chld) = @_; 543 my ($self, $child) = @_;
136 delete $self->{child} 544
137 if $self->{child} == $chld; 545 delete $child->{parent};
546 $child->hide;
547
548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
549
550 $self->check_size;
551 $self->update;
138} 552}
553
554sub clear {
555 my ($self) = @_;
556
557 my $children = delete $self->{children};
558 $self->{children} = [];
559
560 for (@$children) {
561 delete $_->{parent};
562 $_->hide;
563 }
564}
565
566sub find_widget {
567 my ($self, $x, $y) = @_;
568
569 $x -= $self->{x};
570 $y -= $self->{y};
571
572 my $res;
573
574 for (reverse @{ $self->{children} }) {
575 $res = $_->find_widget ($x, $y)
576 and return $res;
577 }
578
579 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
580}
581
582sub _draw {
583 my ($self) = @_;
584
585 $_->draw for @{$self->{children}};
586}
587
588#############################################################################
589
590package CFClient::UI::Bin;
591
592our @ISA = CFClient::UI::Container::;
593
594sub new {
595 my ($class, %arg) = @_;
596
597 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
598
599 $class->SUPER::new (children => [$child], %arg)
600}
601
602sub add {
603 my ($self, $child) = @_;
604
605 $self->{children} = [];
606
607 $self->SUPER::add ($child);
608}
609
610sub remove {
611 my ($self, $widget) = @_;
612
613 $self->SUPER::remove ($widget);
614
615 $self->{children} = [new CFClient::UI::Empty]
616 unless @{$self->{children}};
617}
618
619sub child { $_[0]->{children}[0] }
139 620
140sub size_request { 621sub size_request {
141 $_[0]->{child}->size_request if $_[0]->{child} 622 $_[0]{children}[0]->size_request
142} 623}
624
143sub size_allocate { 625sub size_allocate {
144 my ($self, $w, $h) = @_; 626 my ($self, $w, $h) = @_;
145 $self->SUPER::size_allocate ($w, $h);
146 $self->{child}->size_allocate ($w, $h)
147 if $self->{child}
148}
149 627
150sub _draw { 628 $self->{children}[0]->configure (0, 0, $w, $h);
151 my ($self) = @_;
152
153 $self->{child}->draw;
154} 629}
155 630
156package Crossfire::Client::Widget::Toplevel; 631#############################################################################
157 632
158our @ISA = Crossfire::Client::Widget::; 633package CFClient::UI::Window;
159 634
160use SDL::OpenGL; 635our @ISA = CFClient::UI::Bin::;
161 636
162sub add { 637use CFClient::OpenGL;
163 my ($self, $chld) = @_;
164 638
165 push @{$self->{childs}}, $chld; 639sub new {
166 @{$self->{childs}} = 640 my ($class, %arg) = @_;
167 sort { $a->{z} <=> $b->{z} }
168 @{$self->{childs}};
169 641
170 $chld->set_parent ($self); 642 my $self = $class->SUPER::new (%arg);
171 $chld->size_allocate ($chld->size_request);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180} 643}
181 644
182sub update { 645sub update {
183 my ($self) = @_; 646 my ($self) = @_;
184 ::refresh ();
185}
186 647
187sub _draw { 648 # we want to do this delayed...
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 warn "ADD $chld\n";
202 $self->SUPER::add ($chld);
203 $chld->set_parent ($self);
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 # $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld; 649 $self->render_chld;
650 $self->SUPER::update;
215} 651}
216 652
217sub render_chld { 653sub render_chld {
218 my ($self) = @_; 654 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221 655
222 require Carp; 656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
223 Carp::cluck "RENDERCHI $w $h"; 657 glClearColor 0, 0, 0, 1;
224 warn "RENDERCHI $w $h\n"; 658 glClear GL_COLOR_BUFFER_BIT;
225 $self->{texture} = 659 $self->child->draw;
226 Crossfire::Client::Texture->new_from_opengl ( 660 };
227 $w, $h, sub { $chld->draw }
228 );
229 $self->{texture}->upload;
230}
231
232sub size_request {
233 my ($self) = @_;
234 ($self->w, $self->h)
235} 661}
236 662
237sub size_allocate { 663sub size_allocate {
238 my ($self, $w, $h) = @_; 664 my ($self, $w, $h) = @_;
239 665
240 $self->w ($w); 666 $self->child->configure (0, 0, $w, $h);
241 $self->h ($h);
242 $self->get->size_allocate ($w, $h);
243 667
244 $self->update; #TODO: Move this to the size_request event propably? 668 $self->render_chld;
245} 669}
246 670
247sub _draw { 671sub _draw {
248 my ($self) = @_; 672 my ($self) = @_;
249 673
251 675
252 my $tex = $self->{texture} 676 my $tex = $self->{texture}
253 or return; 677 or return;
254 678
255 glEnable GL_BLEND; 679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
256 glEnable GL_TEXTURE_2D; 681 glEnable GL_TEXTURE_2D;
257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
258 glBindTexture GL_TEXTURE_2D, $tex->{name};
259 683
260 glBegin GL_QUADS; 684 $tex->draw_quad (0, 0, $w, $h);
261 glTexCoord 0, 0; glVertex 0, 0;
262 glTexCoord 0, 1; glVertex 0, $h;
263 glTexCoord 1, 1; glVertex $w, $h;
264 glTexCoord 1, 0; glVertex $w, 0;
265 glEnd;
266 685
267 glDisable GL_BLEND; 686 glDisable GL_BLEND;
268 glDisable GL_TEXTURE_2D; 687 glDisable GL_TEXTURE_2D;
269} 688}
270 689
271package Crossfire::Client::Widget::Frame; 690#############################################################################
272 691
273our @ISA = Crossfire::Client::Widget::Bin::; 692package CFClient::UI::ViewPort;
274 693
275use SDL::OpenGL; 694our @ISA = CFClient::UI::Window::;
695
696sub new { die }
276 697
277sub size_request { 698sub size_request {
278 my ($self) = @_; 699 my ($self) = @_;
279 my $chld = $self->get
280 or return (0, 0);
281 700
282 $chld->move (2, 2); 701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
283 703
284 map { $_ + 4 } $chld->size_request; 704 @$self{qw(child_w child_h)}
705}
706
707sub _draw {
708 my ($self) = @_;
709
710 $self->{children}[1]->draw;
711}
712
713
714#############################################################################
715
716package CFClient::UI::Frame;
717
718our @ISA = CFClient::UI::Bin::;
719
720use CFClient::OpenGL;
721
722sub new {
723 my $class = shift;
724
725 my $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1],
727 border_bg => [1, 1, 1, 1],
728 border => 0.8,
729 @_
730 );
731
732 $self
733}
734
735sub _draw {
736 my ($self) = @_;
737
738 my ($w, $h) = ($self->{w}, $self->{h});
739
740 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744
745# glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0;
748# glVertex 0 , $h;
749# glVertex $w, $h;
750# glVertex $w, 0;
751# glEnd;
752
753
754 $self->child->draw;
755 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D;
757}
758
759#############################################################################
760
761package CFClient::UI::FancyFrame;
762
763our @ISA = CFClient::UI::Bin::;
764
765use CFClient::OpenGL;
766
767my @tex =
768 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
769 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
770
771sub new {
772 my $class = shift;
773
774 # TODO: user_x, user_y, overwrite moveto?
775
776 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1],
779 border => 0.8,
780 can_events => 1,
781 @_
782 );
783
784 $self->{title} &&= new CFClient::UI::Label
785 align => 0,
786 valign => 1,
787 text => $self->{title},
788 fontsize => 1;
789
790 $self
791}
792
793sub border {
794 int $_[0]{border} * $::FONTSIZE
795}
796
797sub size_request {
798 my ($self) = @_;
799
800 my ($w, $h) = $self->SUPER::size_request;
801
802 (
803 $w + $self->border * 2,
804 $h + $self->border * 2,
805 )
285} 806}
286 807
287sub size_allocate { 808sub size_allocate {
288 my ($self, $w, $h) = @_; 809 my ($self, $w, $h) = @_;
289 810
290 $self->w ($w); 811 $h -= List::Util::max 0, $self->border * 2;
291 $self->h ($h); 812 $w -= List::Util::max 0, $self->border * 2;
292 813
293 $self->get->size_allocate ($w - 4, $h - 4); 814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
294 $self->get->move (2, 2); 815 if $self->{title};
816
817 $self->child->configure ($self->border, $self->border, $w, $h);
818}
819
820sub button_down {
821 my ($self, $ev, $x, $y) = @_;
822
823 my $border = $self->border;
824
825 if ($x < $self->{w} && $x >= $self->{w} - $border
826 && $y < $self->{h} && $y >= $self->{h} - $border) {
827
828 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h});
830
831 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_;
833
834 ($x, $y) = ($ev->{x}, $ev->{y});
835
836 $self->{user_w} = $bw + $x - $ox;
837 $self->{user_h} = $bh + $y - $oy;
838 $self->check_size;
839 };
840
841 } elsif ($x >= 0 && $x < $self->{w}
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y});
846
847 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_;
849
850 ($x, $y) = ($ev->{x}, $ev->{y});
851
852 $self->move ($bx + $x - $ox, $by + $y - $oy);
853 $self->update;
854 };
855 }
856}
857
858sub button_up {
859 my ($self, $ev, $x, $y) = @_;
860
861 delete $self->{motion};
862}
863
864sub mouse_motion {
865 my ($self, $ev, $x, $y) = @_;
866
867 $self->{motion}->($ev, $x, $y) if $self->{motion};
295} 868}
296 869
297sub _draw { 870sub _draw {
298 my ($self) = @_; 871 my ($self) = @_;
299 872
300 my $chld = $self->get; 873 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
301 875
302 my ($w, $h) = $chld->size_request; 876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
303 880
304 glBegin GL_QUADS; 881 my $border = $self->border;
305 glColor 0, 0, 0;
306 glTexCoord 0, 0; glVertex 0 , 0;
307 glTexCoord 0, 1; glVertex 0 , $h + 4;
308 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
309 glTexCoord 1, 0; glVertex $w + 4 , 0;
310 glEnd;
311 882
883 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border);
888
889 my $bg = $tex[0];
890
891 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h};
894
895 glColor @{ $self->{bg} };
896
897 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch);
901
902 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904
905 $self->{title}->draw if $self->{title};
312 $chld->draw; 906 $self->child->draw;
313} 907}
314 908
315package Crossfire::Client::Widget::FancyFrame; 909#############################################################################
316 910
317our @ISA = Crossfire::Client::Widget::Frame::; 911package CFClient::UI::Table;
318 912
319use SDL::OpenGL; 913our @ISA = CFClient::UI::Base::;
914
915use List::Util qw(max sum);
916
917use CFClient::OpenGL;
320 918
321sub new { 919sub new {
920 my $class = shift;
921
922 $class->SUPER::new (
923 col_expand => [],
924 @_
925 )
926}
927
928sub add {
929 my ($self, $x, $y, $child) = @_;
930
931 $child->set_parent ($self);
932 $self->{children}[$y][$x] = $child;
933
934 $child->check_size;
935}
936
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
941# TODO: move to container class maybe? send childs a signal on removal?
942sub clear {
322 my ($self, $theme) = @_; 943 my ($self) = @_;
323 $self = $self->SUPER::new;
324 944
325 $self->{txts} = [ 945 my @children = $self->children;
326 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 946 delete $self->{children};
327 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/
328 ]; 947
329 $self 948 for (@children) {
949 delete $_->{parent};
950 $_->hide;
951 }
952
953 $self->update;
954}
955
956sub get_wh {
957 my ($self) = @_;
958
959 my (@w, @h);
960
961 for my $y (0 .. $#{$self->{children}}) {
962 my $row = $self->{children}[$y]
963 or next;
964
965 for my $x (0 .. $#$row) {
966 my $widget = $row->[$x]
967 or next;
968 my ($w, $h) = @$widget{qw(req_w req_h)};
969
970 $w[$x] = max $w[$x], $w;
971 $h[$y] = max $h[$y], $h;
972 }
973 }
974
975 (\@w, \@h)
330} 976}
331 977
332sub size_request { 978sub size_request {
333 my ($self) = @_; 979 my ($self) = @_;
980
334 my ($w, $h) = $self->get->size_request; 981 my ($ws, $hs) = $self->get_wh;
335 982
336 $h += $self->{txts}->[1]->{height}; 983 (
337 $h += $self->{txts}->[4]->{height}; 984 (sum @$ws),
338 $w += $self->{txts}->[2]->{width}; 985 (sum @$hs),
339 $w += $self->{txts}->[3]->{width}; 986 )
340
341 ($w, $h)
342} 987}
343 988
344sub size_allocate { 989sub size_allocate {
345 my ($self, $w, $h) = @_; 990 my ($self, $w, $h) = @_;
346 991
347 $self->w ($w); 992 my ($ws, $hs) = $self->get_wh;
348 $self->h ($h);
349 $h -= $self->{txts}->[1]->{height};
350 $h -= $self->{txts}->[4]->{height};
351 $w -= $self->{txts}->[2]->{width};
352 $w -= $self->{txts}->[3]->{width};
353 993
354 $h = $h < 0 ? 0 : $h; 994 my $req_w = sum @$ws;
355 $w = $w < 0 ? 0 : $w; 995 my $req_h = sum @$hs;
356 warn "CHILD:$w $h\n"; 996
357 $self->get->size_allocate ($w, $h); 997 # TODO: nicer code && do row_expand
358 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 998 my @col_expand = @{$self->{col_expand}};
999 @col_expand = (1) x @$ws unless @col_expand;
1000 my $col_expand = (sum @col_expand) || 1;
1001
1002 # linearly scale sizes
1003 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1004 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1005
1006 CFClient::UI::harmonize $ws;
1007 CFClient::UI::harmonize $hs;
1008
1009 my $y;
1010
1011 for my $r (0 .. $#{$self->{children}}) {
1012 my $row = $self->{children}[$r]
1013 or next;
1014
1015 my $x = 0;
1016 my $row_h = $hs->[$r];
1017
1018 for my $c (0 .. $#$row) {
1019 my $col_w = $ws->[$c];
1020
1021 if (my $widget = $row->[$c]) {
1022 $widget->configure ($x, $y, $col_w, $row_h);
1023 }
1024
1025 $x += $col_w;
1026 }
1027
1028 $y += $row_h;
1029 }
1030
1031}
1032
1033sub find_widget {
1034 my ($self, $x, $y) = @_;
1035
1036 $x -= $self->{x};
1037 $y -= $self->{y};
1038
1039 my $res;
1040
1041 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1042 $res = $_->find_widget ($x, $y)
1043 and return $res;
1044 }
1045
1046 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
359} 1047}
360 1048
361sub _draw { 1049sub _draw {
362 my ($self) = @_; 1050 my ($self) = @_;
363 1051
364 my ($w, $h) = ($self->w, $self->h); 1052 for (grep $_, @{$self->{children}}) {
365 my ($cw, $ch) = ($self->get->w, $self->get->h); 1053 $_->draw for grep $_, @$_;
1054 }
1055}
1056
1057#############################################################################
1058
1059package CFClient::UI::HBox;
1060
1061# TODO: wrap into common Box base class
1062
1063our @ISA = CFClient::UI::Container::;
1064
1065sub size_request {
1066 my ($self) = @_;
1067
1068 my @alloc = map [$_->size_request], @{$self->{children}};
1069
1070 (
1071 (List::Util::sum map $_->[0], @alloc),
1072 (List::Util::max map $_->[1], @alloc),
1073 )
1074}
1075
1076sub size_allocate {
1077 my ($self, $w, $h) = @_;
1078
1079 ($h, $w) = ($w, $h);
1080
1081 my $children = $self->{children};
1082
1083 my @h = map $_->{req_w}, @$children;
1084
1085 my $req_h = List::Util::sum @h;
1086
1087 if ($req_h > $h) {
1088 # ah well, not enough space
1089 $_ *= $h / $req_h for @h;
1090 } else {
1091 my $exp = List::Util::sum map $_->{expand}, @$children;
1092 $exp ||= 1;
1093
1094 for (0 .. $#$children) {
1095 my $child = $children->[$_];
1096
1097 my $alloc_h = $h[$_];
1098 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1099 $h[$_] = $alloc_h;
1100 }
1101 }
1102
1103 CFClient::UI::harmonize \@h;
1104
1105 my $y = 0;
1106 for (0 .. $#$children) {
1107 my $child = $children->[$_];
1108 my $h = $h[$_];
1109 $child->configure ($y, 0, $h, $w);
1110
1111 $y += $h;
1112 }
1113
1114 1
1115}
1116
1117#############################################################################
1118
1119package CFClient::UI::VBox;
1120
1121# TODO: wrap into common Box base class
1122
1123our @ISA = CFClient::UI::Container::;
1124
1125sub size_request {
1126 my ($self) = @_;
1127
1128 my @alloc = map [$_->size_request], @{$self->{children}};
1129
1130 (
1131 (List::Util::max map $_->[0], @alloc),
1132 (List::Util::sum map $_->[1], @alloc),
1133 )
1134}
1135
1136sub size_allocate {
1137 my ($self, $w, $h) = @_;
1138
1139 my $children = $self->{children};
1140
1141 my @h = map $_->{req_h}, @$children;
1142
1143 my $req_h = List::Util::sum @h;
1144
1145 if ($req_h > $h) {
1146 # ah well, not enough space
1147 $_ *= $h / $req_h for @h;
1148 } else {
1149 my $exp = List::Util::sum map $_->{expand}, @$children;
1150 $exp ||= 1;
1151
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154
1155 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1156 }
1157 }
1158
1159 CFClient::UI::harmonize \@h;
1160
1161 my $y = 0;
1162 for (0 .. $#$children) {
1163 my $child = $children->[$_];
1164 my $h = $h[$_];
1165 $child->configure (0, $y, $w, $h);
1166
1167 $y += $h;
1168 }
1169
1170 1
1171}
1172
1173#############################################################################
1174
1175package CFClient::UI::Label;
1176
1177our @ISA = CFClient::UI::Base::;
1178
1179use CFClient::OpenGL;
1180
1181sub new {
1182 my ($class, %arg) = @_;
1183
1184 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1],
1186 #font => default_font
1187 fontsize => 1,
1188 text => "",
1189 align => -1,
1190 valign => -1,
1191 padding => 2,
1192 layout => new CFClient::Layout,
1193 can_events => 0,
1194 %arg
1195 );
1196
1197 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout;
1201 }
1202
1203 $self->set_text (delete $self->{text}) if exists $self->{text};
1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1205
1206 $self
1207}
1208
1209sub escape {
1210 local $_ = $_[1];
1211
1212 s/&/&amp;/g;
1213 s/>/&gt;/g;
1214 s/</&lt;/g;
1215
1216 $_[1]
1217}
1218
1219sub update {
1220 my ($self) = @_;
1221
1222 delete $self->{texture};
1223 $self->SUPER::update;
1224}
1225
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text {
1233 my ($self, $text) = @_;
1234
1235 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text";
1237
1238 $self->{layout}->set_text ($text);
1239
1240 delete $self->{texture};
1241 $self->update;
1242 $self->check_size;
1243}
1244
1245sub set_markup {
1246 my ($self, $markup) = @_;
1247
1248 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup";
1250
1251 $self->{layout}->set_markup ($markup);
1252
1253 delete $self->{texture};
1254 $self->update;
1255 $self->check_size;
1256}
1257
1258sub size_request {
1259 my ($self) = @_;
1260
1261 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1);
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264
1265 my ($w, $h) = $self->{layout}->size;
1266
1267 if (exists $self->{template}) {
1268 $self->{template}->set_font ($self->{font}) if $self->{font};
1269 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1270
1271 my ($w2, $h2) = $self->{template}->size;
1272
1273 $w = List::Util::max $w, $w2;
1274 $h = List::Util::max $h, $h2;
1275 }
1276
1277 (
1278 $w + $self->{padding} * 2,
1279 $h + $self->{padding} * 2,
1280 )
1281}
1282
1283sub size_allocate {
1284 my ($self, $w, $h) = @_;
1285
1286 delete $self->{texture};
1287}
1288
1289sub set_fontsize {
1290 my ($self, $fontsize) = @_;
1291
1292 $self->{fontsize} = $fontsize;
1293 delete $self->{texture};
1294 $self->check_size;
1295 $self->update;
1296}
1297
1298sub _draw {
1299 my ($self) = @_;
1300
1301 my $tex = $self->{texture} ||= do {
1302 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{w});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1305 new_from_layout CFClient::Texture $self->{layout}
1306 };
1307
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312
1313 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $tex->draw_quad ($self->{ox}, $self->{oy});
1328
1329 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331}
1332
1333#############################################################################
1334
1335package CFClient::UI::EntryBase;
1336
1337our @ISA = CFClient::UI::Label::;
1338
1339use CFClient::OpenGL;
1340
1341sub new {
1342 my $class = shift;
1343
1344 $class->SUPER::new (
1345 fg => [1, 1, 1],
1346 bg => [0, 0, 0, 0.2],
1347 active_bg => [1, 1, 1, 0.5],
1348 active_fg => [0, 0, 0],
1349 can_hover => 1,
1350 can_focus => 1,
1351 valign => 0,
1352 can_events => 1,
1353 @_
1354 )
1355}
1356
1357sub _set_text {
1358 my ($self, $text) = @_;
1359
1360 delete $self->{cur_h};
1361
1362 return if $self->{text} eq $text;
1363
1364 delete $self->{texture};
1365
1366 $self->{last_activity} = $::NOW;
1367 $self->{text} = $text;
1368
1369 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text ");
1371
1372 $self->emit (changed => $self->{text});
1373}
1374
1375sub get_text {
1376 $_[0]{text}
1377}
1378
1379sub size_request {
1380 my ($self) = @_;
1381
1382 my ($w, $h) = $self->SUPER::size_request;
1383
1384 ($w + 1, $h) # add 1 for cursor
1385}
1386
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391}
1392
1393sub set_text {
1394 my ($self, $text) = @_;
1395
1396 $self->{cursor} = length $text;
1397 $self->_set_text ($text);
1398 $self->update;
1399}
1400
1401sub key_down {
1402 my ($self, $ev) = @_;
1403
1404 my $mod = $ev->{mod};
1405 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode};
1407
1408 my $text = $self->get_text;
1409
1410 if ($sym == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) {
1413 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) {
1423 $self->emit ('escape');
1424 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni;
1426 }
1427
1428 $self->_set_text ($text);
1429 $self->update;
1430}
1431
1432sub focus_in {
1433 my ($self) = @_;
1434
1435 $self->{last_activity} = $::NOW;
1436
1437 $self->SUPER::focus_in;
1438}
1439
1440sub button_down {
1441 my ($self, $ev, $x, $y) = @_;
1442
1443 $self->SUPER::button_down ($ev, $x, $y);
1444
1445 my $idx = $self->{layout}->xy_to_index ($x, $y);
1446
1447 # byte-index to char-index
1448 my $text = $self->{text};
1449 utf8::encode $text;
1450 $self->{cursor} = length substr $text, 0, $idx;
1451
1452 $self->_set_text ($self->{text});
1453 $self->update;
1454}
1455
1456sub mouse_motion {
1457 my ($self, $ev, $x, $y) = @_;
1458# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1459}
1460
1461sub _draw {
1462 my ($self) = @_;
1463
1464 local $self->{fg} = $self->{fg};
1465
1466 if ($FOCUS == $self) {
1467 glColor @{$self->{active_bg}};
1468 $self->{fg} = $self->{active_fg};
1469 } else {
1470 glColor @{$self->{bg}};
1471 }
1472
1473 glEnable GL_BLEND;
1474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1475 glBegin GL_QUADS;
1476 glVertex 0 , 0;
1477 glVertex 0 , $self->{h};
1478 glVertex $self->{w}, $self->{h};
1479 glVertex $self->{w}, 0;
1480 glEnd;
1481 glDisable GL_BLEND;
1482
1483 $self->SUPER::_draw;
1484
1485 #TODO: force update every cursor change :(
1486 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1487
1488 unless (exists $self->{cur_h}) {
1489 my $text = substr $self->{text}, 0, $self->{cursor};
1490 utf8::encode $text;
1491
1492 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1493 }
1494
1495 glColor @{$self->{fg}};
1496 glBegin GL_LINES;
1497 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1498 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1499 glEnd;
1500 }
1501}
1502
1503package CFClient::UI::Entry;
1504
1505our @ISA = CFClient::UI::EntryBase::;
1506
1507use CFClient::OpenGL;
1508
1509sub key_down {
1510 my ($self, $ev) = @_;
1511
1512 my $sym = $ev->{sym};
1513
1514 if ($sym == 13) {
1515 unshift @{$self->{history}},
1516 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = '';
1519 $self->emit (activate => $txt);
1520 $self->update;
1521
1522 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text;
1525 }
1526 if (@{$self->{history} || []} > 0) {
1527 $self->{history_pointer}++;
1528 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1529 $self->{history_pointer} = @{$self->{history} || []} - 1;
1530 }
1531 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1532 }
1533
1534 } elsif ($sym == CFClient::SDLK_DOWN) {
1535 $self->{history_pointer}--;
1536 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1537
1538 if ($self->{history_pointer} >= 0) {
1539 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1540 } else {
1541 $self->set_text ($self->{history_saveback});
1542 }
1543
1544 } else {
1545 $self->SUPER::key_down ($ev);
1546 }
1547
1548}
1549
1550#############################################################################
1551
1552package CFClient::UI::Button;
1553
1554our @ISA = CFClient::UI::Label::;
1555
1556use CFClient::OpenGL;
1557
1558my @tex =
1559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1560 qw(b1_button_active.png);
1561
1562sub new {
1563 my $class = shift;
1564
1565 $class->SUPER::new (
1566 padding => 4,
1567 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1],
1570 can_hover => 1,
1571 align => 0,
1572 valign => 0,
1573 can_events => 1,
1574 @_
1575 )
1576}
1577
1578sub button_up {
1579 my ($self, $ev, $x, $y) = @_;
1580
1581 if ($x >= 0 && $x < $self->{w}
1582 && $y >= 0 && $y < $self->{h}) {
1583 $self->emit ("activate");
1584 }
1585}
1586
1587sub _draw {
1588 my ($self) = @_;
1589
1590 local $self->{fg} = $self->{fg};
1591
1592 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg};
1594 }
1595
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1;
1601
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1603
1604 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606
1607 $self->SUPER::_draw;
1608}
1609
1610#############################################################################
1611
1612package CFClient::UI::CheckBox;
1613
1614our @ISA = CFClient::UI::DrawBG::;
1615
1616my @tex =
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1619
1620use CFClient::OpenGL;
1621
1622sub new {
1623 my $class = shift;
1624
1625 $class->SUPER::new (
1626 padding => 2,
1627 fg => [1, 1, 1],
1628 active_fg => [1, 1, 0],
1629 state => 0,
1630 can_hover => 1,
1631 @_
1632 )
1633}
1634
1635sub size_request {
1636 my ($self) = @_;
1637
1638 ($self->{padding} * 2 + 6) x 2
1639}
1640
1641sub button_down {
1642 my ($self, $ev, $x, $y) = @_;
1643
1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1646 $self->{state} = !$self->{state};
1647 $self->emit (changed => $self->{state});
1648 }
1649}
1650
1651sub _draw {
1652 my ($self) = @_;
1653
1654 $self->SUPER::_draw;
1655
1656 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1657
1658 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1659
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
366 1661
367 glEnable GL_BLEND; 1662 glEnable GL_BLEND;
368 glEnable GL_TEXTURE_2D; 1663 glEnable GL_TEXTURE_2D;
369 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672}
1673
1674#############################################################################
1675
1676package CFClient::UI::Image;
1677
1678our @ISA = CFClient::UI::Base::;
1679
1680use CFClient::OpenGL;
1681use Carp qw/confess/;
1682
1683our %loaded_images;
1684
1685sub new {
1686 my $class = shift;
1687
1688 my $self = $class->SUPER::new (can_events => 0, @_);
1689
1690 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1691
1692 $loaded_images{$self->{image}} ||=
1693 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1694
1695 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1696
1697 Scalar::Util::weaken $loaded_images{$self->{image}};
1698
1699 $self->{aspect} = $tex->{w} / $tex->{h};
1700
1701 $self
1702}
1703
1704sub size_request {
1705 my ($self) = @_;
1706
1707 ($self->{tex}->{w}, $self->{tex}->{h})
1708}
1709
1710sub _draw {
1711 my ($self) = @_;
1712
1713 my $tex = $self->{tex};
1714
1715 my ($w, $h) = ($self->{w}, $self->{h});
1716
1717 if ($self->{rot90}) {
1718 glRotate 90, 0, 0, 1;
1719 glTranslate 0, -$self->{w}, 0;
1720
1721 ($w, $h) = ($h, $w);
1722 }
1723
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
371 1728
372 my $top = $self->{txts}->[1]; 1729 $tex->draw_quad (0, 0, $w, $h);
373 glBindTexture GL_TEXTURE_2D, $top->{name};
374
375 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , 0;
377 glTexCoord 0, 1; glVertex 0 , $top->{height};
378 glTexCoord 1, 1; glVertex $w , $top->{height};
379 glTexCoord 1, 0; glVertex $w , 0;
380 glEnd;
381
382 my $left = $self->{txts}->[3];
383 glBindTexture GL_TEXTURE_2D, $left->{name};
384
385 glBegin GL_QUADS;
386 glTexCoord 0, 0; glVertex 0 , $top->{height};
387 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
388 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
389 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
390 glEnd;
391
392 my $right = $self->{txts}->[2];
393 glBindTexture GL_TEXTURE_2D, $right->{name};
394
395 glBegin GL_QUADS;
396 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
397 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
398 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
399 glTexCoord 1, 0; glVertex $w , $top->{height};
400 glEnd;
401
402 my $bottom = $self->{txts}->[4];
403 glBindTexture GL_TEXTURE_2D, $bottom->{name};
404
405 glBegin GL_QUADS;
406 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
407 glTexCoord 0, 1; glVertex 0 , $h;
408 glTexCoord 1, 1; glVertex $w , $h;
409 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
410 glEnd;
411
412 my $bg = $self->{txts}->[0];
413 glBindTexture GL_TEXTURE_2D, $bg->{name};
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
416 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
417
418 my $rep_x = $cw / $bg->{width};
419 my $rep_y = $ch / $bg->{height};
420
421 glBegin GL_QUADS;
422 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
423 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
424 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
425 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
426 glEnd;
427 1730
428 glDisable GL_BLEND; 1731 glDisable GL_BLEND;
429 glDisable GL_TEXTURE_2D; 1732 glDisable GL_TEXTURE_2D;
430
431 $self->get->draw;
432
433} 1733}
434 1734
435package Crossfire::Client::Widget::Table; 1735#############################################################################
436 1736
437our @ISA = Crossfire::Client::Widget::Bin::; 1737package CFClient::UI::VGauge;
438 1738
439use SDL::OpenGL; 1739our @ISA = CFClient::UI::Base::;
440 1740
441sub add { 1741use List::Util qw(min max);
1742
1743use CFClient::OpenGL;
1744
1745my %tex = (
1746 food => [
1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1748 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1749 ],
1750 grace => [
1751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1752 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1753 ],
1754 hp => [
1755 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1756 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1757 ],
1758 mana => [
1759 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1760 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1761 ],
1762);
1763
1764# eg. VGauge->new (gauge => 'food'), default gauge: food
1765sub new {
1766 my $class = shift;
1767
1768 my $self = $class->SUPER::new (
1769 type => 'food',
1770 @_
1771 );
1772
1773 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1774
1775 $self
1776}
1777
1778sub size_request {
1779 my ($self) = @_;
1780
1781 #my $tex = $tex{$self->{type}}[0];
1782 #@$tex{qw(w h)}
1783 (0, 0)
1784}
1785
1786sub set_max {
442 my ($self, $x, $y, $chld) = @_; 1787 my ($self, $max) = @_;
443 my $old_chld = $self->{childs}[$y][$x];
444 1788
445 $self->{childs}[$y][$x] = $chld; 1789 return if $self->{max_val} == $max;
446 $chld->set_parent ($self); 1790
1791 $self->{max_val} = $max;
447 $self->update; 1792 $self->update;
448} 1793}
449 1794
450sub max_row_height { 1795sub set_value {
1796 my ($self, $val, $max) = @_;
1797
1798 $self->set_max ($max)
1799 if defined $max;
1800
1801 return if $self->{val} == $val;
1802
1803 $self->{val} = $val;
1804 $self->update;
1805}
1806
1807sub _draw {
1808 my ($self) = @_;
1809
1810 my $tex = $tex{$self->{type}};
1811 my ($t1, $t2, $t3) = @$tex;
1812
1813 my ($w, $h) = ($self->{w}, $self->{h});
1814
1815 if ($self->{vertical}) {
1816 glRotate 90, 0, 0, 1;
1817 glTranslate 0, -$self->{w}, 0;
1818
1819 ($w, $h) = ($h, $w);
1820 }
1821
1822 my $ycut = $self->{val} / ($self->{max_val} || 1);
1823
1824 my $ycut1 = max 0, min 1, $ycut;
1825 my $ycut2 = max 0, min 1, $ycut - 1;
1826
1827 my $h1 = $self->{h} * (1 - $ycut1);
1828 my $h2 = $self->{h} * (1 - $ycut2);
1829
1830 glEnable GL_BLEND;
1831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1832 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834
1835 glBindTexture GL_TEXTURE_2D, $t1->{name};
1836 glBegin GL_QUADS;
1837 glTexCoord 0 , 0; glVertex 0 , 0;
1838 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1839 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1840 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1841 glEnd;
1842
1843 my $ycut1 = List::Util::min 1, $ycut;
1844 glBindTexture GL_TEXTURE_2D, $t2->{name};
1845 glBegin GL_QUADS;
1846 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1847 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1848 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1849 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1850 glEnd;
1851
1852 if ($t3) {
1853 glBindTexture GL_TEXTURE_2D, $t3->{name};
1854 glBegin GL_QUADS;
1855 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1856 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1857 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1858 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1859 glEnd;
1860 }
1861
1862 glDisable GL_BLEND;
1863 glDisable GL_TEXTURE_2D;
1864}
1865
1866#############################################################################
1867
1868package CFClient::UI::Gauge;
1869
1870our @ISA = CFClient::UI::VBox::;
1871
1872sub new {
1873 my ($class, %arg) = @_;
1874
1875 my $self = $class->SUPER::new (
1876 tooltip => $arg{type},
1877 can_hover => 1,
1878 can_events => 1,
1879 %arg,
1880 );
1881
1882 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1883 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1884 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1885
1886 $self
1887}
1888
1889sub set_fontsize {
1890 my ($self, $fsize) = @_;
1891
1892 $self->{value}->set_fontsize ($fsize);
1893 $self->{max} ->set_fontsize ($fsize);
1894}
1895
1896sub set_max {
451 my ($self, $row) = @_; 1897 my ($self, $max) = @_;
452 1898
453 my $hs = 0; 1899 $self->{gauge}->set_max ($max);
454 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 1900 $self->{max}->set_text ($max);
455 my $c = $self->{childs}->[$row]->[$xi];
456 if ($c) {
457 my ($w, $h) = $c->size_request;
458 if ($hs < $h) { $hs = $h }
459 }
460 }
461 return $hs;
462} 1901}
463 1902
464sub max_col_width { 1903sub set_value {
465 my ($self, $col) = @_; 1904 my ($self, $val, $max) = @_;
466 1905
467 my $ws = 0; 1906 $self->set_max ($max)
468 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 1907 if defined $max;
469 my $c = ($self->{childs}->[$yi] || [])->[$col]; 1908
470 if ($c) { 1909 $self->{gauge}->set_value ($val, $max);
471 my ($w, $h) = $c->size_request; 1910 $self->{value}->set_text ($val);
472 if ($ws < $w) { $ws = $w } 1911}
1912
1913#############################################################################
1914
1915package CFClient::UI::Slider;
1916
1917use strict;
1918
1919use CFClient::OpenGL;
1920
1921our @ISA = CFClient::UI::DrawBG::;
1922
1923my @tex =
1924 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1925 qw(s1_slider.png s1_slider_bg.png);
1926
1927sub new {
1928 my $class = shift;
1929
1930 # range [value, low, high, page]
1931
1932 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off
1935 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1],
1937 active_fg => [0, 0, 0],
1938 range => [0, 0, 100, 10],
1939 req_w => 20,
1940 req_h => 20,
1941 vertical => 0,
1942 can_hover => 1,
1943 inner_pad => 5,
473 } 1944 @_
474 } 1945 );
475 return $ws; 1946
1947 $self
476} 1948}
477 1949
478sub size_request { 1950sub size_request {
479 my ($self) = @_; 1951 my ($self) = @_;
480 1952
481 my ($hs, $ws) = (0, 0); 1953 my $w = $self->{req_w};
1954 my $h = $self->{req_h};
482 1955
483 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 1956 $self->{vertical} ? ($h, $w) : ($w, $h)
484 $hs += $self->max_row_height ($yi); 1957}
485 }
486 1958
487 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 1959sub button_down {
488 my $wm = 0; 1960 my ($self, $ev, $x, $y) = @_;
489 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
490 $wm += $self->max_col_width ($xi)
491 }
492 if ($ws < $wm) { $ws = $wm }
493 }
494 1961
495 return ($ws, $hs); 1962 $self->SUPER::button_down ($ev, $x, $y);
1963 $self->mouse_motion ($ev, $x, $y);
1964}
1965
1966sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_;
1968
1969 if ($GRAB == $self) {
1970 my ($value, $lo, $hi, $page) = @{$self->{range}};
1971
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1973
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1976
1977 $x -= $inner_pad_px; # substract the padding
1978 $x = $x * ($hi - $lo) / $inner_w + $lo;
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982
1983 $self->emit (changed => $x);
1984 $self->update;
1985 }
1986}
1987
1988# the inner_* stuff is for generating a padding for the slider handle,
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
496} 1994}
497 1995
498sub _draw { 1996sub _draw {
499 my ($self) = @_; 1997 my ($self) = @_;
500 1998
501 my $y = 0; 1999 $self->SUPER::_draw ();
502 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
503 my $x = 0;
504 2000
505 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 2001 my ($w, $h) = @$self{qw(w h)};
506 2002
507 my $c = $self->{childs}->[$yi]->[$xi]; 2003 if ($self->{vertical}) {
508 if ($c) { 2004 # draw a vertical slider like a rotated horizontal slider
509 $c->move ($x, $y, 0); #TODO: Move to size_request 2005
510 $c->draw if $c; 2006 glRotate 90, 0, 0, 1;
511 } 2007 glTranslate 0, -$self->{w}, 0;
512 2008
513 $x += $self->max_col_width ($xi); 2009 ($w, $h) = ($h, $w);
2010 }
2011
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037
2038 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h);
2040
2041 # draw handle
2042 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
2043
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D;
2046}
2047
2048#############################################################################
2049
2050package CFClient::UI::TextView;
2051
2052our @ISA = CFClient::UI::HBox::;
2053
2054use CFClient::OpenGL;
2055
2056sub new {
2057 my $class = shift;
2058
2059 my $self = $class->SUPER::new (
2060 fontsize => 1,
2061 can_events => 0,
2062 #font => default_font
2063 @_,
2064
2065 layout => (new CFClient::Layout),
2066 par => [],
2067 height => 0,
2068 children => [
2069 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1),
514 } 2071 ],
2072 );
515 2073
516 $y += $self->max_row_height ($yi); 2074 $self->{children}[1]->connect (changed => sub {
2075 $self->update;
2076 });
2077
2078 $self
2079}
2080
2081sub set_fontsize {
2082 my ($self, $fontsize) = @_;
2083
2084 $self->{fontsize} = $fontsize;
2085 $self->reflow;
2086}
2087
2088sub text_height {
2089 my ($self, $text) = @_;
2090
2091 my $layout = $self->{layout};
2092
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w});
2095 $layout->set_text ($text);
517 } 2096
2097 ($layout->size)[1]
518} 2098}
519 2099
520package Crossfire::Client::Widget::VBox; 2100sub reflow {
2101 my ($self) = @_;
521 2102
522our @ISA = Crossfire::Client::Widget::Bin::; 2103 $self->{need_reflow}++;
523
524use SDL::OpenGL;
525
526sub add {
527 my ($self, $chld, $expand) = @_;
528 push @{$self->{childs}}, $chld;
529 $chld->{expand} = $expand;
530 $chld->set_parent ($self);
531 $self->update; 2104 $self->update;
532}
533
534sub size_request {
535 my ($self) = @_;
536
537 my ($hs, $ws) = (0, 0);
538 for (@{$self->{childs} || []}) {
539 my ($w, $h) = $_->size_request;
540 $hs += $h;
541 if ($ws < $w) { $ws = $w }
542 }
543
544 return ($ws, $hs);
545} 2105}
546 2106
547sub size_allocate { 2107sub size_allocate {
548 my ($self, $w, $h) = @_; 2108 my ($self, $w, $h) = @_;
549 2109
550 $self->w ($w); 2110 $self->SUPER::size_allocate ($w, $h);
551 $self->h ($h);
552 2111
553 my $exp; 2112 $self->{layout}->set_font ($self->{font}) if $self->{font};
554 my @oth; 2113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
555 # find expand widget 2114 $self->{layout}->set_width ($self->{children}[0]{w});
556 for (@{$self->{childs}}) { 2115
557 if ($_->{expand}) { 2116 $self->reflow;
558 $exp = $_; 2117}
2118
2119sub add_paragraph {
2120 my ($self, $color, $text) = @_;
2121
2122 #TODO: intelligently "reformat" paragraph
2123
2124 my $height = $self->text_height ($text);
2125
2126 $self->{height} += $height;
2127
2128 push @{$self->{par}}, [$height, $color, $text];
2129
2130 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2131 $self->{children}[1]->update;
2132}
2133
2134sub update {
2135 my ($self) = @_;
2136
2137 $self->SUPER::update;
2138
2139 return unless $self->{h} > 0;
2140
2141 delete $self->{texture};
2142
2143 $ROOT->on_refresh ($self, sub {
2144 if (delete $self->{need_reflow}) {
2145 my $height = 0;
2146
2147 $height += $_->[0] = $self->text_height ($_->[2])
2148 for @{$self->{par}};
2149
2150 $self->{height} = $height;
2151
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
559 last; 2153
2154 delete $self->{texture};
560 } 2155 }
561 push @oth, $_;
562 }
563 2156
564 my ($ow, $oh); 2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
2158 glClearColor 0, 0, 0, 1;
2159 glClear GL_COLOR_BUFFER_BIT;
565 2160
566 # get sizes of other widgets 2161 glEnable GL_BLEND;
567 for (@oth) { 2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
568 my ($w, $h) = $_->size_request; 2163 glEnable GL_TEXTURE_2D;
569 $oh += $h; 2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
570 if ($ow < $w) { $ow = $w }
571 }
572 2165
2166 my $top = int $self->{children}[1]{range}[0];
2167
2168 my $y0 = $top;
2169 my $y1 = $top + $self->{h};
2170
573 my $y = 0; 2171 my $y = 0;
574 for (@{$self->{childs}}) {
575 $_->move (0, $y);
576 2172
577 if ($_ == $exp) { 2173 my $layout = $self->{layout};
578 $_->size_allocate ($w, $h - $oh); 2174
579 $y += $h - $oh; 2175 $layout->set_font ($self->{font}) if $self->{font};
580 } else { 2176
581 my ($cw, $h) = $_->size_request; 2177 for my $par (@{$self->{par}}) {
582 $_->size_allocate ($w, $h); 2178 my $h = $par->[0];
2179
2180 if ($y0 < $y + $h && $y < $y1) {
2181 $layout->set_text ($par->[2]);
2182
2183 glColor @{ $par->[1] };
2184 my ($W, $H) = $layout->size;
2185 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
2186 }
2187
583 $y += $h; 2188 $y += $h;
2189 }
2190
2191 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND;
584 } 2193 };
585 } 2194 });
586} 2195}
587 2196
588sub _draw { 2197sub _draw {
589 my ($self) = @_; 2198 my ($self) = @_;
590 2199
591 my ($x, $y);
592 for (@{$self->{childs} || []}) {
593 $_->draw;
594 $y += $_->h;
595 }
596}
597
598package Crossfire::Client::Widget::Label;
599
600our @ISA = Crossfire::Client::Widget::;
601
602use SDL::OpenGL;
603
604sub new {
605 my ($class, $x, $y, $z, $height, $text) = @_;
606
607 # TODO: color, and make height, xyz etc. optional
608 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
609
610 $self->set_text ($text);
611
612 $self
613}
614
615sub set_text {
616 my ($self, $text) = @_;
617
618 $self->{text} = $text;
619 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
620
621 $self->update;
622}
623
624sub get_text {
625 my ($self, $text) = @_;
626
627 $self->{text} 2200 if ($self->{texture}) {
628}
629
630sub size_request {
631 my ($self) = @_;
632
633 (
634 $self->{texture}{width},
635 $self->{texture}{height},
636 )
637}
638
639sub _draw {
640 my ($self) = @_;
641
642 my $tex = $self->{texture};
643
644 glEnable GL_BLEND;
645 glEnable GL_TEXTURE_2D; 2201 glEnable GL_TEXTURE_2D;
646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
648 glBindTexture GL_TEXTURE_2D, $tex->{name};
649
650 glColor 1, 0, 0, 1; # TODO color
651
652 glBegin GL_QUADS;
653 glTexCoord 0, 0; glVertex 0 , 0;
654 glTexCoord 0, 1; glVertex 0 , $tex->{height};
655 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
656 glTexCoord 1, 0; glVertex $tex->{width}, 0;
657 glEnd;
658
659 glDisable GL_BLEND;
660 glDisable GL_TEXTURE_2D;
661}
662
663package Crossfire::Client::Widget::TextEntry;
664
665our @ISA = Crossfire::Client::Widget::Label::;
666
667use SDL;
668use SDL::OpenGL;
669
670sub key_down {
671 my ($self, $ev) = @_;
672
673 my $mod = $ev->key_mod;
674 my $sym = $ev->key_sym;
675
676 $ev->set_unicode (1);
677 my $uni = $ev->key_unicode;
678
679 my $text = $self->get_text;
680
681 if ($sym == SDLK_BACKSPACE) {
682 substr $text, -1, 1, '';
683
684 } elsif ($uni) {
685 $text .= chr $uni;
686 }
687 $self->set_text ($text);
688}
689
690package Crossfire::Client::Widget::MapWidget;
691
692use strict;
693
694use List::Util qw(min max);
695
696use SDL;
697use SDL::OpenGL;
698use SDL::OpenGL::Constants;
699
700our @ISA = Crossfire::Client::Widget::;
701
702sub key_down {
703 print "MAPKEYDOWN\n";
704}
705
706sub key_up {
707}
708
709sub size_request {
710
711}
712
713sub size_allocate {
714}
715
716sub _draw {
717 my ($self) = @_;
718
719 my $mx = $::CONN->{mapx};
720 my $my = $::CONN->{mapy};
721
722 my $map = $::CONN->{map};
723
724 my ($xofs, $yofs);
725
726 my $sw = 1 + int $::WIDTH / 32;
727 my $sh = 1 + int $::HEIGHT / 32;
728
729 if ($::CONN->{mapw} > $sw) {
730 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
731 } else {
732 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
733 }
734
735 if ($::CONN->{maph} > $sh) {
736 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
737 } else {
738 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
739 }
740
741 glEnable GL_TEXTURE_2D;
742 glEnable GL_BLEND;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 2203 glColor 1, 1, 1, 1;
745 my $sw4 = ($sw + 3) & ~3; 2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
746 my $lighting = "\x00" x ($sw4 * $sh);
747
748 for my $x (0 .. $sw - 1) {
749 for my $y (0 .. $sh - 1) {
750
751 my $cell = $map->[$x + $xofs][$y + $yofs]
752 or next;
753
754 my $darkness = $cell->[0] * (1 / 255);
755 if ($darkness < 0) {
756 $darkness = 0.15;
757 }
758 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
759
760 for my $num (grep $_, @$cell[1,2,3]) {
761 my $tex = $::CONN->{face}[$num]{texture} || next;
762
763 glBindTexture GL_TEXTURE_2D, $tex->{name};
764
765 my $w = $tex->{width};
766 my $h = $tex->{height};
767
768 my $px = ($x + 1) * 32 - $w;
769 my $py = ($y + 1) * 32 - $h;
770
771 glBegin GL_QUADS;
772 glTexCoord 0, 0; glVertex $px , $py;
773 glTexCoord 0, 1; glVertex $px , $py + $h;
774 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
775 glTexCoord 1, 0; glVertex $px + $w, $py;
776 glEnd;
777 }
778 }
779 }
780
781# if (1) { # higher quality darkness
782# $lighting =~ s/(.)/$1$1$1/gs;
783# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
784#
785# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
786#
787# $lighting = $pb->get_pixels;
788# $lighting =~ s/(.)../$1/gs;
789# }
790
791 $lighting = new Crossfire::Client::Texture
792 width => $sw4,
793 height => $sh,
794 data => $lighting,
795 internalformat => GL_ALPHA4,
796 format => GL_ALPHA;
797
798 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
799 glColor 0, 0, 0, 0.75;
800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
801 glBindTexture GL_TEXTURE_2D, $lighting->{name};
802 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
803 glBegin GL_QUADS;
804 glTexCoord 0, 0; glVertex 0 , 0;
805 glTexCoord 0, 1; glVertex 0 , $sh * 32;
806 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
807 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
808 glEnd;
809
810 glDisable GL_TEXTURE_2D; 2205 glDisable GL_TEXTURE_2D;
811 glDisable GL_BLEND;
812}
813
814my %DIR = (
815 SDLK_KP8, [1, "north"],
816 SDLK_KP9, [2, "northeast"],
817 SDLK_KP6, [3, "east"],
818 SDLK_KP3, [4, "southeast"],
819 SDLK_KP2, [5, "south"],
820 SDLK_KP1, [6, "southwest"],
821 SDLK_KP4, [7, "west"],
822 SDLK_KP7, [8, "northwest"],
823
824 SDLK_UP, [1, "north"],
825 SDLK_RIGHT, [3, "east"],
826 SDLK_DOWN, [5, "south"],
827 SDLK_LEFT, [7, "west"],
828);
829
830sub key_down {
831 my ($self, $ev) = @_;
832
833 my $mod = $ev->key_mod;
834 my $sym = $ev->key_sym;
835
836 if ($sym == SDLK_KP5) {
837 $::CONN->send ("command stay fire");
838 } elsif (exists $DIR{$sym}) {
839 if ($mod & KMOD_SHIFT) {
840 $self->{shft}++;
841 $::CONN->send ("command fire $DIR{$sym}[0]");
842 } elsif ($mod & KMOD_CTRL) {
843 $self->{ctrl}++;
844 $::CONN->send ("command run $DIR{$sym}[0]");
845 } else {
846 $::CONN->send ("command $DIR{$sym}[1]");
847 }
848 } 2206 }
849}
850 2207
851sub key_up { 2208 $self->{children}[1]->draw;
852 my ($self, $ev) = @_;
853 2209
854 my $mod = $ev->key_mod;
855 my $sym = $ev->key_sym;
856
857 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
858 $::CONN->send ("command fire_stop");
859 }
860 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
861 $::CONN->send ("command run_stop");
862 }
863} 2210}
864 2211
865package Crossfire::Client::Widget::Animator; 2212#############################################################################
866 2213
867use SDL::OpenGL; 2214package CFClient::UI::Animator;
868 2215
869our @ISA = Crossfire::Client::Widget::Bin::; 2216use CFClient::OpenGL;
2217
2218our @ISA = CFClient::UI::Bin::;
870 2219
871sub moveto { 2220sub moveto {
872 my ($self, $x, $y) = @_; 2221 my ($self, $x, $y) = @_;
873 2222
874 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2223 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
875 $self->{speed} = 0.2; 2224 $self->{speed} = 0.001;
876 $self->{time} = 1; 2225 $self->{time} = 1;
877 2226
878 ::animation_start $self; 2227 ::animation_start $self;
879} 2228}
880 2229
895 2244
896sub _draw { 2245sub _draw {
897 my ($self) = @_; 2246 my ($self) = @_;
898 2247
899 glPushMatrix; 2248 glPushMatrix;
900 glRotate $self->{time} * 10000, 0, 1, 0; 2249 glRotate $self->{time} * 1000, 0, 1, 0;
901 $self->{child}->draw; 2250 $self->{children}[0]->draw;
902 glPopMatrix; 2251 glPopMatrix;
903} 2252}
904 2253
9051; 2254#############################################################################
906 2255
2256package CFClient::UI::Flopper;
2257
2258our @ISA = CFClient::UI::Button::;
2259
2260sub new {
2261 my $class = shift;
2262
2263 my $self = $class->SUPER::new (
2264 state => 0,
2265 connect_activate => \&toggle_flopper,
2266 @_
2267 );
2268
2269 if ($self->{state}) {
2270 $self->{state} = 0;
2271 $self->toggle_flopper;
2272 }
2273
2274 $self
2275}
2276
2277sub toggle_flopper {
2278 my ($self) = @_;
2279
2280 # TODO: use animation
2281 if ($self->{state} = !$self->{state}) {
2282 $CFClient::UI::ROOT->add ($self->{other});
2283 $self->{other}->move ($self->coord2global (0, $self->{h}));
2284 $self->emit ("open");
2285 } else {
2286 $CFClient::UI::ROOT->remove ($self->{other});
2287 $self->emit ("close");
2288 }
2289
2290 $self->emit (changed => $self->{state});
2291}
2292
2293#############################################################################
2294
2295package CFClient::UI::Tooltip;
2296
2297our @ISA = CFClient::UI::Bin::;
2298
2299use CFClient::OpenGL;
2300
2301sub new {
2302 my $class = shift;
2303
2304 $class->SUPER::new (
2305 @_,
2306 can_events => 0,
2307 )
2308}
2309
2310sub set_markup {
2311 my ($self, $text) = @_;
2312
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2314 $self->{label}->set_markup ($text);
2315 $self->add ($self->{label});
2316}
2317
2318sub size_request {
2319 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324
2325 ($w + 4, $h + 4)
2326}
2327
2328sub size_allocate {
2329 my ($self, $w, $h) = @_;
2330
2331 $self->SUPER::size_allocate ($w - 4, $h - 4);
2332}
2333
2334sub _draw {
2335 my ($self) = @_;
2336
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375;
2339
2340 my ($w, $h) = @$self{qw(w h)};
2341
2342 glColor 1, 0.8, 0.4;
2343 glBegin GL_QUADS;
2344 glVertex 0 , 0;
2345 glVertex 0 , $h;
2346 glVertex $w, $h;
2347 glVertex $w, 0;
2348 glEnd;
2349
2350 glColor 0, 0, 0;
2351 glBegin GL_LINE_LOOP;
2352 glVertex 0 , 0;
2353 glVertex 0 , $h;
2354 glVertex $w, $h;
2355 glVertex $w, 0;
2356 glEnd;
2357
2358 glPopMatrix;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw;
2362}
2363
2364#############################################################################
2365
2366package CFClient::UI::Face;
2367
2368our @ISA = CFClient::UI::Base::;
2369
2370use CFClient::OpenGL;
2371
2372sub new {
2373 my $class = shift;
2374
2375 $class->SUPER::new (
2376 aspect => 1,
2377 @_,
2378 )
2379}
2380
2381sub size_request {
2382 (32, 8)
2383}
2384
2385sub draw {
2386 my ($self) = @_;
2387
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389
2390 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 }
2400}
2401
2402#############################################################################
2403
2404package CFClient::UI::Root;
2405
2406our @ISA = CFClient::UI::Container::;
2407
2408use CFClient::OpenGL;
2409
2410sub check_size {
2411 my ($self) = @_;
2412
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2414}
2415
2416sub size_request {
2417 ($::WIDTH, $::HEIGHT)
2418}
2419
2420sub configure {
2421 my ($self, $x, $y, $w, $h) = @_;
2422
2423 $self->SUPER::configure ($x, $y, $w, $h);
2424
2425 for my $child (@{$self->{children}}) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2430 $child->configure ($X, $Y, $W,$H);
2431 }
2432}
2433
2434sub _topleft {
2435 my ($self, $x, $y) = @_;
2436
2437 ($x, $y)
2438}
2439
2440sub update {
2441 my ($self) = @_;
2442
2443 $self->check_size;
2444 ::refresh ();
2445}
2446
2447sub add {
2448 my ($self, $child) = @_;
2449
2450 # integerize window positions
2451 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y};
2453
2454 $self->SUPER::add ($child);
2455}
2456
2457sub on_refresh {
2458 my ($self, $id, $cb) = @_;
2459
2460 $self->{refresh_hook}{$id} = $cb;
2461}
2462
2463sub draw {
2464 my ($self) = @_;
2465
2466 while (my $rcb = delete $self->{refresh_hook}) {
2467 $_->() for values %$rcb;
2468 }
2469
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT;
2473
2474 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2477 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity;
2479
2480 $self->_draw;
2481}
2482
2483#############################################################################
2484
2485package CFClient::UI;
2486
2487$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip;
2489
24901
2491

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines