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.119 by root, Sun Apr 16 07:25:30 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} = int $x;
97 $self->{y} = $y; 118 $self->{y} = int $y;
98 $self->{z} = $z if defined $z; 119 $self->{z} = $z if defined $z;
99} 120}
100 121
101sub needs_redraw { 122sub needs_redraw {
102 0 123 0
… …
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 => int $::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 valign => -1,
956 padding => 2,
783 layout => new CFClient::Layout, 957 layout => new CFClient::Layout,
784 %arg 958 %arg
785 ); 959 );
786 960
787 $self->set_text ($self->{text}); 961 $self->set_text ($self->{text});
788 962
… …
804 978
805 $self->{text} = $text; 979 $self->{text} = $text;
806 $self->{layout}->set_markup ($text); 980 $self->{layout}->set_markup ($text);
807 981
808 delete $self->{texture}; 982 delete $self->{texture};
983# $self->{w} = $self->{h} = -1;
809 $self->update; 984 $self->update;
810} 985}
811 986
812sub get_text { 987sub get_text {
813 my ($self, $text) = @_; 988 my ($self, $text) = @_;
… …
817 992
818sub size_request { 993sub size_request {
819 my ($self) = @_; 994 my ($self) = @_;
820 995
821 $self->{layout}->set_width; 996 $self->{layout}->set_width;
822 $self->{layout}->set_height ($self->{height}); 997 $self->{layout}->set_height ($self->{fontsize});
823 $self->{layout}->size 998 my ($w, $h) = $self->{layout}->size;
824# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack 999
825# ( 1000 (
826# $self->{texture}{w}, 1001 $w + $self->{padding} * 2,
827# $self->{texture}{h}, 1002 $h + $self->{padding} * 2,
828# ) 1003 )
829# } else {
830# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
831#
832# ($w, $h)
833# }
834} 1004}
835 1005
836sub size_allocate { 1006sub size_allocate {
837 my ($self, $x, $y, $w, $h) = @_; 1007 my ($self, $x, $y, $w, $h) = @_;
838 1008
… …
851sub _draw { 1021sub _draw {
852 my ($self) = @_; 1022 my ($self) = @_;
853 1023
854 my $tex = $self->{texture} ||= do { 1024 my $tex = $self->{texture} ||= do {
855 $self->{layout}->set_width ($self->{w}); 1025 $self->{layout}->set_width ($self->{w});
1026 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
856 new_from_layout CFClient::Texture $self->{layout} 1027 new_from_layout CFClient::Texture $self->{layout}
857 }; 1028 };
858 1029
859 glEnable GL_BLEND; 1030 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 1032 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 1034
864 glColor @{$self->{fg}}; 1035 glColor @{$self->{fg}};
865 1036
866 my $x = 1037 my $x =
867 $self->{align} < 0 ? 0 1038 $self->{align} < 0 ? $self->{padding}
868 : $self->{align} > 0 ? $self->{w} - $tex->{w} 1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
869 : ($self->{w} - $tex->{w}) * 0.5; 1040 : ($self->{w} - $tex->{w}) * 0.5;
870 1041
1042 my $y =
1043 $self->{valign} < 0 ? $self->{padding}
1044 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1045 : ($self->{h} - $tex->{h}) * 0.5;
1046
871 $tex->draw_quad ($x, 0); 1047 $tex->draw_quad (int $x, int $y);
872 1048
873 glDisable GL_TEXTURE_2D; 1049 glDisable GL_TEXTURE_2D;
874 glDisable GL_BLEND; 1050 glDisable GL_BLEND;
875} 1051}
876 1052
… …
886sub new { 1062sub new {
887 my $class = shift; 1063 my $class = shift;
888 1064
889 $class->SUPER::new ( 1065 $class->SUPER::new (
890 fg => [1, 1, 1], 1066 fg => [1, 1, 1],
891 bg => [0, 0, 0, 0.4], 1067 bg => [0, 0, 0, 0.2],
892 active_bg => [1, 1, 1], 1068 active_bg => [1, 1, 1, 0.5],
893 active_fg => [0, 0, 0], 1069 active_fg => [0, 0, 0],
1070 can_hover => 1,
1071 can_focus => 1,
1072 valign => 0,
894 @_ 1073 @_
895 ) 1074 )
896} 1075}
897 1076
898sub _set_text { 1077sub _set_text {
899 my ($self, $text) = @_; 1078 my ($self, $text) = @_;
900 1079
1080 my $old_text = $self->{text};
1081
901 $self->{last_activity} = $::NOW; 1082 $self->{last_activity} = $::NOW;
902 1083
903 $self->{text} = $text; 1084 $self->{text} = $text;
904 $self->{layout}->set_width ($self->{w}); 1085 $self->{layout}->set_width ($self->{w});
1086 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
905 1087
906 $text =~ s/./*/g if $self->{hidden}; 1088 $text =~ s/./*/g if $self->{hidden};
907 1089
908
909 $self->{layout}->set_markup ($self->escape_text ($text)); 1090 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
910 1091
911 $text = substr $text, 0, $self->{cursor}; 1092 $text = substr $text, 0, $self->{cursor};
912 utf8::encode $text; 1093 utf8::encode $text;
913 1094
914 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1095 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1096
1097 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1098 if $old_text ne $self->{text};
915} 1099}
916 1100
917sub size_request { 1101sub size_request {
918 my ($self) = @_; 1102 my ($self) = @_;
919 1103
… …
954 substr $text, $self->{cursor}, 1, ""; 1138 substr $text, $self->{cursor}, 1, "";
955 } elsif ($sym == SDLK_LEFT) { 1139 } elsif ($sym == SDLK_LEFT) {
956 --$self->{cursor} if $self->{cursor}; 1140 --$self->{cursor} if $self->{cursor};
957 } elsif ($sym == SDLK_RIGHT) { 1141 } elsif ($sym == SDLK_RIGHT) {
958 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1142 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1143 } elsif ($sym == SDLK_HOME) {
1144 $self->{cursor} = 0;
1145 } elsif ($sym == SDLK_END) {
1146 $self->{cursor} = length $text;
1147 } elsif ($sym == SDLK_ESCAPE) {
1148 $self->emit ('escape');
959 } elsif ($uni) { 1149 } elsif ($uni) {
960 substr $text, $self->{cursor}++, 0, chr $uni; 1150 substr $text, $self->{cursor}++, 0, chr $uni;
961 } 1151 }
962 1152
963 $self->_set_text ($text); 1153 $self->_set_text ($text);
… …
978 $self->SUPER::button_down ($ev, $x, $y); 1168 $self->SUPER::button_down ($ev, $x, $y);
979 1169
980 my $idx = $self->{layout}->xy_to_index ($x, $y); 1170 my $idx = $self->{layout}->xy_to_index ($x, $y);
981 1171
982 # byte-index to char-index 1172 # byte-index to char-index
983 my $text = $self->{layout}; 1173 my $text = $self->{text};
984 utf8::encode $text; 1174 utf8::encode $text;
985 $self->{cursor} = length substr $text, 0, $idx; 1175 $self->{cursor} = length substr $text, 0, $idx;
986 1176
987 $self->_set_text ($self->{text}); 1177 $self->_set_text ($self->{text});
988 $self->update; 1178 $self->update;
… …
1003 $self->{fg} = $self->{active_fg}; 1193 $self->{fg} = $self->{active_fg};
1004 } else { 1194 } else {
1005 glColor @{$self->{bg}}; 1195 glColor @{$self->{bg}};
1006 } 1196 }
1007 1197
1198 glEnable GL_BLEND;
1199 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1008 glBegin GL_QUADS; 1200 glBegin GL_QUADS;
1009 glVertex 0 , 0; 1201 glVertex 0 , 0;
1010 glVertex 0 , $self->{h}; 1202 glVertex 0 , $self->{h};
1011 glVertex $self->{w}, $self->{h}; 1203 glVertex $self->{w}, $self->{h};
1012 glVertex $self->{w}, 0; 1204 glVertex $self->{w}, 0;
1013 glEnd; 1205 glEnd;
1206 glDisable GL_BLEND;
1014 1207
1015 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1016 1209
1017 #TODO: force update every cursor change :( 1210 #TODO: force update every cursor change :(
1018 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1211 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
… …
1022 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1215 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1023 glEnd; 1216 glEnd;
1024 } 1217 }
1025} 1218}
1026 1219
1027#############################################################################
1028
1029package CFClient::UI::Slider; 1220package CFClient::UI::LineEntry;
1030 1221
1031use strict; 1222our @ISA = CFClient::UI::Entry::;
1032 1223
1224use SDL;
1033use SDL::OpenGL; 1225use SDL::OpenGL;
1034 1226
1035our @ISA = CFClient::UI::DrawBG::; 1227sub key_down {
1036
1037sub size_request {
1038 my ($self) = @_; 1228 my ($self, $ev) = @_;
1039 1229
1040 my $w = 50; 1230 my $sym = $ev->key_sym;
1041 my $h = 10;
1042 1231
1043 $self->{vertical} ? ($h, $w) : ($w, $h) 1232 if ($sym == SDLK_RETURN) {
1233 $self->emit (activate => $self->get_text);
1234 $self->update;
1235
1236 } else {
1237 $self->SUPER::key_down ($ev);
1238 }
1239
1044} 1240}
1241
1242#############################################################################
1243
1244package CFClient::UI::Button;
1245
1246our @ISA = CFClient::UI::Label::;
1247
1248use SDL;
1249use SDL::OpenGL;
1250
1251my @tex =
1252 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1253 qw(b1_button_active.png);
1045 1254
1046sub new { 1255sub new {
1047 my $class = shift; 1256 my $class = shift;
1048 1257
1258 $class->SUPER::new (
1259 padding => 4,
1260 fg => [1, 1, 1],
1261 bg => [1, 1, 1, 0.2],
1262 active_fg => [1, 1, 0],
1263 can_hover => 1,
1264 @_
1265 )
1266}
1267
1268sub button_up {
1269 my ($self, $ev, $x, $y) = @_;
1270
1271 if ($x >= 0 && $x < $self->{w}
1272 && $y >= 0 && $y < $self->{h}) {
1273 $self->emit ("activate");
1274 }
1275}
1276
1277sub _draw {
1278 my ($self) = @_;
1279
1280 local $self->{fg} = $self->{fg};
1281
1282 if ($GRAB == $self) {
1283 $self->{fg} = $self->{active_fg};
1284 }
1285
1286 glEnable GL_BLEND;
1287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1288 glEnable GL_TEXTURE_2D;
1289 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1290 glColor 0, 0, 0, 1;
1291
1292 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1293
1294 glDisable GL_TEXTURE_2D;
1295 glDisable GL_BLEND;
1296
1297 $self->SUPER::_draw;
1298}
1299
1300#############################################################################
1301
1302package CFClient::UI::CheckBox;
1303
1304our @ISA = CFClient::UI::DrawBG::;
1305
1306my @tex =
1307 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1308 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1309
1310use SDL;
1311use SDL::OpenGL;
1312
1313sub new {
1314 my $class = shift;
1315
1316 $class->SUPER::new (
1317 padding => 2,
1318 fg => [1, 1, 1],
1319 active_fg => [1, 1, 0],
1320 state => 0,
1321 can_hover => 1,
1322 @_
1323 )
1324}
1325
1326sub size_request {
1327 my ($self) = @_;
1328
1329 ($self->{padding} * 2 + 6) x 2
1330}
1331
1332sub size_allocate {
1333 my ($self, $x, $y, $w, $h) = @_;
1334
1335 $self->_size_allocate ($x, $y, $w, $h);
1336}
1337
1338sub button_down {
1339 my ($self, $ev, $x, $y) = @_;
1340
1341 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1342 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1343 $self->{state} = !$self->{state};
1344 $self->emit (changed => $self->{state});
1345 }
1346}
1347
1348sub _draw {
1349 my ($self) = @_;
1350
1351 $self->SUPER::_draw;
1352
1353 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1354
1355 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1356
1357 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1358
1359 glEnable GL_BLEND;
1360 glEnable GL_TEXTURE_2D;
1361 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1362
1363 my $tex = $self->{state} ? $tex[1] : $tex[0];
1364
1365 $tex->draw_quad (0, 0, $s, $s);
1366
1367 glDisable GL_TEXTURE_2D;
1368 glDisable GL_BLEND;
1369}
1370
1371#############################################################################
1372
1373package CFClient::UI::Slider;
1374
1375use strict;
1376
1377use SDL::OpenGL;
1378
1379our @ISA = CFClient::UI::DrawBG::;
1380
1381my @tex =
1382 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1383 qw(s1_slider.png s1_slider_bg.png);
1384
1385sub new {
1386 my $class = shift;
1387
1049 # range [value, low, high, page] 1388 # range [value, low, high, page]
1050 1389
1390 # TODO: 0-width page
1391 # TODO: req_w/h are wrong with vertical
1392 # TODO: calculations are off
1051 $class->SUPER::new ( 1393 my $self = $class->SUPER::new (
1052 fg => [1, 1, 1], 1394 fg => [1, 1, 1],
1053 active_fg => [0, 0, 0], 1395 active_fg => [0, 0, 0],
1054 range => [0, 0, 100, 10], 1396 range => [0, 0, 100, 10],
1397 req_w => 40,
1398 req_h => 13,
1055 vertical => 1, 1399 vertical => 0,
1400 can_hover => 1,
1401 inner_pad => 5,
1056 @_ 1402 @_
1057 ) 1403 );
1404
1405 $self
1406}
1407
1408sub size_request {
1409 my ($self) = @_;
1410
1411 my $w = $self->{req_w};
1412 my $h = $self->{req_h};
1413
1414 $self->{vertical} ? ($h, $w) : ($w, $h)
1058} 1415}
1059 1416
1060sub button_down { 1417sub button_down {
1061 my ($self, $ev, $x, $y) = @_; 1418 my ($self, $ev, $x, $y) = @_;
1062 1419
… …
1070 if ($GRAB == $self) { 1427 if ($GRAB == $self) {
1071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1428 my ($value, $lo, $hi, $page) = @{$self->{range}};
1072 1429
1073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1074 1431
1432 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1433 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1434
1435 $x -= $inner_pad_px; # substract the padding
1075 $x = $x * ($hi - $lo) / $w + $lo; 1436 $x = $x * ($hi - $lo) / $inner_w + $lo;
1076 $x = $lo if $x < $lo; 1437 $x = $lo if $x < $lo;
1077 $x = $hi - $page if $x > $hi - $page; 1438 $x = $hi - $page if $x > $hi - $page;
1078 $self->{range}[0] = $x; 1439 $self->{range}[0] = $x;
1079 1440
1080 $self->emit (changed => $x); 1441 $self->emit (changed => $x);
1081 $self->update; 1442 $self->update;
1082 } 1443 }
1444}
1445
1446# the inner_* stuff is for generating a padding for the slider handle,
1447# so that the handle doesn't leave the texture. This calculation isn't 100%
1448# correct propably, but it does the job for now
1449sub _calc_inner_pad_px {
1450 my ($self, $w) = @_;
1451 ($w / 100) * $self->{inner_pad} # % to pixels
1083} 1452}
1084 1453
1085sub _draw { 1454sub _draw {
1086 my ($self) = @_; 1455 my ($self) = @_;
1087 1456
… …
1101 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1470 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1102 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1471 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1103 1472
1104 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1473 my ($value, $lo, $hi, $page) = @{$self->{range}};
1105 1474
1475 $hi = $value + 1 if $lo == $hi;
1476
1477 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1478 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1479
1106 $page = int $page * $w / ($hi - $lo); 1480 $page = int $page * $inner_w / ($hi - $lo);
1107 $value = int +($value - $lo) * $w / ($hi - $lo); 1481 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1108 1482
1109 $w -= $page; 1483 $w -= $page;
1110 $page &= ~1; 1484 $page &= ~1;
1111 glTranslate $page * 0.5, 0, 0; 1485 glTranslate $page * 0.5, 0, 0;
1486 $page ||= 2;
1112 1487
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; 1488 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1121 my $knob_b = $value + $page * 0.5; 1489 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1122 1490
1123 glBegin GL_QUADS; 1491 glEnable GL_BLEND;
1124 glColor @$fg; 1492 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1125 glVertex $knob_a, 0; 1493 glEnable GL_TEXTURE_2D;
1126 glVertex $knob_a, $h; 1494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1127 glVertex $knob_b, $h;
1128 glVertex $knob_b, 0;
1129 1495
1130 if ($knob_a < $knob_b - 2) { 1496 # draw background
1131 glColor @$bg; 1497 $tex[1]->draw_quad (0, 0, $w, $h);
1132 glVertex $knob_a + 1, 1; 1498
1133 glVertex $knob_a + 1, $h - 1; 1499 # draw handle
1134 glVertex $knob_b - 1, $h - 1; 1500 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1135 glVertex $knob_b - 1, 1; 1501
1502 glDisable GL_BLEND;
1503 glDisable GL_TEXTURE_2D;
1504}
1505
1506#############################################################################
1507
1508package CFClient::UI::TextView;
1509
1510our @ISA = CFClient::UI::HBox::;
1511
1512use SDL::OpenGL;
1513
1514sub new {
1515 my $class = shift;
1516
1517 my $self = $class->SUPER::new (
1518 req_w => $::WIDTH / 6,
1519 req_h => $::HEIGHT / 6,
1520 fontsize => $::FONTSIZE,
1521 @_,
1522
1523 layout => (new CFClient::Layout),
1524 par => [],
1525 height => 0,
1526 children => [
1527 (new CFClient::UI::Empty expand => 1),
1528 (new CFClient::UI::Slider vertical => 1),
1529 ],
1530 );
1531
1532 $self->{children}[1]->connect (changed => sub {
1533 $self->update;
1534 });
1535
1536 $self
1537}
1538
1539sub set_fontsize {
1540 my ($self, $fontsize) = @_;
1541
1542 $self->{fontsize} = $fontsize;
1543 $self->reflow;
1544}
1545
1546sub text_height {
1547 my ($self, $text) = @_;
1548
1549 my $layout = $self->{layout};
1550
1551 $layout->set_height ($self->{fontsize});
1552 $layout->set_width ($self->{w});
1553 $layout->set_text ($text);
1136 } 1554
1137 glEnd; 1555 ($layout->size)[1]
1556}
1557
1558sub reflow {
1559 my ($self) = @_;
1560
1561 $self->{need_reflow}++;
1562 $self->update;
1563}
1564
1565sub size_request {
1566 my ($self) = @_;
1567
1568 ($self->{req_w}, $self->{req_h})
1569}
1570
1571sub size_allocate {
1572 my ($self, $x, $y, $w, $h) = @_;
1573
1574 $self->SUPER::size_allocate ($x, $y, $w, $h);
1575
1576 $self->{layout}->set_height ($self->{fontsize});
1577 $self->{layout}->set_width ($self->{w});
1578
1579 $self->reflow;
1580}
1581
1582sub add_paragraph {
1583 my ($self, $color, $text) = @_;
1584
1585 #TODO: intelligently "reformat" paragraph
1586
1587 my $height = $self->text_height ($text);
1588
1589 $self->{height} += $height;
1590
1591 push @{$self->{par}}, [$height, $color, $text];
1592
1593 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1594 $self->{children}[1]->update;
1595}
1596
1597sub update {
1598 my ($self) = @_;
1599
1600 $self->SUPER::update;
1601
1602 return unless $self->{h} > 0;
1603
1604 delete $self->{texture};
1605
1606 $ROOT->on_refresh ($self, sub {
1607 if (delete $self->{need_reflow}) {
1608 my $height = 0;
1609
1610 $height += $_->[0] = $self->text_height ($_->[2])
1611 for @{$self->{par}};
1612
1613 $self->{height} = $height;
1614
1615 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1616
1617 delete $self->{texture};
1618 }
1619
1620 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1621 glClearColor 0, 0, 0, 1;
1622 glClear GL_COLOR_BUFFER_BIT;
1623
1624 glEnable GL_BLEND;
1625 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1626 glEnable GL_TEXTURE_2D;
1627 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1628
1629 my $top = int $self->{children}[1]{range}[0];
1630
1631 my $y0 = $top;
1632 my $y1 = $top + $self->{h};
1633
1634 my $y = 0;
1635
1636 my $layout = $self->{layout};
1637
1638 for my $par (@{$self->{par}}) {
1639 my $h = $par->[0];
1640
1641 if ($y0 < $y + $h && $y < $y1) {
1642 $layout->set_text ($par->[2]);
1643
1644 glColor @{ $par->[1] };
1645 my ($W, $H) = $layout->size;
1646 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1647 }
1648
1649 $y += $h;
1650 }
1651
1652 glDisable GL_TEXTURE_2D;
1653 glDisable GL_BLEND;
1654 };
1655 });
1656}
1657
1658sub _draw {
1659 my ($self) = @_;
1660
1661 if ($self->{texture}) {
1662 glEnable GL_TEXTURE_2D;
1663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1664 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1665 glDisable GL_TEXTURE_2D;
1666 }
1667
1668 $self->{children}[1]->draw;
1669
1138} 1670}
1139 1671
1140############################################################################# 1672#############################################################################
1141 1673
1142package CFClient::UI::MapWidget; 1674package CFClient::UI::MapWidget;
… …
1152 1684
1153sub new { 1685sub new {
1154 my $class = shift; 1686 my $class = shift;
1155 1687
1156 $class->SUPER::new ( 1688 $class->SUPER::new (
1157 z => -1, 1689 z => -1,
1690 can_focus => 1,
1158 list => (glGenLists 1), 1691 list => (glGenLists 1),
1159 @_ 1692 @_
1160 ) 1693 )
1161} 1694}
1162 1695
1163sub key_down { 1696sub key_down {
… …
1165} 1698}
1166 1699
1167sub key_up { 1700sub key_up {
1168} 1701}
1169 1702
1703sub button_down {
1704 my ($self, $ev, $x, $y) = @_;
1705
1706 $self->focus_in;
1707
1708 if ($ev->button == 2) {
1709 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1710 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1711
1712 $self->{motion} = sub {
1713 my ($ev, $x, $y) = @_;
1714
1715 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1716
1717 $::CFG->{map_shift_x} = $bw + $x - $ox;
1718 $::CFG->{map_shift_y} = $bh + $y - $oy;
1719
1720 $self->update;
1721 };
1722 }
1723}
1724
1725sub button_up {
1726 my ($self, $ev, $x, $y) = @_;
1727
1728 delete $self->{motion};
1729}
1730
1731sub mouse_motion {
1732 my ($self, $ev, $x, $y) = @_;
1733
1734 $self->{motion}->($ev, $x, $y) if $self->{motion};
1735}
1736
1170sub size_request { 1737sub size_request {
1171 ( 1738 (
1172 1 + int $::WIDTH / 32, 1739 1 + 32 * int $::WIDTH / 32,
1173 1 + int $::HEIGHT / 32, 1740 1 + 32 * int $::HEIGHT / 32,
1174 ) 1741 )
1175} 1742}
1176 1743
1177sub update { 1744sub update {
1178 my ($self) = @_; 1745 my ($self) = @_;
1179 1746
1180 $self->{need_update} = 1; 1747 $self->{need_update} = 1;
1181 $self->SUPER::update; 1748 $self->SUPER::update;
1182} 1749}
1183 1750
1184sub _draw { 1751sub draw {
1185 my ($self) = @_; 1752 my ($self) = @_;
1186 1753
1187 if (delete $self->{need_update}) { 1754 if (delete $self->{need_update}) {
1188 glNewList $self->{list}, GL_COMPILE; 1755 glNewList $self->{list}, GL_COMPILE;
1189 1756
1190 my $mx = $::CONN->{mapx}; 1757 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; 1758 my $sw = int $::WIDTH / 32;
1198 my $sh = 1 + int $::HEIGHT / 32; 1759 my $sh = int $::HEIGHT / 32;
1199 1760
1200 if ($::CONN->{mapw} > $sw) { 1761 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1201 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1762 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1202 } else { 1763
1203 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1764 glTranslate $sx0 - 32, $sy0 - 32, 0;
1765
1766 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1767
1768 if ($::CFG->{fow_enable}) {
1769 if ($::CFG->{fow_smooth}) { # smooth fog of war
1770 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1771 glConvolutionFilter2D
1772 GL_CONVOLUTION_2D,
1773 GL_ALPHA,
1774 3, 3,
1775 GL_ALPHA, GL_FLOAT,
1776 pack "f*",
1777 0.1, 0.1, 0.1,
1778 0.1, 0.2, 0.1,
1779 0.1, 0.1, 0.1,
1780 ;
1781 glEnable GL_CONVOLUTION_2D;
1782 }
1783
1784 $self->{fow_texture} = new CFClient::Texture
1785 w => $w,
1786 h => $h,
1787 data => $data,
1788 internalformat => GL_ALPHA,
1789 format => GL_ALPHA;
1790
1791 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1792
1793 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1795 glEnable GL_TEXTURE_2D;
1796 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1797
1798 glColor +($::CFG->{fow_intensity}) x 3, 1;
1799 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1800
1801 glDisable GL_TEXTURE_2D;
1802 glDisable GL_BLEND;
1803 }
1804
1805 # HACK BEGIN
1806 {
1807 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1808 my ($w, $h) = (250, 250);
1809
1810 glEnable GL_BLEND;
1811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1812 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1814
1815 $self->{mapmap_texture} =
1816 new CFClient::Texture
1817 w => $w,
1818 h => $h,
1819 data => $::MAP->mapmap ($w, $h),
1820 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1821
1822 $self->{mapmap_texture}->draw_quad (100, 100);
1823
1824 glDisable GL_TEXTURE_2D;
1825 glDisable GL_BLEND;
1826 }
1827 # HACK END
1204 } 1828 }
1205 1829
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; 1830 glEndList;
1270 } 1831 }
1271 1832
1833 glPushMatrix;
1272 glCallList $self->{list}; 1834 glCallList $self->{list};
1835 glPopMatrix;
1836
1837 if ($FOCUS != $self) {
1838 glColor 64/255, 64/255, 64/255;
1839 glLogicOp GL_AND;
1840 glEnable GL_COLOR_LOGIC_OP;
1841 glBegin GL_QUADS;
1842 glVertex 0, 0;
1843 glVertex 0, $::HEIGHT;
1844 glVertex $::WIDTH, $::HEIGHT;
1845 glVertex $::WIDTH, 0;
1846 glEnd;
1847 glDisable GL_COLOR_LOGIC_OP;
1848 }
1273} 1849}
1274 1850
1275my %DIR = ( 1851my %DIR = (
1276 SDLK_KP8, [1, "north"], 1852 SDLK_KP8, [1, "north"],
1277 SDLK_KP9, [2, "northeast"], 1853 SDLK_KP9, [2, "northeast"],
… …
1293 1869
1294 my $mod = $ev->key_mod; 1870 my $mod = $ev->key_mod;
1295 my $sym = $ev->key_sym; 1871 my $sym = $ev->key_sym;
1296 1872
1297 if ($sym == SDLK_KP5) { 1873 if ($sym == SDLK_KP5) {
1298 $::CONN->send ("command stay fire"); 1874 $::CONN->user_send ("command stay fire");
1875 } elsif ($sym == SDLK_a) {
1876 $::CONN->user_send ("command apply");
1877 } elsif ($sym == SDLK_QUOTE) {
1878 $self->emit ('activate_console');
1879 } elsif ($sym == SDLK_SLASH) {
1880 $self->emit ('activate_console' => '/');
1299 } elsif (exists $DIR{$sym}) { 1881 } elsif (exists $DIR{$sym}) {
1300 if ($mod & KMOD_SHIFT) { 1882 if ($mod & KMOD_SHIFT) {
1301 $self->{shft}++; 1883 $self->{shft}++;
1302 $::CONN->send ("command fire $DIR{$sym}[0]"); 1884 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1303 } elsif ($mod & KMOD_CTRL) { 1885 } elsif ($mod & KMOD_CTRL) {
1304 $self->{ctrl}++; 1886 $self->{ctrl}++;
1305 $::CONN->send ("command run $DIR{$sym}[0]"); 1887 $::CONN->user_send ("command run $DIR{$sym}[0]");
1306 } else { 1888 } else {
1307 $::CONN->send ("command $DIR{$sym}[1]"); 1889 $::CONN->user_send ("command $DIR{$sym}[1]");
1308 } 1890 }
1309 } 1891 }
1310} 1892}
1311 1893
1312sub key_up { 1894sub key_up {
… …
1314 1896
1315 my $mod = $ev->key_mod; 1897 my $mod = $ev->key_mod;
1316 my $sym = $ev->key_sym; 1898 my $sym = $ev->key_sym;
1317 1899
1318 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1900 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1319 $::CONN->send ("command fire_stop"); 1901 $::CONN->user_send ("command fire_stop");
1320 } 1902 }
1321 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1903 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1322 $::CONN->send ("command run_stop"); 1904 $::CONN->user_send ("command run_stop");
1323 } 1905 }
1324} 1906}
1325 1907
1326############################################################################# 1908#############################################################################
1327 1909
… …
1365 glPopMatrix; 1947 glPopMatrix;
1366} 1948}
1367 1949
1368############################################################################# 1950#############################################################################
1369 1951
1370package CFClient::UI::Toplevel; 1952package CFClient::UI::Flopper;
1953
1954our @ISA = CFClient::UI::Button::;
1955
1956sub new {
1957 my $class = shift;
1958
1959 my $self = $class->SUPER::new (
1960 state => 0,
1961 connect_activate => \&toggle_flopper,
1962 @_
1963 );
1964
1965 if ($self->{state}) {
1966 $self->{state} = 0;
1967 $self->toggle_flopper;
1968 }
1969
1970 $self
1971}
1972
1973sub toggle_flopper {
1974 my ($self) = @_;
1975
1976 # TODO: use animation
1977 if ($self->{state} = !$self->{state}) {
1978 $CFClient::UI::ROOT->add ($self->{other});
1979 $self->{other}->move ($self->coord2global (0, $self->{h}));
1980 $self->emit ("open");
1981 } else {
1982 $CFClient::UI::ROOT->remove ($self->{other});
1983 $self->emit ("close");
1984 }
1985
1986 $self->emit (changed => $self->{state});
1987}
1988
1989#############################################################################
1990
1991package CFClient::UI::Root;
1371 1992
1372our @ISA = CFClient::UI::Container::; 1993our @ISA = CFClient::UI::Container::;
1994
1995use SDL::OpenGL;
1373 1996
1374sub size_request { 1997sub size_request {
1375 ($::WIDTH, $::HEIGHT) 1998 ($::WIDTH, $::HEIGHT)
1376} 1999}
1377 2000
… …
1382 2005
1383 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2006 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1384 for @{$self->{children}}; 2007 for @{$self->{children}};
1385} 2008}
1386 2009
1387sub translate { 2010sub _topleft {
1388 my ($self, $x, $y) = @_; 2011 my ($self, $x, $y) = @_;
1389 2012
1390 ($x, $y) 2013 ($x, $y)
1391} 2014}
1392 2015
… …
1400sub add { 2023sub add {
1401 my ($self, $widget) = @_; 2024 my ($self, $widget) = @_;
1402 2025
1403 $self->SUPER::add ($widget); 2026 $self->SUPER::add ($widget);
1404 2027
1405 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2028 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2029}
2030
2031sub on_refresh {
2032 my ($self, $id, $cb) = @_;
2033
2034 $self->{refresh_hook}{$id} = $cb;
1406} 2035}
1407 2036
1408sub draw { 2037sub draw {
1409 my ($self) = @_; 2038 my ($self) = @_;
1410 2039
2040 while (my $rcb = delete $self->{refresh_hook}) {
2041 $_->() for values %$rcb;
2042 }
2043
2044 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2045 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2046 glClear GL_COLOR_BUFFER_BIT;
2047
2048 glMatrixMode GL_PROJECTION;
2049 glLoadIdentity;
2050 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2051 glMatrixMode GL_MODELVIEW;
2052 glLoadIdentity;
2053
1411 $self->_draw; 2054 $self->_draw;
1412} 2055}
1413 2056
1414############################################################################# 2057#############################################################################
1415 2058
1416package CFClient::UI; 2059package CFClient::UI;
1417 2060
1418$TOPLEVEL = new CFClient::UI::Toplevel; 2061$ROOT = new CFClient::UI::Root;
1419 2062
14201 20631
1421 2064

Diff Legend

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