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.72 by root, Tue Apr 11 18:00:45 2006 UTC vs.
Revision 1.102 by elmex, Fri Apr 14 12:17:06 2006 UTC

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

Diff Legend

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