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.53 by root, Mon Apr 10 11:56:28 2006 UTC vs.
Revision 1.91 by root, Wed Apr 12 23:15:39 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
10use Crossfire::Client;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $TOPLEVEL;
15our $BUTTON_STATE; 13our $BUTTON_STATE;
… …
34 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
35 } 33 }
36 34
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
38 36
39 $GRAB->button_down ($ev) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40} 38}
41 39
42sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
43 my ($ev) = @_; 41 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
65 65
66 $hover->update if $hover; 66 $hover->update if $hover;
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER;
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71} 71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
72 80
73sub new { 81sub new {
74 my $class = shift; 82 my $class = shift;
75 83
76 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
77} 100}
78 101
79sub move { 102sub move {
80 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
81 $self->{x} = $x; 104 $self->{x} = $x;
… …
90sub size_request { 113sub size_request {
91 require Carp; 114 require Carp;
92 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
93} 116}
94 117
95sub size_allocate { 118sub _size_allocate {
96 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
97 125
98 $self->{w} = $w; 126 $self->{w} = $w;
99 $self->{h} = $h; 127 $self->{h} = $h;
128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
138# translate global coordinates to local coordinate system
139sub translate {
140 my ($self, $x, $y) = @_;
141
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
100} 143}
101 144
102sub focus_in { 145sub focus_in {
103 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
104 149
105 my $focus = $FOCUS; $FOCUS = $self; 150 my $focus = $FOCUS; $FOCUS = $self;
106 $focus->update if $focus; 151 $focus->update if $focus;
107 $FOCUS->update; 152 $FOCUS->update;
108} 153}
… …
116 $focus->update if $focus; #? 161 $focus->update if $focus; #?
117} 162}
118 163
119sub mouse_motion { } 164sub mouse_motion { }
120sub button_up { } 165sub button_up { }
121sub button_down { }
122sub key_down { } 166sub key_down { }
123sub key_up { } 167sub key_up { }
168
169sub button_down {
170 my ($self, $ev, $x, $y) = @_;
171
172 $self->focus_in;
173}
124 174
125sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 175sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
126sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 176sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
127sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 177sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
128sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 178sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
129sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 179sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
130 180
131sub draw { 181sub draw {
132 my ($self) = @_; 182 my ($self) = @_;
133 183
184 return unless $self->{h} && $self->{w};
185
134 glPushMatrix; 186 glPushMatrix;
135 glTranslate $self->{x}, $self->{y}, 0; 187 glTranslate $self->{x}, $self->{y}, 0;
136 $self->_draw; 188 $self->_draw;
189 glPopMatrix;
190
137 if ($self == $HOVER) { 191 if ($self == $HOVER) {
138 glColor 1, 1, 1, 0.4; 192 my ($x, $y) = @$self{qw(x y)};
193
194 glColor 0, 0, 1, 0.2;
139 glEnable GL_BLEND; 195 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
140 glBegin GL_QUADS; 197 glBegin GL_QUADS;
141 glVertex 0 , 0; 198 glVertex $x , $y;
142 glVertex $self->{w}, 0; 199 glVertex $x + $self->{w}, $y;
143 glVertex $self->{w}, $self->{h}; 200 glVertex $x + $self->{w}, $y + $self->{h};
144 glVertex 0 , $self->{h}; 201 glVertex $x , $y + $self->{h};
145 glEnd; 202 glEnd;
146 glDisable GL_BLEND; 203 glDisable GL_BLEND;
147 } 204 }
148 glPopMatrix;
149} 205}
150 206
151sub _draw { 207sub _draw {
152 my ($self) = @_; 208 my ($self) = @_;
153 209
154 warn "no draw defined for $self\n"; 210 warn "no draw defined for $self\n";
155}
156
157sub bbox {
158 my ($self) = @_;
159 my ($w, $h) = $self->size_request;
160 (
161 $self->{x},
162 $self->{y},
163 $self->{x} = $w,
164 $self->{y} = $h
165 )
166} 211}
167 212
168sub find_widget { 213sub find_widget {
169 my ($self, $x, $y) = @_; 214 my ($self, $x, $y) = @_;
170 215
… …
173 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
174 219
175 () 220 ()
176} 221}
177 222
178sub del_parent { $_[0]->{parent} = undef }
179
180sub set_parent { 223sub set_parent {
181 my ($self, $par) = @_; 224 my ($self, $par) = @_;
182 225
183 $self->{parent} = $par; 226 $self->{parent} = $par;
184 Scalar::Util::weaken $self->{parent}; 227 Scalar::Util::weaken $self->{parent};
… …
193 236
194 $self->{parent}->update 237 $self->{parent}->update
195 if $self->{parent}; 238 if $self->{parent};
196} 239}
197 240
241sub connect {
242 my ($self, $signal, $cb) = @_;
243
244 push @{ $self->{cb}{$signal} }, $cb;
245}
246
247sub emit {
248 my ($self, $signal, @args) = @_;
249
250 $_->($self, @args)
251 for @{$self->{cb}{$signal} || []};
252}
253
198sub DESTROY { 254sub DESTROY {
199 my ($self) = @_; 255 my ($self) = @_;
200 256
201 #$self->deactivate; 257 #$self->deactivate;
202} 258}
203 259
204############################################################################# 260#############################################################################
205 261
206package Crossfire::Client::Widget::Container; 262package CFClient::UI::DrawBG;
207 263
208our @ISA = Crossfire::Client::Widget::; 264our @ISA = CFClient::UI::Base::;
265
266use strict;
267use SDL::OpenGL;
209 268
210sub new { 269sub new {
270 my $class = shift;
271
272 # range [value, low, high, page]
273
274 $class->SUPER::new (
275 bg => [0, 0, 0, 0.2],
276 active_bg => [1, 1, 1, 0.5],
277 @_
278 )
279}
280
281sub _draw {
282 my ($self) = @_;
283
284 my ($w, $h) = @$self{qw(w h)};
285
286 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
289
290 glBegin GL_QUADS;
291 glVertex 0 , 0;
292 glVertex 0 , $h;
293 glVertex $w, $h;
294 glVertex $w, 0;
295 glEnd;
296
297 glDisable GL_BLEND;
298}
299
300#############################################################################
301
302package CFClient::UI::Empty;
303
304our @ISA = CFClient::UI::Base::;
305
306sub size_request {
307 (0, 0)
308}
309
310sub draw { }
311
312#############################################################################
313
314package CFClient::UI::Container;
315
316our @ISA = CFClient::UI::Base::;
317
318sub new {
211 my ($class, @widgets) = @_; 319 my ($class, %arg) = @_;
212 320
321 my $children = delete $arg{children} || [];
322
213 my $self = $class->SUPER::new (children => []); 323 my $self = $class->SUPER::new (children => [], %arg);
214 $self->add ($_) for @widgets; 324 $self->add ($_) for @$children;
215 325
216 $self 326 $self
217} 327}
218 328
219sub add { 329sub add {
220 my ($self, $chld, $expand) = @_; 330 my ($self, $chld) = @_;
221 331
222 $chld->{expand} = $expand;
223 $chld->set_parent ($self); 332 $chld->set_parent ($self);
224 333
225 @{$self->{children}} = 334 $self->{children} = [
226 sort { $a->{z} <=> $b->{z} } 335 sort { $a->{z} <=> $b->{z} }
227 @{$self->{children}}, $chld; 336 @{$self->{children}}, $chld
337 ];
228 338
229 $self->size_allocate ($self->{w}, $self->{h}) 339 $self->{w} = $self->{h} = -1;
230 if $self->{w}; #TODO: check for "realised state" 340 $self->update;
231} 341}
232 342
233sub remove { 343sub remove {
234 my ($self, $widget) = @_; 344 my ($self, $widget) = @_;
235 345
236 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
237 347
238 $self->size_allocate ($self->{w}, $self->{h}); 348 $self->size_allocate (0, 0, $self->{w}, $self->{h});
239} 349}
240 350
241sub find_widget { 351sub find_widget {
242 my ($self, $x, $y) = @_; 352 my ($self, $x, $y) = @_;
243 353
… …
260 $_->draw for @{$self->{children}}; 370 $_->draw for @{$self->{children}};
261} 371}
262 372
263############################################################################# 373#############################################################################
264 374
265package Crossfire::Client::Widget::Bin; 375package CFClient::UI::Bin;
266 376
267our @ISA = Crossfire::Client::Widget::Container::; 377our @ISA = CFClient::UI::Container::;
378
379sub new {
380 my ($class, %arg) = @_;
381
382 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
383
384 $class->SUPER::new (children => [$child], %arg)
385}
386
387sub add {
388 my ($self, $widget) = @_;
389
390 $self->{children} = [];
391
392 $self->SUPER::add ($widget);
393}
394
395sub remove {
396 my ($self, $widget) = @_;
397
398 $self->SUPER::remove ($widget);
399
400 $self->{children} = [new CFClient::UI::Empty]
401 unless @{$self->{children}};
402}
268 403
269sub child { $_[0]->{children}[0] } 404sub child { $_[0]->{children}[0] }
270 405
271sub size_request { 406sub size_request {
272 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 407 $_[0]{children}[0]->size_request
273} 408}
274 409
275sub size_allocate { 410sub size_allocate {
276 my ($self, $w, $h) = @_; 411 my ($self, $x, $y, $w, $h) = @_;
277 412
278 $self->SUPER::size_allocate ($w, $h); 413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
279 $self->{children}[0]->size_allocate ($w, $h) 415 $self->{children}[0]->size_allocate (0, 0, $w, $h);
280 if $self->{children}[0]
281} 416}
282 417
283############################################################################# 418#############################################################################
284 419
285package Crossfire::Client::Widget::Window; 420package CFClient::UI::Window;
286 421
287our @ISA = Crossfire::Client::Widget::Bin::; 422our @ISA = CFClient::UI::Bin::;
288 423
289use SDL::OpenGL; 424use SDL::OpenGL;
290 425
291sub new { 426sub new {
292 my ($class, $x, $y, $z, $w, $h) = @_; 427 my ($class, %arg) = @_;
293 428
294 my $self = $class->SUPER::new; 429 my $self = $class->SUPER::new (%arg);
295
296 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297} 430}
298 431
299sub update { 432sub update {
300 my ($self) = @_; 433 my ($self) = @_;
301 434
435 # we want to do this delayed...
302 $self->render_chld; 436 $self->render_chld;
303 $self->SUPER::update; 437 $self->SUPER::update;
304} 438}
305 439
306sub render_chld { 440sub render_chld {
307 my ($self) = @_; 441 my ($self) = @_;
308 442
309 $self->{texture} = 443 $self->{texture} =
310 Crossfire::Client::Texture->new_from_opengl ( 444 CFClient::Texture->new_from_opengl (
311 $self->{w}, $self->{h}, sub { $self->child->draw } 445 $self->{w}, $self->{h}, sub { $self->child->draw }
312 ); 446 );
313} 447}
314 448
315sub size_allocate { 449sub size_allocate {
316 my ($self, $w, $h) = @_; 450 my ($self, $x, $y, $w, $h) = @_;
317 451
318 $self->{w} = $w; 452 $self->_size_allocate ($x, $y, $w, $h) or return;
319 $self->{h} = $h;
320 453
321 $self->child->size_allocate ($w, $h); 454 $self->child->size_allocate (0, 0, $w, $h);
322 455
323 $self->render_chld; 456 $self->render_chld;
324} 457}
325 458
326sub _draw { 459sub _draw {
… …
330 463
331 my $tex = $self->{texture} 464 my $tex = $self->{texture}
332 or return; 465 or return;
333 466
334 glEnable GL_BLEND; 467 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glEnable GL_TEXTURE_2D; 469 glEnable GL_TEXTURE_2D;
336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337 glBindTexture GL_TEXTURE_2D, $tex->{name};
338 471
339 glBegin GL_QUADS; 472 $tex->draw_quad (0, 0, $w, $h);
340 glTexCoord 0, 0; glVertex 0, 0;
341 glTexCoord 0, 1; glVertex 0, $h;
342 glTexCoord 1, 1; glVertex $w, $h;
343 glTexCoord 1, 0; glVertex $w, 0;
344 glEnd;
345 473
346 glDisable GL_BLEND; 474 glDisable GL_BLEND;
347 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
348} 476}
349 477
350############################################################################# 478#############################################################################
351 479
352package Crossfire::Client::Widget::Frame; 480package CFClient::UI::Frame;
353 481
354our @ISA = Crossfire::Client::Widget::Bin::; 482our @ISA = CFClient::UI::Bin::;
355 483
356use SDL::OpenGL; 484use SDL::OpenGL;
357 485
358sub size_request { 486sub size_request {
359 my ($self) = @_; 487 my ($self) = @_;
… …
364 492
365 map { $_ + 4 } $chld->size_request; 493 map { $_ + 4 } $chld->size_request;
366} 494}
367 495
368sub size_allocate { 496sub size_allocate {
369 my ($self, $w, $h) = @_; 497 my ($self, $x, $y, $w, $h) = @_;
370 498
371 $self->{w} = $w; 499 $self->_size_allocate ($x, $y, $w, $h) or return;
372 $self->{h} = $h;
373 500
374 $self->child->size_allocate ($w - 4, $h - 4); 501 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
375 $self->child->move (2, 2);
376} 502}
377 503
378sub _draw { 504sub _draw {
379 my ($self) = @_; 505 my ($self) = @_;
380 506
… …
382 508
383 my ($w, $h) = $chld->size_request; 509 my ($w, $h) = $chld->size_request;
384 510
385 glBegin GL_QUADS; 511 glBegin GL_QUADS;
386 glColor 0, 0, 0; 512 glColor 0, 0, 0;
387 glTexCoord 0, 0; glVertex 0 , 0; 513 glVertex 0 , 0;
388 glTexCoord 0, 1; glVertex 0 , $h + 4; 514 glVertex 0 , $h + 4;
389 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 515 glVertex $w + 4 , $h + 4;
390 glTexCoord 1, 0; glVertex $w + 4 , 0; 516 glVertex $w + 4 , 0;
391 glEnd; 517 glEnd;
392 518
393 $chld->draw; 519 $chld->draw;
394} 520}
395 521
396############################################################################# 522#############################################################################
397 523
398package Crossfire::Client::Widget::FancyFrame; 524package CFClient::UI::FancyFrame;
399 525
400our @ISA = Crossfire::Client::Widget::Bin::; 526our @ISA = CFClient::UI::Bin::;
401 527
402use SDL::OpenGL; 528use SDL::OpenGL;
403 529
404my @tex = 530my @tex =
405 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
406 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
407 533
408sub size_request { 534sub size_request {
409 my ($self) = @_; 535 my ($self) = @_;
410 536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
411 my ($w, $h) = $self->SUPER::size_request; 539 my ($w, $h) = $self->SUPER::size_request;
412 540
413 $h += $tex[1]->{height}; 541 $h += $tex[1]->{h};
414 $h += $tex[4]->{height}; 542 $h += $tex[4]->{h};
415 $w += $tex[2]->{width}; 543 $w += $tex[2]->{w};
416 $w += $tex[3]->{width}; 544 $w += $tex[3]->{w};
417 545
418 ($w, $h) 546 ($w, $h)
419} 547}
420 548
421sub size_allocate { 549sub size_allocate {
422 my ($self, $w, $h) = @_; 550 my ($self, $x, $y, $w, $h) = @_;
423 551
424 $self->SUPER::size_allocate ($w, $h); 552 $self->_size_allocate ($x, $y, $w, $h) or return;
425 553
426 $h -= $tex[1]->{height}; 554 $h -= $tex[1]{h};
427 $h -= $tex[4]->{height}; 555 $h -= $tex[4]{h};
428 $w -= $tex[2]->{width}; 556 $w -= $tex[2]{w};
429 $w -= $tex[3]->{width}; 557 $w -= $tex[3]{w};
430 558
431 $h = $h < 0 ? 0 : $h; 559 $h = $h < 0 ? 0 : $h;
432 $w = $w < 0 ? 0 : $w; 560 $w = $w < 0 ? 0 : $w;
433 561
434 $self->child->size_allocate ($w, $h); 562 my $child = $self->child;
435 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
436} 613}
437 614
438sub _draw { 615sub _draw {
439 my ($self) = @_; 616 my ($self) = @_;
440 617
441 my ($w, $h) = ($self->{w}, $self->{h}); 618 my ($w, $h) = ($self->{w}, $self->{h});
442 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
443 620
444 glEnable GL_BLEND; 621 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
445 glEnable GL_TEXTURE_2D; 623 glEnable GL_TEXTURE_2D;
446 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
448 625
449 my $top = $tex[1]; 626 my $top = $tex[1];
450 glBindTexture GL_TEXTURE_2D, $top->{name}; 627 $top->draw_quad (0, 0, $w, $top->{h});
451
452 glBegin GL_QUADS;
453 glTexCoord 0, 0; glVertex 0 , 0;
454 glTexCoord 0, 1; glVertex 0 , $top->{height};
455 glTexCoord 1, 1; glVertex $w , $top->{height};
456 glTexCoord 1, 0; glVertex $w , 0;
457 glEnd;
458 628
459 my $left = $tex[3]; 629 my $left = $tex[3];
460 glBindTexture GL_TEXTURE_2D, $left->{name}; 630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
461
462 glBegin GL_QUADS;
463 glTexCoord 0, 0; glVertex 0 , $top->{height};
464 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
465 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
466 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
467 glEnd;
468 631
469 my $right = $tex[2]; 632 my $right = $tex[2];
470 glBindTexture GL_TEXTURE_2D, $right->{name}; 633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
471
472 glBegin GL_QUADS;
473 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
474 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
475 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
476 glTexCoord 1, 0; glVertex $w , $top->{height};
477 glEnd;
478 634
479 my $bottom = $tex[4]; 635 my $bottom = $tex[4];
480 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
481
482 glBegin GL_QUADS;
483 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
484 glTexCoord 0, 1; glVertex 0 , $h;
485 glTexCoord 1, 1; glVertex $w , $h;
486 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
487 glEnd;
488 637
489 my $bg = $tex[0]; 638 my $bg = $tex[0];
639
490 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
491 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
492 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
493 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
494 642
495 my $rep_x = $cw / $bg->{width}; 643 my $rep_x = $cw / $bg->{w};
496 my $rep_y = $ch / $bg->{height}; 644 my $rep_y = $ch / $bg->{h};
497 645
498 glBegin GL_QUADS; 646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
499 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
500 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
501 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
502 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
503 glEnd;
504 647
648 glDisable GL_TEXTURE_2D;
505 glDisable GL_BLEND; 649 glDisable GL_BLEND;
506 glDisable GL_TEXTURE_2D;
507 650
508 $self->child->draw; 651 $self->child->draw;
509 652
510} 653}
511 654
512############################################################################# 655#############################################################################
513 656
514package Crossfire::Client::Widget::Table; 657package CFClient::UI::Table;
515 658
516our @ISA = Crossfire::Client::Widget::Bin::; 659our @ISA = CFClient::UI::Base::;
660
661use List::Util qw(max sum);
517 662
518use SDL::OpenGL; 663use SDL::OpenGL;
664
665sub new {
666 my $class = shift;
667
668 $class->SUPER::new (
669 col_expand => [],
670 @_
671 )
672}
519 673
520sub add { 674sub add {
521 my ($self, $x, $y, $chld) = @_; 675 my ($self, $x, $y, $chld) = @_;
522 my $old_chld = $self->{children}[$y][$x];
523 676
524 $self->{children}[$y][$x] = $chld; 677 $self->{children}[$y][$x] = $chld;
525 $chld->set_parent ($self); 678 $chld->set_parent ($self);
679
680 $self->{w} = $self->{h} = -1;
526 $self->update; 681 $self->update;
527} 682}
528 683
529sub max_row_height { 684sub get_wh {
530 my ($self, $row) = @_; 685 my ($self) = @_;
531 686
532 my $hs = 0; 687 my (@w, @h);
533 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 688
689 for my $y (0 .. $#{$self->{children}}) {
534 my $c = $self->{children}->[$row]->[$xi]; 690 my $row = $self->{children}[$y]
535 if ($c) { 691 or next;
692
693 for my $x (0 .. $#$row) {
694 my $widget = $row->[$x]
695 or next;
536 my ($w, $h) = $c->size_request; 696 my ($w, $h) = $widget->size_request;
537 if ($hs < $h) { $hs = $h } 697
698 $w[$x] = max $w[$x], $w;
699 $h[$y] = max $h[$y], $h;
538 } 700 }
539 } 701 }
540 return $hs;
541}
542 702
543sub max_col_width { 703 (\@w, \@h)
704}
705
706sub size_request {
544 my ($self, $col) = @_; 707 my ($self) = @_;
545 708
709 my ($ws, $hs) = $self->get_wh;
710
711 (
712 (sum @$ws),
713 (sum @$hs),
714 )
715}
716
717sub size_allocate {
718 my ($self, $x, $y, $w, $h) = @_;
719
720 $self->_size_allocate ($x, $y, $w, $h) or return;
721
722 my ($ws, $hs) = $self->get_wh;
723
724 my $req_w = sum @$ws;
725 my $req_h = sum @$hs;
726
727 # TODO: nicer code && do row_expand
728 my @col_expand = @{$self->{col_expand}};
729 @col_expand = (1) x @$ws unless @col_expand;
730 my $col_expand = (sum @col_expand) || 1;
731
732 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
735
736 my $y;
737
738 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r]
740 or next;
741
546 my $ws = 0; 742 my $x = 0;
547 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 743 my $row_h = $hs->[$r];
548 my $c = ($self->{children}->[$yi] || [])->[$col]; 744
549 if ($c) { 745 for my $c (0 .. $#$row) {
550 my ($w, $h) = $c->size_request; 746 my $col_w = $ws->[$c];
551 if ($ws < $w) { $ws = $w } 747
748 if (my $widget = $row->[$c]) {
749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
751
752 $x += $col_w;
552 } 753 }
754
755 $y += $row_h;
553 } 756 }
554 return $ws; 757
555} 758}
759
760sub find_widget {
761 my ($self, $x, $y) = @_;
762
763 $x -= $self->{x};
764 $y -= $self->{y};
765
766 my $res;
767
768 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
769 $res = $_->find_widget ($x, $y)
770 and return $res;
771 }
772
773 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
774}
775
776sub _draw {
777 my ($self) = @_;
778
779 for (grep $_, @{$self->{children}}) {
780 $_->draw for grep $_, @$_;
781 }
782}
783
784#############################################################################
785
786package CFClient::UI::HBox;
787
788# TODO: wrap into common Box base class
789
790our @ISA = CFClient::UI::Container::;
556 791
557sub size_request { 792sub size_request {
558 my ($self) = @_; 793 my ($self) = @_;
559 794
795 my @alloc = map [$_->size_request], @{$self->{children}};
796
797 (
798 (List::Util::sum map $_->[0], @alloc),
799 (List::Util::max map $_->[1], @alloc),
800 )
801}
802
803sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_;
805
806 $self->_size_allocate ($x, $y, $w, $h);
807
560 my ($hs, $ws) = (0, 0); 808 ($h, $w) = ($w, $h);
561 809
562 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 810 my $children = $self->{children};
563 $hs += $self->max_row_height ($yi);
564 }
565 811
566 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 812 my @h = map +($_->size_request)[0], @$children;
567 my $wm = 0; 813
568 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 814 my $req_h = List::Util::sum @h;
569 $wm += $self->max_col_width ($xi) 815
816 if ($req_h > $h) {
817 # ah well, not enough space
818 $_ *= $h / $req_h for @h;
819 } else {
820 my $exp = List::Util::sum map $_->{expand}, @$children;
821 $exp ||= 1;
822
823 for (0 .. $#$children) {
824 my $child = $children->[$_];
825
826 my $alloc_h = $h[$_];
827 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
828 $h[$_] = $alloc_h;
570 } 829 }
571 if ($ws < $wm) { $ws = $wm }
572 } 830 }
573
574 return ($ws, $hs);
575}
576
577sub _draw {
578 my ($self) = @_;
579 831
580 my $y = 0; 832 my $y = 0;
581 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 833 for (0 .. $#$children) {
834 my $child = $children->[$_];
582 my $x = 0; 835 my $h = $h[$_];
836 $child->size_allocate ($y, 0, $h, $w);
583 837
584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 838 $y += $h;
585
586 my $c = $self->{children}->[$yi]->[$xi];
587 if ($c) {
588 $c->move ($x, $y, 0); #TODO: Move to size_request
589 $c->draw if $c;
590 }
591
592 $x += $self->max_col_width ($xi);
593 }
594
595 $y += $self->max_row_height ($yi);
596 } 839 }
597} 840}
598 841
599############################################################################# 842#############################################################################
600 843
601package Crossfire::Client::Widget::VBox; 844package CFClient::UI::VBox;
602 845
846# TODO: wrap into common Box base class
847
603our @ISA = Crossfire::Client::Widget::Container::; 848our @ISA = CFClient::UI::Container::;
604
605use SDL::OpenGL;
606 849
607sub size_request { 850sub size_request {
608 my ($self) = @_; 851 my ($self) = @_;
609 852
610 my @alloc = map [$_->size_request], @{$self->{children}}; 853 my @alloc = map [$_->size_request], @{$self->{children}};
… …
614 (List::Util::sum map $_->[1], @alloc), 857 (List::Util::sum map $_->[1], @alloc),
615 ) 858 )
616} 859}
617 860
618sub size_allocate { 861sub size_allocate {
619 my ($self, $w, $h) = @_; 862 my ($self, $x, $y, $w, $h) = @_;
620 863
621 $self->w ($w); 864 $self->_size_allocate ($x, $y, $w, $h);
622 $self->h ($h);
623 865
624 my $exp; 866 my $children = $self->{children};
625 my @oth; 867
626 # find expand widget 868 my @h = map +($_->size_request)[1], @$children;
627 for (@{$self->{children}}) { 869
628 if ($_->{expand}) { 870 my $req_h = List::Util::sum @h;
871
872 if ($req_h > $h) {
873 # ah well, not enough space
874 $_ *= $h / $req_h for @h;
875 } else {
876 my $exp = List::Util::sum map $_->{expand}, @$children;
629 $exp = $_; 877 $exp ||= 1;
630 last; 878
879 for (0 .. $#$children) {
880 my $child = $children->[$_];
881
882 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
631 } 883 }
632 push @oth, $_;
633 }
634
635 my ($ow, $oh);
636
637 # get sizes of other widgets
638 for (@oth) {
639 my ($w, $h) = $_->size_request;
640 $oh += $h;
641 if ($ow < $w) { $ow = $w }
642 } 884 }
643 885
644 my $y = 0; 886 my $y = 0;
645 for (@{$self->{children}}) { 887 for (0 .. $#$children) {
646 $_->move (0, $y); 888 my $child = $children->[$_];
647 889 my $h = $h[$_];
648 if ($_ == $exp) {
649 $_->size_allocate ($w, $h - $oh);
650 $y += $h - $oh;
651 } else {
652 my ($cw, $h) = $_->size_request;
653 $_->size_allocate ($w, $h); 890 $child->size_allocate (0, $y, $w, $h);
891
654 $y += $h; 892 $y += $h;
655 }
656 } 893 }
657} 894}
658 895
659############################################################################# 896#############################################################################
660 897
661package Crossfire::Client::Widget::Label; 898package CFClient::UI::Label;
662 899
663our @ISA = Crossfire::Client::Widget::; 900our @ISA = CFClient::UI::Base::;
664 901
665use SDL::OpenGL; 902use SDL::OpenGL;
666 903
667sub new { 904sub new {
668 my ($class, $x, $y, $z, $height, $text) = @_; 905 my ($class, %arg) = @_;
669 906
907 my $self = $class->SUPER::new (
908 fg => [1, 1, 1],
670 $height ||= $::FONTSIZE; 909 height => $::FONTSIZE,
910 text => "",
911 align => -1,
912 padding => 2,
913 layout => new CFClient::Layout,
914 %arg
915 );
671 916
672 # TODO: color, and make height, xyz etc. optional
673 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
674
675 $self->set_text ($text); 917 $self->set_text ($self->{text});
676 918
677 $self 919 $self
920}
921
922sub escape_text {
923 local $_ = $_[1];
924
925 s/&/&amp;/g;
926 s/>/&gt;/g;
927 s/</&lt;/g;
928
929 $_[1]
678} 930}
679 931
680sub set_text { 932sub set_text {
681 my ($self, $text) = @_; 933 my ($self, $text) = @_;
682 934
683 $self->{text} = $text; 935 $self->{text} = $text;
684 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 936 $self->{layout}->set_markup ($text);
685 937
938 delete $self->{texture};
939# $self->{w} = $self->{h} = -1;
686 $self->update; 940 $self->update;
687} 941}
688 942
689sub get_text { 943sub get_text {
690 my ($self, $text) = @_; 944 my ($self, $text) = @_;
… …
693} 947}
694 948
695sub size_request { 949sub size_request {
696 my ($self) = @_; 950 my ($self) = @_;
697 951
698 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 952 $self->{layout}->set_width;
953 $self->{layout}->set_height ($self->{height});
954 my ($w, $h) = $self->{layout}->size;
955
956 (
957 $w + $self->{padding} * 2,
958 $h + $self->{padding} * 2,
959 )
960}
961
962sub size_allocate {
963 my ($self, $x, $y, $w, $h) = @_;
964
965 $self->_size_allocate ($x, $y, $w, $h) or return;
966
967 delete $self->{texture};
968}
969
970sub update {
971 my ($self) = @_;
972
973 delete $self->{texture};
974 $self->SUPER::update;
975}
976
977sub _draw {
978 my ($self) = @_;
979
980 my $tex = $self->{texture} ||= do {
981 $self->{layout}->set_width ($self->{w});
982 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
983 new_from_layout CFClient::Texture $self->{layout}
984 };
985
986 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
988 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990
991 glColor @{$self->{fg}};
992
993 my $x =
994 $self->{align} < 0 ? $self->{padding}
995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996 : ($self->{w} - $tex->{w}) * 0.5;
997
998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
999 $tex->draw_quad (0, 0);
1000
1001 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND;
1003}
1004
1005#############################################################################
1006
1007package CFClient::UI::Entry;
1008
1009our @ISA = CFClient::UI::Label::;
1010
1011use SDL;
1012use SDL::OpenGL;
1013
1014sub new {
1015 my $class = shift;
1016
1017 $class->SUPER::new (
1018 fg => [1, 1, 1],
1019 bg => [0, 0, 0, 0.2],
1020 active_bg => [1, 1, 1, 0.5],
1021 active_fg => [0, 0, 0],
699 ( 1022 @_
700 $self->{texture}{width}, 1023 )
701 $self->{texture}{height}, 1024}
702 ) 1025
1026sub _set_text {
1027 my ($self, $text) = @_;
1028
1029 $self->{last_activity} = $::NOW;
1030
1031 $self->{text} = $text;
1032 $self->{layout}->set_width ($self->{w});
1033 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1034
1035 $text =~ s/./*/g if $self->{hidden};
1036
1037 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1038
1039 $text = substr $text, 0, $self->{cursor};
1040 utf8::encode $text;
1041
1042 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1043}
1044
1045sub size_request {
1046 my ($self) = @_;
1047
1048 my ($w, $h) = $self->SUPER::size_request;
1049
1050 ($w + 1, $h) # add 1 for cursor
1051}
1052
1053sub size_allocate {
1054 my ($self, $x, $y, $w, $h) = @_;
1055
1056 $self->SUPER::size_allocate ($x, $y, $w, $h);
1057
1058 $self->_set_text ($self->{text});
1059}
1060
1061sub set_text {
1062 my ($self, $text) = @_;
1063
1064 $self->{cursor} = length $text;
1065 $self->_set_text ($text);
1066 $self->update;
1067}
1068
1069sub key_down {
1070 my ($self, $ev) = @_;
1071
1072 my $mod = $ev->key_mod;
1073 my $sym = $ev->key_sym;
1074
1075 my $uni = $ev->key_unicode;
1076
1077 my $text = $self->get_text;
1078
1079 if ($sym == SDLK_BACKSPACE) {
1080 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1081 } elsif ($sym == SDLK_DELETE) {
1082 substr $text, $self->{cursor}, 1, "";
1083 } elsif ($sym == SDLK_LEFT) {
1084 --$self->{cursor} if $self->{cursor};
1085 } elsif ($sym == SDLK_RIGHT) {
1086 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1087 } elsif ($sym == SDLK_HOME) {
1088 $self->{cursor} = 0;
1089 } elsif ($sym == SDLK_END) {
1090 $self->{cursor} = length $text;
1091 } elsif ($uni) {
1092 substr $text, $self->{cursor}++, 0, chr $uni;
1093 }
1094
1095 $self->_set_text ($text);
1096 $self->update;
1097}
1098
1099sub focus_in {
1100 my ($self) = @_;
1101
1102 $self->{last_activity} = $::NOW;
1103
1104 $self->SUPER::focus_in;
1105}
1106
1107sub button_down {
1108 my ($self, $ev, $x, $y) = @_;
1109
1110 $self->SUPER::button_down ($ev, $x, $y);
1111
1112 my $idx = $self->{layout}->xy_to_index ($x, $y);
1113
1114 # byte-index to char-index
1115 my $text = $self->{text};
1116 utf8::encode $text;
1117 $self->{cursor} = length substr $text, 0, $idx;
1118
1119 $self->_set_text ($self->{text});
1120 $self->update;
1121}
1122
1123sub mouse_motion {
1124 my ($self, $ev, $x, $y) = @_;
1125# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1126}
1127
1128sub _draw {
1129 my ($self) = @_;
1130
1131 local $self->{fg} = $self->{fg};
1132
1133 if ($FOCUS == $self) {
1134 glColor @{$self->{active_bg}};
1135 $self->{fg} = $self->{active_fg};
703 } else { 1136 } else {
704 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height}; 1137 glColor @{$self->{bg}};
1138 }
705 1139
706 ($w, $h) 1140 glEnable GL_BLEND;
1141 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1142 glBegin GL_QUADS;
1143 glVertex 0 , 0;
1144 glVertex 0 , $self->{h};
1145 glVertex $self->{w}, $self->{h};
1146 glVertex $self->{w}, 0;
1147 glEnd;
1148 glDisable GL_BLEND;
1149
1150 $self->SUPER::_draw;
1151
1152 #TODO: force update every cursor change :(
1153 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1154 glColor @{$self->{fg}};
1155 glBegin GL_LINES;
1156 glVertex $self->{cur_x}, $self->{cur_y};
1157 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1158 glEnd;
1159 }
1160}
1161
1162#############################################################################
1163
1164package CFClient::UI::Button;
1165
1166our @ISA = CFClient::UI::Label::;
1167
1168use SDL;
1169use SDL::OpenGL;
1170
1171my @tex =
1172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1173 qw(b1_button_active.png);
1174
1175sub new {
1176 my $class = shift;
1177
1178 $class->SUPER::new (
1179 padding => 4,
1180 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2],
1182 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5],
1184# border_fg => [1, 1, 0],
1185 @_
707 } 1186 )
1187}
708 1188
1189sub button_up {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($x >= 0 && $x < $self->{w}
1193 && $y >= 0 && $y < $self->{h}) {
1194 $self->emit ("activate");
1195 }
709} 1196}
710 1197
711sub _draw { 1198sub _draw {
712 my ($self) = @_; 1199 my ($self) = @_;
713 1200
714 my $tex = $self->{texture}; 1201 local $self->{fg} = $self->{fg};
1202 my $tex = $tex[0];
715 1203
716 glEnable GL_BLEND; 1204 glEnable GL_BLEND;
717 glEnable GL_TEXTURE_2D; 1205 glEnable GL_TEXTURE_2D;
718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1207
1208 if ($GRAB == $self) {
1209 $self->{fg} = $self->{active_fg};
1210 }
1211
720 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1212 glBindTexture GL_TEXTURE_2D, $tex->{name};
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
721 1214
722 glColor 1, 0, 0, 1; # TODO color 1215 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
723 1216
724 glBegin GL_QUADS; 1217 glDisable GL_TEXTURE_2D;
725 glTexCoord 0, 0; glVertex 0 , 0;
726 glTexCoord 0, 1; glVertex 0 , $tex->{height};
727 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
728 glTexCoord 1, 0; glVertex $tex->{width}, 0;
729 glEnd;
730
731 glDisable GL_BLEND; 1218 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D;
733}
734 1219
735############################################################################# 1220 $self->SUPER::_draw;
1221}
736 1222
737package Crossfire::Client::Widget::Entry; 1223#############################################################################
738 1224
739our @ISA = Crossfire::Client::Widget::Label::; 1225package CFClient::UI::CheckBox;
1226
1227our @ISA = CFClient::UI::DrawBG::;
740 1228
741use SDL; 1229use SDL;
742use SDL::OpenGL; 1230use SDL::OpenGL;
743 1231
744sub key_down { 1232sub new {
1233 my $class = shift;
1234
1235 $class->SUPER::new (
1236 padding => 2,
1237 fg => [1, 1, 1],
1238 active_fg => [1, 1, 0],
1239 state => 0,
1240 @_
1241 )
1242}
1243
1244sub size_request {
745 my ($self, $ev) = @_; 1245 my ($self) = @_;
746 1246
747 my $mod = $ev->key_mod; 1247 ($self->{padding} * 2 + 6) x 2
748 my $sym = $ev->key_sym; 1248}
749 1249
750 my $uni = $ev->key_unicode; 1250sub size_allocate {
1251 my ($self, $x, $y, $w, $h) = @_;
751 1252
752 my $text = $self->get_text; 1253 $self->_size_allocate ($x, $y, $w, $h);
753
754 if ($sym == SDLK_BACKSPACE) {
755 substr $text, -1, 1, '';
756 } elsif ($uni) {
757 $text .= chr $uni;
758 print "$uni <$text>\n";#d#
759 }
760
761 $self->set_text ($text);
762} 1254}
763 1255
764sub button_down { 1256sub button_down {
765 my ($self, $ev) = @_; 1257 my ($self, $ev, $x, $y) = @_;
766 1258
767 $self->focus_in; 1259 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1260 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1261 $self->{state} = !$self->{state};
1262 $self->emit (changed => $self->{state});
1263 }
768} 1264}
769 1265
770sub _draw { 1266sub _draw {
771 my ($self) = @_; 1267 my ($self) = @_;
772 1268
773 if ($FOCUS == $self) { 1269 $self->SUPER::_draw;
774 glColor 1, 1, 1; 1270
775 } else { 1271 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
776 glColor 0.7, 0.7, 0.7; 1272
1273 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
777 } 1274
1275 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276
1277 glBegin GL_LINE_LOOP;
1278 glVertex 0 , 0;
1279 glVertex 0 , $s;
1280 glVertex $s, $s;
1281 glVertex $s, 0;
1282 glEnd;
1283
1284 if ($self->{state}) {
1285 glBegin GL_LINES;
1286 glVertex 0 , 0;
1287 glVertex $s, $s;
1288 glVertex $s, 0;
1289 glVertex 0 , $s;
1290 glEnd;
1291 }
1292}
1293
1294#############################################################################
1295
1296package CFClient::UI::Slider;
1297
1298use strict;
1299
1300use SDL::OpenGL;
1301
1302our @ISA = CFClient::UI::DrawBG::;
1303
1304sub new {
1305 my $class = shift;
1306
1307 # range [value, low, high, page]
1308
1309 my $self = $class->SUPER::new (
1310 fg => [1, 1, 1],
1311 active_fg => [0, 0, 0],
1312 range => [0, 0, 100, 10],
1313 req_w => 40,
1314 req_h => 10,
1315 vertical => 0,
1316 @_
1317 );
1318
1319 $self
1320}
1321
1322sub size_request {
1323 my ($self) = @_;
1324
1325 my $w = $self->{req_w};
1326 my $h = $self->{req_h};
1327
1328 $self->{vertical} ? ($h, $w) : ($w, $h)
1329}
1330
1331sub button_down {
1332 my ($self, $ev, $x, $y) = @_;
1333
1334 $self->SUPER::button_down ($ev, $x, $y);
1335 $self->mouse_motion ($ev, $x, $y);
1336}
1337
1338sub mouse_motion {
1339 my ($self, $ev, $x, $y) = @_;
1340
1341 if ($GRAB == $self) {
1342 my ($value, $lo, $hi, $page) = @{$self->{range}};
1343
1344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1345
1346 $x = $x * ($hi - $lo) / $w + $lo;
1347 $x = $lo if $x < $lo;
1348 $x = $hi - $page if $x > $hi - $page;
1349 $self->{range}[0] = $x;
1350
1351 $self->emit (changed => $x);
1352 $self->update;
1353 }
1354}
1355
1356sub _draw {
1357 my ($self) = @_;
1358
1359 $self->SUPER::_draw ();
1360
1361 my ($w, $h) = @$self{qw(w h)};
1362
1363 if ($self->{vertical}) {
1364 # draw a vertical slider like a rotated horizontal slider
1365
1366 glRotate 90, 0, 0, 1;
1367 glTranslate 0, -$self->{w}, 0;
1368
1369 ($w, $h) = ($h, $w);
1370 }
1371
1372 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374
1375 my ($value, $lo, $hi, $page) = @{$self->{range}};
1376
1377 $page = int $page * $w / ($hi - $lo);
1378 $value = int +($value - $lo) * $w / ($hi - $lo);
1379
1380 $w -= $page;
1381 $page &= ~1;
1382 glTranslate $page * 0.5, 0, 0;
1383 $page ||= 2;
1384
1385 glColor @$fg;
1386 glBegin GL_LINES;
1387 glVertex 0, 0; glVertex 0, $h;
1388 glVertex $w - 1, 0; glVertex $w - 1, $h;
1389 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390 glEnd;
1391
1392 my $knob_a = $value - $page * 0.5;
1393 my $knob_b = $value + $page * 0.5;
778 1394
779 glBegin GL_QUADS; 1395 glBegin GL_QUADS;
780 glVertex 0 , 0; 1396 glColor @$fg;
781 glVertex 0 , $self->{h} - 1; 1397 glVertex $knob_a, 0;
782 glVertex $self->{w} - 1, $self->{h} - 1; 1398 glVertex $knob_a, $h;
783 glVertex $self->{w} - 1, 0; 1399 glVertex $knob_b, $h;
1400 glVertex $knob_b, 0;
1401
1402 if ($knob_a < $knob_b - 2) {
1403 glColor @$bg;
1404 glVertex $knob_a + 1, 1;
1405 glVertex $knob_a + 1, $h - 1;
1406 glVertex $knob_b - 1, $h - 1;
1407 glVertex $knob_b - 1, 1;
1408 }
784 glEnd; 1409 glEnd;
785
786 $self->SUPER::_draw;
787} 1410}
788 1411
789############################################################################# 1412#############################################################################
790 1413
791package Crossfire::Client::Widget::MapWidget; 1414package CFClient::UI::MapWidget;
792 1415
793use strict; 1416use strict;
794 1417
795use List::Util qw(min max); 1418use List::Util qw(min max);
796 1419
797use SDL; 1420use SDL;
798use SDL::OpenGL; 1421use SDL::OpenGL;
799use SDL::OpenGL::Constants;
800 1422
801our @ISA = Crossfire::Client::Widget::; 1423our @ISA = CFClient::UI::Base::;
1424
1425sub new {
1426 my $class = shift;
1427
1428 $class->SUPER::new (
1429 z => -1,
1430 list => (glGenLists 1),
1431 @_
1432 )
1433}
802 1434
803sub key_down { 1435sub key_down {
804 print "MAPKEYDOWN\n"; 1436 print "MAPKEYDOWN\n";
805} 1437}
806 1438
807sub key_up { 1439sub key_up {
808} 1440}
809 1441
810sub size_request { 1442sub size_request {
811 ( 1443 (
812 1 + int $::WIDTH / 32, 1444 1 + 32 * int $::WIDTH / 32,
813 1 + int $::HEIGHT / 32, 1445 1 + 32 * int $::HEIGHT / 32,
814 ) 1446 )
815} 1447}
816 1448
1449sub update {
1450 my ($self) = @_;
1451
1452 $self->{need_update} = 1;
1453 $self->SUPER::update;
1454}
1455
817sub _draw { 1456sub draw {
818 my ($self) = @_; 1457 my ($self) = @_;
819 1458
1459 if (delete $self->{need_update}) {
1460 glNewList $self->{list}, GL_COMPILE;
1461
820 my $mx = $::CONN->{mapx}; 1462 my $mx = $::CONN->{mapx};
821 my $my = $::CONN->{mapy}; 1463 my $my = $::CONN->{mapy};
822 1464
823 my $map = $::CONN->{map}; 1465 my $map = $::CONN->{map};
824 1466
825 my ($xofs, $yofs); 1467 my ($xofs, $yofs);
826 1468
827 my $sw = 1 + int $::WIDTH / 32; 1469 my $sw = 1 + int $::WIDTH / 32;
828 my $sh = 1 + int $::HEIGHT / 32; 1470 my $sh = 1 + int $::HEIGHT / 32;
829 1471
830 if ($::CONN->{mapw} > $sw) { 1472 if ($::CONN->{mapw} > $sw) {
831 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1473 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
832 } else { 1474 } else {
833 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1475 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
834 } 1476 }
835 1477
836 if ($::CONN->{maph} > $sh) { 1478 if ($::CONN->{maph} > $sh) {
837 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1479 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
838 } else { 1480 } else {
839 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1481 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
840 } 1482 }
841 1483
842 glEnable GL_TEXTURE_2D; 1484 glEnable GL_TEXTURE_2D;
843 glEnable GL_BLEND; 1485 glEnable GL_BLEND;
1486 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1488 glColor 1, 1, 1, 1;
845 1489
846 my $sw4 = ($sw + 3) & ~3; 1490 my $sw4 = ($sw + 3) & ~3;
847 my $lighting = "\x00" x ($sw4 * $sh); 1491 my $darkness = "\x00" x ($sw4 * $sh);
848 1492
849 for my $x (0 .. $sw - 1) { 1493 for my $x (0 .. $sw - 1) {
1494 my $row = $map->[$x + $xofs];
850 for my $y (0 .. $sh - 1) { 1495 for my $y (0 .. $sh - 1) {
851 1496
852 my $cell = $map->[$x + $xofs][$y + $yofs] 1497 my $cell = $row->[$y + $yofs]
853 or next; 1498 or next;
854 1499
855 my $darkness = $cell->[0] * (1 / 255); 1500 my $dark = $cell->[0];
856 if ($darkness < 0) { 1501 if ($dark < 0) {
857 $darkness = $cell->[1] ? 0.2 : 0; 1502 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1503 } else {
1504 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
858 } 1505 }
859 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
860 1506
861 for my $num (grep $_, @$cell[1,2,3]) { 1507 for my $num (grep $_, @$cell[1,2,3]) {
862 my $tex = $::CONN->{face}[$num]{texture} || next; 1508 my $tex = $::CONN->{face}[$num]{texture} || next;
1509
1510 my ($w, $h) = @$tex{qw(w h)};
863 1511
864 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1512 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
865
866 my $w = $tex->{width};
867 my $h = $tex->{height};
868
869 my $px = ($x + 1) * 32 - $w;
870 my $py = ($y + 1) * 32 - $h;
871
872 glBegin GL_QUADS;
873 glTexCoord 0, 0; glVertex $px , $py;
874 glTexCoord 0, 1; glVertex $px , $py + $h;
875 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
876 glTexCoord 1, 0; glVertex $px + $w, $py;
877 glEnd; 1513 }
878 } 1514 }
879 } 1515 }
880 }
881 1516
882# if (1) { # higher quality darkness 1517# if (1) { # higher quality darkness
883# $lighting =~ s/(.)/$1$1$1/gs; 1518# $lighting =~ s/(.)/$1$1$1/gs;
884# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1519# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
885# 1520#
… …
887# 1522#
888# $lighting = $pb->get_pixels; 1523# $lighting = $pb->get_pixels;
889# $lighting =~ s/(.)../$1/gs; 1524# $lighting =~ s/(.)../$1/gs;
890# } 1525# }
891 1526
892 $lighting = new Crossfire::Client::Texture
893 width => $sw4,
894 height => $sh,
895 data => $lighting,
896 internalformat => GL_ALPHA,
897 format => GL_ALPHA;
898
899 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
900 glColor 0.5, 0.5, 0.5, 1;
901 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
902 glBindTexture GL_TEXTURE_2D, $lighting->{name};
903 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
904 glBegin GL_QUADS;
905 glTexCoord 0, 0; glVertex 0 , 0;
906 glTexCoord 0, 1; glVertex 0 , $sh * 32;
907 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
908 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
909 glEnd;
910 1528
1529 if ($::CFG->{fow_smooth}) { # smooth fog of war
1530 my @conv = (
1531 0.05, 0.05, 0.05,
1532 0.05, 0.60, 0.05,
1533 0.05, 0.05, 0.05,
1534 );
1535 CFClient::glConvolutionParameteri GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_REPLICATE_BORDER;
1536 CFClient::glConvolutionFilter2D GL_CONVOLUTION_2D,
1537 GL_ALPHA, 3, 3, GL_ALPHA, GL_FLOAT,
1538 pack "f*", @conv;
1539 glEnable GL_CONVOLUTION_2D;
1540 }
1541
1542 $darkness = new CFClient::Texture
1543 w => $sw4,
1544 h => $sh,
1545 data => $darkness,
1546 internalformat => GL_ALPHA,
1547 format => GL_ALPHA;
1548
1549 glColor +($::CFG->{fow_intensity}) x 3, 1;
1550 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1551
1552 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1553
911 glDisable GL_TEXTURE_2D; 1554 glDisable GL_TEXTURE_2D;
912 glDisable GL_BLEND; 1555 glDisable GL_BLEND;
1556
1557 glEndList;
1558 }
1559
1560 glCallList $self->{list};
1561
1562 if ($FOCUS != $self) {
1563 glEnable GL_BLEND;
1564 glColor 0, 0, 1, 0.4;
1565 glBegin GL_QUADS;
1566 glVertex 0, 0;
1567 glVertex 0, $::HEIGHT;
1568 glVertex $::WIDTH, $::HEIGHT;
1569 glVertex $::WIDTH, 0;
1570 glEnd;
1571 glDisable GL_BLEND;
1572 }
913} 1573}
914 1574
915my %DIR = ( 1575my %DIR = (
916 SDLK_KP8, [1, "north"], 1576 SDLK_KP8, [1, "north"],
917 SDLK_KP9, [2, "northeast"], 1577 SDLK_KP9, [2, "northeast"],
… …
933 1593
934 my $mod = $ev->key_mod; 1594 my $mod = $ev->key_mod;
935 my $sym = $ev->key_sym; 1595 my $sym = $ev->key_sym;
936 1596
937 if ($sym == SDLK_KP5) { 1597 if ($sym == SDLK_KP5) {
938 $::CONN->send ("command stay fire"); 1598 $::CONN->user_send ("command stay fire");
1599 } elsif ($sym == SDLK_a) {
1600 $::CONN->user_send ("command apply");
939 } elsif (exists $DIR{$sym}) { 1601 } elsif (exists $DIR{$sym}) {
940 if ($mod & KMOD_SHIFT) { 1602 if ($mod & KMOD_SHIFT) {
941 $self->{shft}++; 1603 $self->{shft}++;
942 $::CONN->send ("command fire $DIR{$sym}[0]"); 1604 $::CONN->user_send ("command fire $DIR{$sym}[0]");
943 } elsif ($mod & KMOD_CTRL) { 1605 } elsif ($mod & KMOD_CTRL) {
944 $self->{ctrl}++; 1606 $self->{ctrl}++;
945 $::CONN->send ("command run $DIR{$sym}[0]"); 1607 $::CONN->user_send ("command run $DIR{$sym}[0]");
946 } else { 1608 } else {
947 $::CONN->send ("command $DIR{$sym}[1]"); 1609 $::CONN->user_send ("command $DIR{$sym}[1]");
948 } 1610 }
949 } 1611 }
950} 1612}
951 1613
952sub key_up { 1614sub key_up {
… …
954 1616
955 my $mod = $ev->key_mod; 1617 my $mod = $ev->key_mod;
956 my $sym = $ev->key_sym; 1618 my $sym = $ev->key_sym;
957 1619
958 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1620 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
959 $::CONN->send ("command fire_stop"); 1621 $::CONN->user_send ("command fire_stop");
960 } 1622 }
961 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1623 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
962 $::CONN->send ("command run_stop"); 1624 $::CONN->user_send ("command run_stop");
963 } 1625 }
964} 1626}
965 1627
966############################################################################# 1628#############################################################################
967 1629
968package Crossfire::Client::Widget::Animator; 1630package CFClient::UI::Animator;
969 1631
970use SDL::OpenGL; 1632use SDL::OpenGL;
971 1633
972our @ISA = Crossfire::Client::Widget::Bin::; 1634our @ISA = CFClient::UI::Bin::;
973 1635
974sub moveto { 1636sub moveto {
975 my ($self, $x, $y) = @_; 1637 my ($self, $x, $y) = @_;
976 1638
977 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1639 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
978 $self->{speed} = 2; 1640 $self->{speed} = 0.001;
979 $self->{time} = 1; 1641 $self->{time} = 1;
980 1642
981 ::animation_start $self; 1643 ::animation_start $self;
982} 1644}
983 1645
… …
1005 glPopMatrix; 1667 glPopMatrix;
1006} 1668}
1007 1669
1008############################################################################# 1670#############################################################################
1009 1671
1010package Crossfire::Client::Widget::Toplevel; 1672package CFClient::UI::Toplevel;
1011 1673
1012our @ISA = Crossfire::Client::Widget::Container::; 1674our @ISA = CFClient::UI::Container::;
1013 1675
1014sub size_request { 1676sub size_request {
1015 ($::WIDTH, $::HEIGHT) 1677 ($::WIDTH, $::HEIGHT)
1016} 1678}
1017 1679
1018sub size_allocate { 1680sub size_allocate {
1019 my ($self, $w, $h) = @_; 1681 my ($self, $x, $y, $w, $h) = @_;
1020 1682
1021 $self->SUPER::size_allocate ($w, $h); 1683 $self->_size_allocate ($x, $y, $w, $h);
1022 1684
1023 $_->size_allocate ($_->size_request) 1685 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1024 for @{$self->{children}}; 1686 for @{$self->{children}};
1025} 1687}
1026 1688
1689sub translate {
1690 my ($self, $x, $y) = @_;
1691
1692 ($x, $y)
1693}
1694
1027sub update { 1695sub update {
1028 my ($self) = @_; 1696 my ($self) = @_;
1029 1697
1030 $self->size_allocate ($self->size_request); 1698 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1031 ::refresh (); 1699 ::refresh ();
1032} 1700}
1033 1701
1034sub add { 1702sub add {
1035 my ($self, $widget) = @_; 1703 my ($self, $widget) = @_;
1036 1704
1037 $self->SUPER::add ($widget); 1705 $self->SUPER::add ($widget);
1038 1706
1039 $widget->size_allocate ($widget->size_request); 1707 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1040} 1708}
1041 1709
1042sub draw { 1710sub draw {
1043 my ($self) = @_; 1711 my ($self) = @_;
1044 1712
1045 $self->_draw; 1713 $self->_draw;
1046} 1714}
1047 1715
1048############################################################################# 1716#############################################################################
1049 1717
1050package Crossfire::Client::Widget; 1718package CFClient::UI;
1051 1719
1052$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 1720$TOPLEVEL = new CFClient::UI::Toplevel;
1053 1721
10541 17221
1055 1723

Diff Legend

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