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.73 by root, Tue Apr 11 18:06:53 2006 UTC vs.
Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC

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

Diff Legend

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