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.75 by root, Tue Apr 11 20:44:49 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 19:35:20 2006 UTC

… …
7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $BUTTON_STATE; 13our $BUTTON_STATE;
14 14
15# class methods for events 15# class methods for events
16sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
… …
24sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
25 my ($ev) = @_; 25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27 27
28 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
30 30
31 $GRAB = $widget; 31 $GRAB = $widget;
32 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
33 } 33 }
34 34
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36 36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 38}
39 39
40sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
41 my ($ev) = @_; 41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43 43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47 47
48 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
56 56
57sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
58 my ($ev) = @_; 58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60 60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for ($vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
71} 84}
72 85
73############################################################################# 86#############################################################################
74 87
75package CFClient::UI::Base; 88package CFClient::UI::Base;
… …
79use SDL::OpenGL; 92use SDL::OpenGL;
80 93
81sub new { 94sub new {
82 my $class = shift; 95 my $class = shift;
83 96
84 bless { 97 my $self = bless {
85 x => 0, 98 x => 0,
86 y => 0, 99 y => 0,
87 z => 0, 100 z => 0,
88 w => -1, 101 w => -1,
89 h => -1, 102 h => -1,
90 @_ 103 @_
91 }, $class 104 }, $class;
105
106 for (keys %$self) {
107 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_});
109 }
110 }
111
112 $self
92} 113}
93 114
94sub move { 115sub move {
95 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
96 $self->{x} = $x; 117 $self->{x} = $x;
… …
125 my ($self, $x, $y, $w, $h) = @_; 146 my ($self, $x, $y, $w, $h) = @_;
126 147
127 $self->_size_allocate ($x, $y, $w, $h); 148 $self->_size_allocate ($x, $y, $w, $h);
128} 149}
129 150
130# translate global koordinates to local coordinate system 151# return top left coordinates
131sub translate { 152sub _topleft {
132 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
133 154
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
158# translate global coordinates to local coordinate system
159sub coord2local {
160 my ($self, $x, $y) = @_;
161
162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
135} 172}
136 173
137sub focus_in { 174sub focus_in {
138 my ($self) = @_; 175 my ($self) = @_;
139 176
140 return if $FOCUS == $self; 177 return if $FOCUS == $self;
178 return unless $self->{can_focus};
141 179
142 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
143 $focus->update if $focus; 181 $focus->update if $focus;
144 $FOCUS->update; 182 $FOCUS->update;
145} 183}
… …
178 glPushMatrix; 216 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 217 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 218 $self->_draw;
181 glPopMatrix; 219 glPopMatrix;
182 220
183 if ($self == $HOVER) { 221 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 222 my ($x, $y) = @$self{qw(x y)};
185 223
186 glColor 1, 1, 1, 0.1; 224 glColor 0, 0, 1, 0.2;
187 glEnable GL_BLEND; 225 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189 glBegin GL_QUADS; 227 glBegin GL_QUADS;
190 glVertex $x , $y; 228 glVertex $x , $y;
191 glVertex $x + $self->{w}, $y; 229 glVertex $x + $self->{w}, $y;
… …
200 my ($self) = @_; 238 my ($self) = @_;
201 239
202 warn "no draw defined for $self\n"; 240 warn "no draw defined for $self\n";
203} 241}
204 242
205sub bbox {
206 my ($self) = @_;
207 my ($w, $h) = $self->size_request;
208 (
209 $self->{x},
210 $self->{y},
211 $self->{x} = $w,
212 $self->{y} = $h
213 )
214}
215
216sub find_widget { 243sub find_widget {
217 my ($self, $x, $y) = @_; 244 my ($self, $x, $y) = @_;
218 245
219 return $self 246 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 247 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 248 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222 249
223 () 250 ()
224} 251}
225 252
226sub del_parent { $_[0]->{parent} = undef }
227
228sub set_parent { 253sub set_parent {
229 my ($self, $par) = @_; 254 my ($self, $parent) = @_;
230 255
231 $self->{parent} = $par;
232 Scalar::Util::weaken $self->{parent}; 256 Scalar::Util::weaken ($self->{parent} = $parent);
233}
234
235sub get_parent {
236 $_[0]->{parent}
237} 257}
238 258
239sub update { 259sub update {
240 my ($self) = @_; 260 my ($self) = @_;
241 261
… …
275 my $class = shift; 295 my $class = shift;
276 296
277 # range [value, low, high, page] 297 # range [value, low, high, page]
278 298
279 $class->SUPER::new ( 299 $class->SUPER::new (
280 bg => [0, 0, 0, 0.4], 300 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1], 301 active_bg => [1, 1, 1, 0.5],
282 @_ 302 @_
283 ) 303 )
284} 304}
285 305
286sub _draw { 306sub _draw {
287 my ($self) = @_; 307 my ($self) = @_;
288 308
289 my ($w, $h) = @$self{qw(w h)}; 309 my ($w, $h) = @$self{qw(w h)};
290 310
311 glEnable GL_BLEND;
312 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
291 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 313 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
314
292 glBegin GL_QUADS; 315 glBegin GL_QUADS;
293 glVertex 0 , 0; 316 glVertex 0 , 0;
294 glVertex 0 , $h; 317 glVertex 0 , $h;
295 glVertex $w, $h; 318 glVertex $w, $h;
296 glVertex $w, 0; 319 glVertex $w, 0;
297 glEnd; 320 glEnd;
321
322 glDisable GL_BLEND;
298} 323}
299 324
300############################################################################# 325#############################################################################
301 326
302package CFClient::UI::Empty; 327package CFClient::UI::Empty;
… …
325 350
326 $self 351 $self
327} 352}
328 353
329sub add { 354sub add {
330 my ($self, $chld, $expand) = @_; 355 my ($self, $child) = @_;
331 356
332 $chld->{expand} = $expand;
333 $chld->set_parent ($self); 357 $child->set_parent ($self);
358
359 use sort 'stable';
334 360
335 $self->{children} = [ 361 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 363 @{$self->{children}}, $child
338 ]; 364 ];
339 365
340 $self->{w} = $self->{h} = -1; 366 $self->{w} = $self->{h} = -1;
341 $self->update; 367 $self->update;
342} 368}
… …
439} 465}
440 466
441sub render_chld { 467sub render_chld {
442 my ($self) = @_; 468 my ($self) = @_;
443 469
444 $self->{texture} = 470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 471 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 472 glClear GL_COLOR_BUFFER_BIT;
447 ); 473 $self->child->draw;
474 };
448} 475}
449 476
450sub size_allocate { 477sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 478 my ($self, $x, $y, $w, $h) = @_;
452 479
… …
530 557
531my @tex = 558my @tex =
532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 560 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
534 561
562sub new {
563 my $class = shift;
564
565 # TODO: user_x, user_y, overwrite moveto?
566
567 $class->SUPER::new (
568 bg => [1, 1, 1, 1],
569 border_bg => [1, 1, 1, 1],
570 border => $::FONTSIZE * 0.8,
571 @_
572 )
573}
574
535sub size_request { 575sub size_request {
536 my ($self) = @_; 576 my ($self) = @_;
537 577
578 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
579
538 my ($w, $h) = $self->SUPER::size_request; 580 my ($w, $h) = $self->SUPER::size_request;
539 581
540 $h += $tex[1]->{h}; 582 (
541 $h += $tex[4]->{h}; 583 $w + $self->{border} * 2,
542 $w += $tex[2]->{w}; 584 $h + $self->{border} * 2,
543 $w += $tex[3]->{w}; 585 )
544
545 ($w, $h)
546} 586}
547 587
548sub size_allocate { 588sub size_allocate {
549 my ($self, $x, $y, $w, $h) = @_; 589 my ($self, $x, $y, $w, $h) = @_;
550 590
551 $self->_size_allocate ($x, $y, $w, $h) or return; 591 $self->_size_allocate ($x, $y, $w, $h) or return;
552 592
553 $h -= $tex[1]->{h}; 593 $h -= List::Util::max 0, $self->{border} * 2;
554 $h -= $tex[4]->{h}; 594 $w -= List::Util::max 0, $self->{border} * 2;
555 $w -= $tex[2]->{w};
556 $w -= $tex[3]->{w};
557 595
558 $h = $h < 0 ? 0 : $h; 596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
559 $w = $w < 0 ? 0 : $w; 597}
560 598
561 my $child = $self->child; 599sub button_down {
600 my ($self, $ev, $x, $y) = @_;
562 601
563 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h); 602 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
603 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
604
605 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
606 my ($bw, $bh) = ($self->{w}, $self->{h});
607
608 $self->{motion} = sub {
609 my ($ev, $x, $y) = @_;
610
611 ($x, $y) = ($ev->motion_x, $ev->motion_y);
612
613 $self->{user_w} = $bw + $x - $ox;
614 $self->{user_h} = $bh + $y - $oy;
615 $self->update;
616 };
617
618 } elsif ($x >= 0 && $x < $self->{w}
619 && $y >= 0 && $y < $self->{border}) {
620
621 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
622 my ($bx, $by) = ($self->{x}, $self->{y});
623
624 $self->{motion} = sub {
625 my ($ev, $x, $y) = @_;
626
627 ($x, $y) = ($ev->motion_x, $ev->motion_y);
628
629 $self->move ($bx + $x - $ox, $by + $y - $oy);
630 $self->update;
631 };
632 }
633}
634
635sub button_up {
636 my ($self, $ev, $x, $y) = @_;
637
638 delete $self->{motion};
639}
640
641sub mouse_motion {
642 my ($self, $ev, $x, $y) = @_;
643
644 $self->{motion}->($ev, $x, $y) if $self->{motion};
564} 645}
565 646
566sub _draw { 647sub _draw {
567 my ($self) = @_; 648 my ($self) = @_;
568 649
569 my ($w, $h) = ($self->{w}, $self->{h}); 650 my ($w, $h ) = ($self->{w}, $self->{h});
570 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
571 652
572 glEnable GL_BLEND; 653 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
574 glEnable GL_TEXTURE_2D; 655 glEnable GL_TEXTURE_2D;
575 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
576 657
577 my $top = $tex[1]; 658 glColor @{ $self->{border_bg} };
578 $top->draw_quad (0, 0, $w, $top->{h}); 659 $tex[1]->draw_quad (0, 0, $w, $self->{border});
579 660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
580 my $left = $tex[3]; 661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
581 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
582
583 my $right = $tex[2];
584 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
585
586 my $bottom = $tex[4];
587 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
588 663
589 my $bg = $tex[0]; 664 my $bg = $tex[0];
590 glBindTexture GL_TEXTURE_2D, $bg->{name};
591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
592 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
593 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
594 665
666 # TODO: repeat texture not scale
595 my $rep_x = $cw / $bg->{w}; 667 my $rep_x = $cw / $bg->{w};
596 my $rep_y = $ch / $bg->{h}; 668 my $rep_y = $ch / $bg->{h};
597 669
670 glColor @{ $self->{bg} };
671
672 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1;
598 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
599 676
677 glDisable GL_TEXTURE_2D;
600 glDisable GL_BLEND; 678 glDisable GL_BLEND;
601 glDisable GL_TEXTURE_2D;
602 679
603 $self->child->draw; 680 $self->child->draw;
604
605} 681}
606 682
607############################################################################# 683#############################################################################
608 684
609package CFClient::UI::Table; 685package CFClient::UI::Table;
… …
612 688
613use List::Util qw(max sum); 689use List::Util qw(max sum);
614 690
615use SDL::OpenGL; 691use SDL::OpenGL;
616 692
693sub new {
694 my $class = shift;
695
696 $class->SUPER::new (
697 col_expand => [],
698 @_
699 )
700}
701
617sub add { 702sub add {
618 my ($self, $x, $y, $chld) = @_; 703 my ($self, $x, $y, $child) = @_;
619 704
705 $child->set_parent ($self);
620 $self->{children}[$y][$x] = $chld; 706 $self->{children}[$y][$x] = $child;
621 $chld->set_parent ($self);
622 707
623 $self->{w} = $self->{h} = -1; 708 $self->{w} = $self->{h} = -1;
709 $self->update;
710}
711
712# TODO: move to container class maybe? send childs a signal on removal?
713sub clear {
714 my ($self) = @_;
715
716 delete $self->{children};
624 $self->update; 717 $self->update;
625} 718}
626 719
627sub get_wh { 720sub get_wh {
628 my ($self) = @_; 721 my ($self) = @_;
… …
650 my ($self) = @_; 743 my ($self) = @_;
651 744
652 my ($ws, $hs) = $self->get_wh; 745 my ($ws, $hs) = $self->get_wh;
653 746
654 ( 747 (
655 (List::Util::sum @$ws), 748 (sum @$ws),
656 (List::Util::sum @$hs), 749 (sum @$hs),
657 ) 750 )
658} 751}
659 752
660sub size_allocate { 753sub size_allocate {
661 my ($self, $x, $y, $w, $h) = @_; 754 my ($self, $x, $y, $w, $h) = @_;
662 755
663 $self->_size_allocate ($x, $y, $w, $h) or return; 756 $self->_size_allocate ($x, $y, $w, $h) or return;
664 757
665 my ($ws, $hs) = $self->get_wh; 758 my ($ws, $hs) = $self->get_wh;
666 759
667 my $req_w = List::Util::sum @$ws; 760 my $req_w = sum @$ws;
668 my $req_h = List::Util::sum @$hs; 761 my $req_h = sum @$hs;
762
763 # TODO: nicer code && do row_expand
764 my @col_expand = @{$self->{col_expand}};
765 @col_expand = (1) x @$ws unless @col_expand;
766 my $col_expand = (sum @col_expand) || 1;
669 767
670 # linearly scale sizes 768 # linearly scale sizes
671 $_ *= $req_w / $w for @$ws; 769 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
672 $_ *= $req_h / $h for @$hs; 770 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
771
772 CFClient::UI::harmonize $ws;
773 CFClient::UI::harmonize $hs;
673 774
674 my $y; 775 my $y;
675 776
676 for my $r (0 .. $#{$self->{children}}) { 777 for my $r (0 .. $#{$self->{children}}) {
677 my $row = $self->{children}[$r] 778 my $row = $self->{children}[$r]
… …
679 780
680 my $x = 0; 781 my $x = 0;
681 my $row_h = $hs->[$r]; 782 my $row_h = $hs->[$r];
682 783
683 for my $c (0 .. $#$row) { 784 for my $c (0 .. $#$row) {
684 my $widget = $row->[$c]
685 or next;
686
687 my $col_w = $ws->[$c]; 785 my $col_w = $ws->[$c];
688 786
787 if (my $widget = $row->[$c]) {
689 $widget->size_allocate ($x, $y, $col_w, $row_h); 788 $widget->size_allocate ($x, $y, $col_w, $row_h);
789 }
690 790
691 $x += $col_w; 791 $x += $col_w;
692 } 792 }
693 793
694 $y += $row_h; 794 $y += $row_h;
695 } 795 }
696 796
697} 797}
698 798
799sub find_widget {
800 my ($self, $x, $y) = @_;
801
802 $x -= $self->{x};
803 $y -= $self->{y};
804
805 my $res;
806
807 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
808 $res = $_->find_widget ($x, $y)
809 and return $res;
810 }
811
812 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
813}
814
699sub _draw { 815sub _draw {
700 my ($self) = @_; 816 my ($self) = @_;
701 817
702 for (grep $_, @{$self->{children}}) { 818 for (grep $_, @{$self->{children}}) {
703 $_->draw for grep $_, @$_; 819 $_->draw for grep $_, @$_;
704 } 820 }
705} 821}
706 822
707############################################################################# 823#############################################################################
708 824
825package CFClient::UI::HBox;
826
827# TODO: wrap into common Box base class
828
829our @ISA = CFClient::UI::Container::;
830
831sub size_request {
832 my ($self) = @_;
833
834 my @alloc = map [$_->size_request], @{$self->{children}};
835
836 (
837 (List::Util::sum map $_->[0], @alloc),
838 (List::Util::max map $_->[1], @alloc),
839 )
840}
841
842sub size_allocate {
843 my ($self, $x, $y, $w, $h) = @_;
844
845 $self->_size_allocate ($x, $y, $w, $h);
846
847 ($h, $w) = ($w, $h);
848
849 my $children = $self->{children};
850
851 my @h = map +($_->size_request)[0], @$children;
852
853 my $req_h = List::Util::sum @h;
854
855 if ($req_h > $h) {
856 # ah well, not enough space
857 $_ *= $h / $req_h for @h;
858 } else {
859 my $exp = List::Util::sum map $_->{expand}, @$children;
860 $exp ||= 1;
861
862 for (0 .. $#$children) {
863 my $child = $children->[$_];
864
865 my $alloc_h = $h[$_];
866 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
867 $h[$_] = $alloc_h;
868 }
869 }
870
871 CFClient::UI::harmonize \@h;
872
873 my $y = 0;
874 for (0 .. $#$children) {
875 my $child = $children->[$_];
876 my $h = $h[$_];
877 $child->size_allocate ($y, 0, $h, $w);
878
879 $y += $h;
880 }
881}
882
883#############################################################################
884
709package CFClient::UI::VBox; 885package CFClient::UI::VBox;
710 886
887# TODO: wrap into common Box base class
888
711our @ISA = CFClient::UI::Container::; 889our @ISA = CFClient::UI::Container::;
712
713use SDL::OpenGL;
714 890
715sub size_request { 891sub size_request {
716 my ($self) = @_; 892 my ($self) = @_;
717 893
718 my @alloc = map [$_->size_request], @{$self->{children}}; 894 my @alloc = map [$_->size_request], @{$self->{children}};
… …
724} 900}
725 901
726sub size_allocate { 902sub size_allocate {
727 my ($self, $x, $y, $w, $h) = @_; 903 my ($self, $x, $y, $w, $h) = @_;
728 904
729 $self->_size_allocate ($x, $y, $w, $h) or return; 905 $self->_size_allocate ($x, $y, $w, $h);
730
731 return unless $self->{h};
732 906
733 my $children = $self->{children}; 907 my $children = $self->{children};
734 908
735 my @h = map +($_->size_request)[1], @$children; 909 my @h = map +($_->size_request)[1], @$children;
736 910
737 my $req_h = List::Util::sum @h; 911 my $req_h = List::Util::sum @h;
738 912
739 if ($req_h > $h) { 913 if ($req_h > $h) {
740 # ah well, not enough space 914 # ah well, not enough space
741 $_ = $h[$_] * $h / $req_h for @h; 915 $_ *= $h / $req_h for @h;
742 } else { 916 } else {
743 my @exp = grep $_->{expand}, @$children; 917 my $exp = List::Util::sum map $_->{expand}, @$children;
744 @exp = @$children unless @exp; 918 $exp ||= 1;
745 919
746 my %exp = map +($_ => 1), @exp;
747
748 for (0 .. $#$children) { 920 for (0 .. $#$children) {
749 my $child = $children->[$_]; 921 my $child = $children->[$_];
750 922
751 my $alloc_h = $h[$_]; 923 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
752 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
753 $h[$_] = $alloc_h;
754 } 924 }
755 } 925 }
926
927 CFClient::UI::harmonize \@h;
756 928
757 my $y = 0; 929 my $y = 0;
758 for (0 .. $#$children) { 930 for (0 .. $#$children) {
759 my $child = $children->[$_]; 931 my $child = $children->[$_];
760 my $h = $h[$_]; 932 my $h = $h[$_];
… …
774 946
775sub new { 947sub new {
776 my ($class, %arg) = @_; 948 my ($class, %arg) = @_;
777 949
778 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
779 fg => [1, 1, 1], 951 fg => [1, 1, 1],
780 height => $::FONTSIZE, 952 fontsize => $::FONTSIZE,
781 text => "", 953 text => "",
782 align => -1, 954 align => -1,
955 padding => 2,
783 layout => new CFClient::Layout, 956 layout => new CFClient::Layout,
784 %arg 957 %arg
785 ); 958 );
786 959
787 $self->set_text ($self->{text}); 960 $self->set_text ($self->{text});
788 961
… …
804 977
805 $self->{text} = $text; 978 $self->{text} = $text;
806 $self->{layout}->set_markup ($text); 979 $self->{layout}->set_markup ($text);
807 980
808 delete $self->{texture}; 981 delete $self->{texture};
982# $self->{w} = $self->{h} = -1;
809 $self->update; 983 $self->update;
810} 984}
811 985
812sub get_text { 986sub get_text {
813 my ($self, $text) = @_; 987 my ($self, $text) = @_;
… …
817 991
818sub size_request { 992sub size_request {
819 my ($self) = @_; 993 my ($self) = @_;
820 994
821 $self->{layout}->set_width; 995 $self->{layout}->set_width;
822 $self->{layout}->set_height ($self->{height}); 996 $self->{layout}->set_height ($self->{fontsize});
823 $self->{layout}->size 997 my ($w, $h) = $self->{layout}->size;
824# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack 998
825# ( 999 (
826# $self->{texture}{w}, 1000 $w + $self->{padding} * 2,
827# $self->{texture}{h}, 1001 $h + $self->{padding} * 2,
828# ) 1002 )
829# } else {
830# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
831#
832# ($w, $h)
833# }
834} 1003}
835 1004
836sub size_allocate { 1005sub size_allocate {
837 my ($self, $x, $y, $w, $h) = @_; 1006 my ($self, $x, $y, $w, $h) = @_;
838 1007
… …
851sub _draw { 1020sub _draw {
852 my ($self) = @_; 1021 my ($self) = @_;
853 1022
854 my $tex = $self->{texture} ||= do { 1023 my $tex = $self->{texture} ||= do {
855 $self->{layout}->set_width ($self->{w}); 1024 $self->{layout}->set_width ($self->{w});
1025 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
856 new_from_layout CFClient::Texture $self->{layout} 1026 new_from_layout CFClient::Texture $self->{layout}
857 }; 1027 };
858 1028
859 glEnable GL_BLEND; 1029 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1030 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 1031 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 1033
864 glColor @{$self->{fg}}; 1034 glColor @{$self->{fg}};
865 1035
866 my $x = 1036 my $x =
867 $self->{align} < 0 ? 0 1037 $self->{align} < 0 ? $self->{padding}
868 : $self->{align} > 0 ? $self->{w} - $tex->{w} 1038 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
869 : ($self->{w} - $tex->{w}) * 0.5; 1039 : ($self->{w} - $tex->{w}) * 0.5;
870 1040
871 $tex->draw_quad ($x, 0); 1041 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
872 1042
873 glDisable GL_TEXTURE_2D; 1043 glDisable GL_TEXTURE_2D;
874 glDisable GL_BLEND; 1044 glDisable GL_BLEND;
875} 1045}
876 1046
… …
886sub new { 1056sub new {
887 my $class = shift; 1057 my $class = shift;
888 1058
889 $class->SUPER::new ( 1059 $class->SUPER::new (
890 fg => [1, 1, 1], 1060 fg => [1, 1, 1],
891 bg => [0, 0, 0, 0.4], 1061 bg => [0, 0, 0, 0.2],
892 active_bg => [1, 1, 1], 1062 active_bg => [1, 1, 1, 0.5],
893 active_fg => [0, 0, 0], 1063 active_fg => [0, 0, 0],
1064 can_hover => 1,
1065 can_focus => 1,
894 @_ 1066 @_
895 ) 1067 )
896} 1068}
897 1069
898sub _set_text { 1070sub _set_text {
899 my ($self, $text) = @_; 1071 my ($self, $text) = @_;
900 1072
1073 my $old_text = $self->{text};
1074
901 $self->{last_activity} = $::NOW; 1075 $self->{last_activity} = $::NOW;
902 1076
903 $self->{text} = $text; 1077 $self->{text} = $text;
904 $self->{layout}->set_width ($self->{w}); 1078 $self->{layout}->set_width ($self->{w});
1079 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
905 1080
906 $text =~ s/./*/g if $self->{hidden}; 1081 $text =~ s/./*/g if $self->{hidden};
907 1082
908
909 $self->{layout}->set_markup ($self->escape_text ($text)); 1083 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
910 1084
911 $text = substr $text, 0, $self->{cursor}; 1085 $text = substr $text, 0, $self->{cursor};
912 utf8::encode $text; 1086 utf8::encode $text;
913 1087
914 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1088 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1089
1090 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1091 if $old_text ne $self->{text};
915} 1092}
916 1093
917sub size_request { 1094sub size_request {
918 my ($self) = @_; 1095 my ($self) = @_;
919 1096
… …
954 substr $text, $self->{cursor}, 1, ""; 1131 substr $text, $self->{cursor}, 1, "";
955 } elsif ($sym == SDLK_LEFT) { 1132 } elsif ($sym == SDLK_LEFT) {
956 --$self->{cursor} if $self->{cursor}; 1133 --$self->{cursor} if $self->{cursor};
957 } elsif ($sym == SDLK_RIGHT) { 1134 } elsif ($sym == SDLK_RIGHT) {
958 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1135 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1136 } elsif ($sym == SDLK_HOME) {
1137 $self->{cursor} = 0;
1138 } elsif ($sym == SDLK_END) {
1139 $self->{cursor} = length $text;
1140 } elsif ($sym == SDLK_ESCAPE) {
1141 $self->emit ('escape');
959 } elsif ($uni) { 1142 } elsif ($uni) {
960 substr $text, $self->{cursor}++, 0, chr $uni; 1143 substr $text, $self->{cursor}++, 0, chr $uni;
961 } 1144 }
962 1145
963 $self->_set_text ($text); 1146 $self->_set_text ($text);
… …
978 $self->SUPER::button_down ($ev, $x, $y); 1161 $self->SUPER::button_down ($ev, $x, $y);
979 1162
980 my $idx = $self->{layout}->xy_to_index ($x, $y); 1163 my $idx = $self->{layout}->xy_to_index ($x, $y);
981 1164
982 # byte-index to char-index 1165 # byte-index to char-index
983 my $text = $self->{layout}; 1166 my $text = $self->{text};
984 utf8::encode $text; 1167 utf8::encode $text;
985 $self->{cursor} = length substr $text, 0, $idx; 1168 $self->{cursor} = length substr $text, 0, $idx;
986 1169
987 $self->_set_text ($self->{text}); 1170 $self->_set_text ($self->{text});
988 $self->update; 1171 $self->update;
… …
1003 $self->{fg} = $self->{active_fg}; 1186 $self->{fg} = $self->{active_fg};
1004 } else { 1187 } else {
1005 glColor @{$self->{bg}}; 1188 glColor @{$self->{bg}};
1006 } 1189 }
1007 1190
1191 glEnable GL_BLEND;
1192 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1008 glBegin GL_QUADS; 1193 glBegin GL_QUADS;
1009 glVertex 0 , 0; 1194 glVertex 0 , 0;
1010 glVertex 0 , $self->{h}; 1195 glVertex 0 , $self->{h};
1011 glVertex $self->{w}, $self->{h}; 1196 glVertex $self->{w}, $self->{h};
1012 glVertex $self->{w}, 0; 1197 glVertex $self->{w}, 0;
1013 glEnd; 1198 glEnd;
1199 glDisable GL_BLEND;
1014 1200
1015 $self->SUPER::_draw; 1201 $self->SUPER::_draw;
1016 1202
1017 #TODO: force update every cursor change :( 1203 #TODO: force update every cursor change :(
1018 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1204 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
… …
1022 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1208 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1023 glEnd; 1209 glEnd;
1024 } 1210 }
1025} 1211}
1026 1212
1027#############################################################################
1028
1029package CFClient::UI::Slider; 1213package CFClient::UI::LineEntry;
1030 1214
1031use strict; 1215our @ISA = CFClient::UI::Entry::;
1032 1216
1217use SDL;
1033use SDL::OpenGL; 1218use SDL::OpenGL;
1034 1219
1035our @ISA = CFClient::UI::DrawBG::; 1220sub key_down {
1036
1037sub size_request {
1038 my ($self) = @_; 1221 my ($self, $ev) = @_;
1039 1222
1040 my $w = 50; 1223 my $sym = $ev->key_sym;
1041 my $h = 10;
1042 1224
1043 $self->{vertical} ? ($h, $w) : ($w, $h) 1225 if ($sym == SDLK_RETURN) {
1226 $self->emit (activate => $self->get_text);
1227 $self->update;
1228
1229 } else {
1230 $self->SUPER::key_down ($ev);
1231 }
1232
1044} 1233}
1234
1235#############################################################################
1236
1237package CFClient::UI::Button;
1238
1239our @ISA = CFClient::UI::Label::;
1240
1241use SDL;
1242use SDL::OpenGL;
1243
1244my @tex =
1245 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1246 qw(b1_button_active.png);
1045 1247
1046sub new { 1248sub new {
1047 my $class = shift; 1249 my $class = shift;
1048 1250
1251 $class->SUPER::new (
1252 padding => 4,
1253 fg => [1, 1, 1],
1254 bg => [1, 1, 1, 0.2],
1255 active_fg => [1, 1, 0],
1256 can_hover => 1,
1257 @_
1258 )
1259}
1260
1261sub button_up {
1262 my ($self, $ev, $x, $y) = @_;
1263
1264 if ($x >= 0 && $x < $self->{w}
1265 && $y >= 0 && $y < $self->{h}) {
1266 $self->emit ("activate");
1267 }
1268}
1269
1270sub _draw {
1271 my ($self) = @_;
1272
1273 local $self->{fg} = $self->{fg};
1274 my $tex = $tex[0];
1275
1276 glEnable GL_BLEND;
1277 glEnable GL_TEXTURE_2D;
1278 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1279
1280 if ($GRAB == $self) {
1281 $self->{fg} = $self->{active_fg};
1282 }
1283
1284 glBindTexture GL_TEXTURE_2D, $tex->{name};
1285 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1286
1287 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1288
1289 glDisable GL_TEXTURE_2D;
1290 glDisable GL_BLEND;
1291
1292 $self->SUPER::_draw;
1293}
1294
1295#############################################################################
1296
1297package CFClient::UI::CheckBox;
1298
1299our @ISA = CFClient::UI::DrawBG::;
1300
1301my @tex =
1302 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1303 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1304
1305use SDL;
1306use SDL::OpenGL;
1307
1308sub new {
1309 my $class = shift;
1310
1311 $class->SUPER::new (
1312 padding => 2,
1313 fg => [1, 1, 1],
1314 active_fg => [1, 1, 0],
1315 state => 0,
1316 can_hover => 1,
1317 @_
1318 )
1319}
1320
1321sub size_request {
1322 my ($self) = @_;
1323
1324 ($self->{padding} * 2 + 6) x 2
1325}
1326
1327sub size_allocate {
1328 my ($self, $x, $y, $w, $h) = @_;
1329
1330 $self->_size_allocate ($x, $y, $w, $h);
1331}
1332
1333sub button_down {
1334 my ($self, $ev, $x, $y) = @_;
1335
1336 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1337 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1338 $self->{state} = !$self->{state};
1339 $self->emit (changed => $self->{state});
1340 }
1341}
1342
1343sub _draw {
1344 my ($self) = @_;
1345
1346 $self->SUPER::_draw;
1347
1348 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1349
1350 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1351
1352 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1353
1354 glEnable GL_BLEND;
1355 glEnable GL_TEXTURE_2D;
1356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1357
1358 my $tex = $self->{state} ? $tex[1] : $tex[0];
1359
1360 $tex->draw_quad (0, 0, $s, $s);
1361
1362 glDisable GL_TEXTURE_2D;
1363 glDisable GL_BLEND;
1364}
1365
1366#############################################################################
1367
1368package CFClient::UI::Slider;
1369
1370use strict;
1371
1372use SDL::OpenGL;
1373
1374our @ISA = CFClient::UI::DrawBG::;
1375
1376my @tex =
1377 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1378 qw(s1_slider.png s1_slider_bg.png);
1379
1380sub new {
1381 my $class = shift;
1382
1049 # range [value, low, high, page] 1383 # range [value, low, high, page]
1050 1384
1385 # TODO: 0-width page
1386 # TODO: req_w/h are wrong with vertical
1387 # TODO: calculations are off
1051 $class->SUPER::new ( 1388 my $self = $class->SUPER::new (
1052 fg => [1, 1, 1], 1389 fg => [1, 1, 1],
1053 active_fg => [0, 0, 0], 1390 active_fg => [0, 0, 0],
1054 range => [0, 0, 100, 10], 1391 range => [0, 0, 100, 10],
1392 req_w => 40,
1393 req_h => 13,
1055 vertical => 1, 1394 vertical => 0,
1395 can_hover => 1,
1396 inner_pad => 5,
1056 @_ 1397 @_
1057 ) 1398 );
1399
1400 $self
1401}
1402
1403sub size_request {
1404 my ($self) = @_;
1405
1406 my $w = $self->{req_w};
1407 my $h = $self->{req_h};
1408
1409 $self->{vertical} ? ($h, $w) : ($w, $h)
1058} 1410}
1059 1411
1060sub button_down { 1412sub button_down {
1061 my ($self, $ev, $x, $y) = @_; 1413 my ($self, $ev, $x, $y) = @_;
1062 1414
… …
1070 if ($GRAB == $self) { 1422 if ($GRAB == $self) {
1071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1423 my ($value, $lo, $hi, $page) = @{$self->{range}};
1072 1424
1073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1425 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1074 1426
1427 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1428 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1429
1430 $x -= $inner_pad_px; # substract the padding
1075 $x = $x * ($hi - $lo) / $w + $lo; 1431 $x = $x * ($hi - $lo) / $inner_w + $lo;
1076 $x = $lo if $x < $lo; 1432 $x = $lo if $x < $lo;
1077 $x = $hi - $page if $x > $hi - $page; 1433 $x = $hi - $page if $x > $hi - $page;
1078 $self->{range}[0] = $x; 1434 $self->{range}[0] = $x;
1079 1435
1080 $self->emit (changed => $x); 1436 $self->emit (changed => $x);
1081 $self->update; 1437 $self->update;
1082 } 1438 }
1439}
1440
1441# the inner_* stuff is for generating a padding for the slider handle,
1442# so that the handle doesn't leave the texture. This calculation isn't 100%
1443# correct propably, but it does the job for now
1444sub _calc_inner_pad_px {
1445 my ($self, $w) = @_;
1446 ($w / 100) * $self->{inner_pad} # % to pixels
1083} 1447}
1084 1448
1085sub _draw { 1449sub _draw {
1086 my ($self) = @_; 1450 my ($self) = @_;
1087 1451
… …
1101 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1465 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1102 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1466 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1103 1467
1104 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1468 my ($value, $lo, $hi, $page) = @{$self->{range}};
1105 1469
1470 $hi = $value + 1 if $lo == $hi;
1471
1472 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1473 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1474
1106 $page = int $page * $w / ($hi - $lo); 1475 $page = int $page * $inner_w / ($hi - $lo);
1107 $value = int +($value - $lo) * $w / ($hi - $lo); 1476 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1108 1477
1109 $w -= $page; 1478 $w -= $page;
1110 $page &= ~1; 1479 $page &= ~1;
1111 glTranslate $page * 0.5, 0, 0; 1480 glTranslate $page * 0.5, 0, 0;
1481 $page ||= 2;
1112 1482
1113 glColor @$fg;
1114 glBegin GL_LINES;
1115 glVertex 0, 0; glVertex 0, $h;
1116 glVertex $w - 1, 0; glVertex $w - 1, $h;
1117 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1118 glEnd;
1119
1120 my $knob_a = $value - $page * 0.5; 1483 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1121 my $knob_b = $value + $page * 0.5; 1484 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1122 1485
1123 glBegin GL_QUADS; 1486 glEnable GL_BLEND;
1124 glColor @$fg; 1487 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1125 glVertex $knob_a, 0; 1488 glEnable GL_TEXTURE_2D;
1126 glVertex $knob_a, $h; 1489 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1127 glVertex $knob_b, $h;
1128 glVertex $knob_b, 0;
1129 1490
1130 if ($knob_a < $knob_b - 2) { 1491 # draw background
1131 glColor @$bg; 1492 $tex[1]->draw_quad (0, 0, $w, $h);
1132 glVertex $knob_a + 1, 1; 1493
1133 glVertex $knob_a + 1, $h - 1; 1494 # draw handle
1134 glVertex $knob_b - 1, $h - 1; 1495 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1135 glVertex $knob_b - 1, 1; 1496
1497 glDisable GL_BLEND;
1498 glDisable GL_TEXTURE_2D;
1499}
1500
1501#############################################################################
1502
1503package CFClient::UI::TextView;
1504
1505our @ISA = CFClient::UI::HBox::;
1506
1507use SDL::OpenGL;
1508
1509sub new {
1510 my $class = shift;
1511
1512 my $self = $class->SUPER::new (
1513 req_w => $::WIDTH / 6,
1514 req_h => $::HEIGHT / 6,
1515 fontsize => $::FONTSIZE,
1516 @_,
1517
1518 layout => (new CFClient::Layout),
1519 par => [],
1520 height => 0,
1521 children => [
1522 (new CFClient::UI::Empty expand => 1),
1523 (new CFClient::UI::Slider vertical => 1),
1524 ],
1525 );
1526
1527 $self->{children}[1]->connect (changed => sub {
1528 $self->update;
1529 });
1530
1531 $self
1532}
1533
1534sub set_fontsize {
1535 my ($self, $fontsize) = @_;
1536
1537 $self->{fontsize} = $fontsize;
1538 $self->reflow;
1539}
1540
1541sub text_height {
1542 my ($self, $text) = @_;
1543
1544 my $layout = $self->{layout};
1545
1546 $layout->set_height ($self->{fontsize});
1547 $layout->set_width ($self->{w});
1548 $layout->set_text ($text);
1136 } 1549
1137 glEnd; 1550 ($layout->size)[1]
1551}
1552
1553sub reflow {
1554 my ($self) = @_;
1555
1556 $self->{need_reflow}++;
1557 $self->update;
1558}
1559
1560sub size_request {
1561 my ($self) = @_;
1562
1563 ($self->{req_w}, $self->{req_h})
1564}
1565
1566sub size_allocate {
1567 my ($self, $x, $y, $w, $h) = @_;
1568
1569 $self->SUPER::size_allocate ($x, $y, $w, $h);
1570
1571 $self->{layout}->set_height ($self->{fontsize});
1572 $self->{layout}->set_width ($self->{w});
1573
1574 $self->reflow;
1575}
1576
1577sub add_paragraph {
1578 my ($self, $color, $text) = @_;
1579
1580 #TODO: intelligently "reformat" paragraph
1581
1582 my $height = $self->text_height ($text);
1583
1584 $self->{height} += $height;
1585
1586 push @{$self->{par}}, [$height, $color, $text];
1587
1588 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1589 $self->{children}[1]->update;
1590}
1591
1592sub update {
1593 my ($self) = @_;
1594
1595 $self->SUPER::update;
1596
1597 return unless $self->{h} > 0;
1598
1599 delete $self->{texture};
1600
1601 $ROOT->on_refresh ($self, sub {
1602 if (delete $self->{need_reflow}) {
1603 my $height = 0;
1604
1605 $height += $_->[0] = $self->text_height ($_->[2])
1606 for @{$self->{par}};
1607
1608 $self->{height} = $height;
1609
1610 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1611
1612 delete $self->{texture};
1613 }
1614
1615 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1616 glClearColor 0, 0, 0, 1;
1617 glClear GL_COLOR_BUFFER_BIT;
1618
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623
1624 my $top = int $self->{children}[1]{range}[0];
1625
1626 my $y0 = $top;
1627 my $y1 = $top + $self->{h};
1628
1629 my $y = 0;
1630
1631 my $layout = $self->{layout};
1632
1633 for my $par (@{$self->{par}}) {
1634 my $h = $par->[0];
1635
1636 if ($y0 < $y + $h && $y < $y1) {
1637 $layout->set_text ($par->[2]);
1638
1639 glColor @{ $par->[1] };
1640 my ($W, $H) = $layout->size;
1641 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1642 }
1643
1644 $y += $h;
1645 }
1646
1647 glDisable GL_TEXTURE_2D;
1648 glDisable GL_BLEND;
1649 };
1650 });
1651}
1652
1653sub _draw {
1654 my ($self) = @_;
1655
1656 if ($self->{texture}) {
1657 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1660 glDisable GL_TEXTURE_2D;
1661 }
1662
1663 $self->{children}[1]->draw;
1664
1138} 1665}
1139 1666
1140############################################################################# 1667#############################################################################
1141 1668
1142package CFClient::UI::MapWidget; 1669package CFClient::UI::MapWidget;
… …
1152 1679
1153sub new { 1680sub new {
1154 my $class = shift; 1681 my $class = shift;
1155 1682
1156 $class->SUPER::new ( 1683 $class->SUPER::new (
1157 z => -1, 1684 z => -1,
1685 can_focus => 1,
1158 list => (glGenLists 1), 1686 list => (glGenLists 1),
1159 @_ 1687 @_
1160 ) 1688 )
1161} 1689}
1162 1690
1163sub key_down { 1691sub key_down {
… …
1165} 1693}
1166 1694
1167sub key_up { 1695sub key_up {
1168} 1696}
1169 1697
1698sub button_down {
1699 my ($self, $ev, $x, $y) = @_;
1700
1701 $self->focus_in;
1702
1703 if ($ev->button == 2) {
1704 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1705 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1706
1707 $self->{motion} = sub {
1708 my ($ev, $x, $y) = @_;
1709
1710 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1711
1712 $::CFG->{map_shift_x} = $bw + $x - $ox;
1713 $::CFG->{map_shift_y} = $bh + $y - $oy;
1714
1715 $self->update;
1716 };
1717 }
1718}
1719
1720sub button_up {
1721 my ($self, $ev, $x, $y) = @_;
1722
1723 delete $self->{motion};
1724}
1725
1726sub mouse_motion {
1727 my ($self, $ev, $x, $y) = @_;
1728
1729 $self->{motion}->($ev, $x, $y) if $self->{motion};
1730}
1731
1170sub size_request { 1732sub size_request {
1171 ( 1733 (
1172 1 + int $::WIDTH / 32, 1734 1 + 32 * int $::WIDTH / 32,
1173 1 + int $::HEIGHT / 32, 1735 1 + 32 * int $::HEIGHT / 32,
1174 ) 1736 )
1175} 1737}
1176 1738
1177sub update { 1739sub update {
1178 my ($self) = @_; 1740 my ($self) = @_;
1179 1741
1180 $self->{need_update} = 1; 1742 $self->{need_update} = 1;
1181 $self->SUPER::update; 1743 $self->SUPER::update;
1182} 1744}
1183 1745
1184sub _draw { 1746sub draw {
1185 my ($self) = @_; 1747 my ($self) = @_;
1186 1748
1187 if (delete $self->{need_update}) { 1749 if (delete $self->{need_update}) {
1188 glNewList $self->{list}, GL_COMPILE; 1750 glNewList $self->{list}, GL_COMPILE;
1189 1751
1190 my $mx = $::CONN->{mapx}; 1752 if ($::MAP) {
1191 my $my = $::CONN->{mapy};
1192
1193 my $map = $::CONN->{map};
1194
1195 my ($xofs, $yofs);
1196
1197 my $sw = 1 + int $::WIDTH / 32; 1753 my $sw = int $::WIDTH / 32;
1198 my $sh = 1 + int $::HEIGHT / 32; 1754 my $sh = int $::HEIGHT / 32;
1199 1755
1200 if ($::CONN->{mapw} > $sw) { 1756 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1201 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1757 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1202 } else { 1758
1203 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1759 glTranslate $sx0 - 32, $sy0 - 32, 0;
1760
1761 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1762
1763 if ($::CFG->{fow_enable}) {
1764 if ($::CFG->{fow_smooth}) { # smooth fog of war
1765 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1766 glConvolutionFilter2D
1767 GL_CONVOLUTION_2D,
1768 GL_ALPHA,
1769 3, 3,
1770 GL_ALPHA, GL_FLOAT,
1771 pack "f*",
1772 0.1, 0.1, 0.1,
1773 0.1, 0.2, 0.1,
1774 0.1, 0.1, 0.1,
1775 ;
1776 glEnable GL_CONVOLUTION_2D;
1777 }
1778
1779 my $tex = new CFClient::Texture
1780 w => $w,
1781 h => $h,
1782 data => $data,
1783 internalformat => GL_ALPHA,
1784 format => GL_ALPHA;
1785
1786 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1787
1788 glEnable GL_BLEND;
1789 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1790 glEnable GL_TEXTURE_2D;
1791 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1792
1793 glColor +($::CFG->{fow_intensity}) x 3, 1;
1794 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1795
1796 glDisable GL_TEXTURE_2D;
1797 glDisable GL_BLEND;
1798 }
1799
1800 # HACK BEGIN
1801 {
1802 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1803 my ($w, $h) = (250, 250);
1804
1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809
1810 CFClient::Texture->new (
1811 w => $w,
1812 h => $h,
1813 data => $::MAP->mapmap ($w, $h),
1814 type => GL_UNSIGNED_INT_8_8_8_8_REV
1815 )->draw_quad (100, 100);
1816
1817 glDisable GL_TEXTURE_2D;
1818 glDisable GL_BLEND;
1819 }
1820 # HACK END
1204 } 1821 }
1205 1822
1206 if ($::CONN->{maph} > $sh) {
1207 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1208 } else {
1209 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1210 }
1211
1212 glEnable GL_TEXTURE_2D;
1213 glEnable GL_BLEND;
1214 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1215 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1216
1217 my $sw4 = ($sw + 3) & ~3;
1218 my $darkness = "\x00" x ($sw4 * $sh);
1219
1220 for my $x (0 .. $sw - 1) {
1221 my $row = $map->[$x + $xofs];
1222 for my $y (0 .. $sh - 1) {
1223
1224 my $cell = $row->[$y + $yofs]
1225 or next;
1226
1227 my $dark = $cell->[0];
1228 if ($dark < 0) {
1229 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1230 } else {
1231 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1232 }
1233
1234 for my $num (grep $_, @$cell[1,2,3]) {
1235 my $tex = $::CONN->{face}[$num]{texture} || next;
1236
1237 my ($w, $h) = @$tex{qw(w h)};
1238
1239 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1240 }
1241 }
1242 }
1243
1244# if (1) { # higher quality darkness
1245# $lighting =~ s/(.)/$1$1$1/gs;
1246# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1247#
1248# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1249#
1250# $lighting = $pb->get_pixels;
1251# $lighting =~ s/(.)../$1/gs;
1252# }
1253
1254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1255
1256 $darkness = new CFClient::Texture
1257 w => $sw4,
1258 h => $sh,
1259 data => $darkness,
1260 internalformat => GL_ALPHA,
1261 format => GL_ALPHA;
1262
1263 glColor 0.45, 0.45, 0.45, 1;
1264 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1265
1266 glDisable GL_TEXTURE_2D;
1267 glDisable GL_BLEND;
1268
1269 glEndList; 1823 glEndList;
1270 } 1824 }
1271 1825
1826 glPushMatrix;
1272 glCallList $self->{list}; 1827 glCallList $self->{list};
1828 glPopMatrix;
1829
1830 if ($FOCUS != $self) {
1831 glColor 64/255, 64/255, 64/255;
1832 glLogicOp GL_AND;
1833 glEnable GL_COLOR_LOGIC_OP;
1834 glBegin GL_QUADS;
1835 glVertex 0, 0;
1836 glVertex 0, $::HEIGHT;
1837 glVertex $::WIDTH, $::HEIGHT;
1838 glVertex $::WIDTH, 0;
1839 glEnd;
1840 glDisable GL_COLOR_LOGIC_OP;
1841 }
1273} 1842}
1274 1843
1275my %DIR = ( 1844my %DIR = (
1276 SDLK_KP8, [1, "north"], 1845 SDLK_KP8, [1, "north"],
1277 SDLK_KP9, [2, "northeast"], 1846 SDLK_KP9, [2, "northeast"],
… …
1293 1862
1294 my $mod = $ev->key_mod; 1863 my $mod = $ev->key_mod;
1295 my $sym = $ev->key_sym; 1864 my $sym = $ev->key_sym;
1296 1865
1297 if ($sym == SDLK_KP5) { 1866 if ($sym == SDLK_KP5) {
1298 $::CONN->send ("command stay fire"); 1867 $::CONN->user_send ("command stay fire");
1868 } elsif ($sym == SDLK_a) {
1869 $::CONN->user_send ("command apply");
1870 } elsif ($sym == SDLK_QUOTE) {
1871 $self->emit ('activate_console');
1872 } elsif ($sym == SDLK_SLASH) {
1873 $self->emit ('activate_console' => '/');
1299 } elsif (exists $DIR{$sym}) { 1874 } elsif (exists $DIR{$sym}) {
1300 if ($mod & KMOD_SHIFT) { 1875 if ($mod & KMOD_SHIFT) {
1301 $self->{shft}++; 1876 $self->{shft}++;
1302 $::CONN->send ("command fire $DIR{$sym}[0]"); 1877 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1303 } elsif ($mod & KMOD_CTRL) { 1878 } elsif ($mod & KMOD_CTRL) {
1304 $self->{ctrl}++; 1879 $self->{ctrl}++;
1305 $::CONN->send ("command run $DIR{$sym}[0]"); 1880 $::CONN->user_send ("command run $DIR{$sym}[0]");
1306 } else { 1881 } else {
1307 $::CONN->send ("command $DIR{$sym}[1]"); 1882 $::CONN->user_send ("command $DIR{$sym}[1]");
1308 } 1883 }
1309 } 1884 }
1310} 1885}
1311 1886
1312sub key_up { 1887sub key_up {
… …
1314 1889
1315 my $mod = $ev->key_mod; 1890 my $mod = $ev->key_mod;
1316 my $sym = $ev->key_sym; 1891 my $sym = $ev->key_sym;
1317 1892
1318 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1893 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1319 $::CONN->send ("command fire_stop"); 1894 $::CONN->user_send ("command fire_stop");
1320 } 1895 }
1321 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1896 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1322 $::CONN->send ("command run_stop"); 1897 $::CONN->user_send ("command run_stop");
1323 } 1898 }
1324} 1899}
1325 1900
1326############################################################################# 1901#############################################################################
1327 1902
… …
1365 glPopMatrix; 1940 glPopMatrix;
1366} 1941}
1367 1942
1368############################################################################# 1943#############################################################################
1369 1944
1370package CFClient::UI::Toplevel; 1945package CFClient::UI::Flopper;
1946
1947our @ISA = CFClient::UI::Button::;
1948
1949sub new {
1950 my $class = shift;
1951
1952 my $self = $class->SUPER::new (
1953 state => 0,
1954 connect_activate => \&toggle_flopper,
1955 @_
1956 );
1957
1958 if ($self->{state}) {
1959 $self->{state} = 0;
1960 $self->toggle_flopper;
1961 }
1962
1963 $self
1964}
1965
1966sub toggle_flopper {
1967 my ($self) = @_;
1968
1969 # TODO: use animation
1970 if ($self->{state} = !$self->{state}) {
1971 $CFClient::UI::ROOT->add ($self->{other});
1972 $self->{other}->move ($self->coord2global (0, $self->{h}));
1973 $self->emit ("open");
1974 } else {
1975 $CFClient::UI::ROOT->remove ($self->{other});
1976 $self->emit ("close");
1977 }
1978
1979 $self->emit (changed => $self->{state});
1980}
1981
1982#############################################################################
1983
1984package CFClient::UI::Root;
1371 1985
1372our @ISA = CFClient::UI::Container::; 1986our @ISA = CFClient::UI::Container::;
1987
1988use SDL::OpenGL;
1373 1989
1374sub size_request { 1990sub size_request {
1375 ($::WIDTH, $::HEIGHT) 1991 ($::WIDTH, $::HEIGHT)
1376} 1992}
1377 1993
… …
1382 1998
1383 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1999 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1384 for @{$self->{children}}; 2000 for @{$self->{children}};
1385} 2001}
1386 2002
1387sub translate { 2003sub _topleft {
1388 my ($self, $x, $y) = @_; 2004 my ($self, $x, $y) = @_;
1389 2005
1390 ($x, $y) 2006 ($x, $y)
1391} 2007}
1392 2008
… …
1403 $self->SUPER::add ($widget); 2019 $self->SUPER::add ($widget);
1404 2020
1405 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2021 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1406} 2022}
1407 2023
2024sub on_refresh {
2025 my ($self, $id, $cb) = @_;
2026
2027 $self->{refresh_hook}{$id} = $cb;
2028}
2029
1408sub draw { 2030sub draw {
1409 my ($self) = @_; 2031 my ($self) = @_;
1410 2032
2033 while (my $rcb = delete $self->{refresh_hook}) {
2034 $_->() for values %$rcb;
2035 }
2036
2037 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2038 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2039 glClear GL_COLOR_BUFFER_BIT;
2040
2041 glMatrixMode GL_PROJECTION;
2042 glLoadIdentity;
2043 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2044 glMatrixMode GL_MODELVIEW;
2045 glLoadIdentity;
2046
1411 $self->_draw; 2047 $self->_draw;
1412} 2048}
1413 2049
1414############################################################################# 2050#############################################################################
1415 2051
1416package CFClient::UI; 2052package CFClient::UI;
1417 2053
1418$TOPLEVEL = new CFClient::UI::Toplevel; 2054$ROOT = new CFClient::UI::Root;
1419 2055
14201 20561
1421 2057

Diff Legend

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