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.74 by root, Tue Apr 11 19:31:18 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,
101 w => -1,
102 h => -1,
88 @_ 103 @_
89 }, $class 104 }, $class;
105
106 for (keys %$self) {
107 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_});
109 }
110 }
111
112 $self
90} 113}
91 114
92sub move { 115sub move {
93 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
94 $self->{x} = $x; 117 $self->{x} = $x;
… …
103sub size_request { 126sub size_request {
104 require Carp; 127 require Carp;
105 Carp::confess "size_request is abtract"; 128 Carp::confess "size_request is abtract";
106} 129}
107 130
108sub size_allocate { 131sub _size_allocate {
109 my ($self, $w, $h) = @_; 132 my ($self, $x, $y, $w, $h) = @_;
133
134 $self->{x} = $x;
135 $self->{y} = $y;
136
137 return unless $self->{w} != $w || $self->{h} != $h;
110 138
111 $self->{w} = $w; 139 $self->{w} = $w;
112 $self->{h} = $h; 140 $self->{h} = $h;
113}
114 141
115# translate global koordinates to local coordinate system 142 1
116sub translate { 143}
144
145sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_;
147
148 $self->_size_allocate ($x, $y, $w, $h);
149}
150
151# return top left coordinates
152sub _topleft {
117 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
118 154
119 $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)
120} 172}
121 173
122sub focus_in { 174sub focus_in {
123 my ($self) = @_; 175 my ($self) = @_;
124 176
125 return if $FOCUS == $self; 177 return if $FOCUS == $self;
178 return unless $self->{can_focus};
126 179
127 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
128 $focus->update if $focus; 181 $focus->update if $focus;
129 $FOCUS->update; 182 $FOCUS->update;
130} 183}
… …
163 glPushMatrix; 216 glPushMatrix;
164 glTranslate $self->{x}, $self->{y}, 0; 217 glTranslate $self->{x}, $self->{y}, 0;
165 $self->_draw; 218 $self->_draw;
166 glPopMatrix; 219 glPopMatrix;
167 220
168 if ($self == $HOVER) { 221 if ($self == $HOVER && $self->{can_hover}) {
169 my ($x, $y) = @$self{qw(x y)}; 222 my ($x, $y) = @$self{qw(x y)};
170 223
171 glColor 1, 1, 1, 0.1; 224 glColor 0, 0, 1, 0.2;
172 glEnable GL_BLEND; 225 glEnable GL_BLEND;
173 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
174 glBegin GL_QUADS; 227 glBegin GL_QUADS;
175 glVertex $x , $y; 228 glVertex $x , $y;
176 glVertex $x + $self->{w}, $y; 229 glVertex $x + $self->{w}, $y;
… …
185 my ($self) = @_; 238 my ($self) = @_;
186 239
187 warn "no draw defined for $self\n"; 240 warn "no draw defined for $self\n";
188} 241}
189 242
190sub bbox {
191 my ($self) = @_;
192 my ($w, $h) = $self->size_request;
193 (
194 $self->{x},
195 $self->{y},
196 $self->{x} = $w,
197 $self->{y} = $h
198 )
199}
200
201sub find_widget { 243sub find_widget {
202 my ($self, $x, $y) = @_; 244 my ($self, $x, $y) = @_;
203 245
204 return $self 246 return $self
205 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 247 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
206 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 248 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
207 249
208 () 250 ()
209} 251}
210 252
211sub del_parent { $_[0]->{parent} = undef }
212
213sub set_parent { 253sub set_parent {
214 my ($self, $par) = @_; 254 my ($self, $parent) = @_;
215 255
216 $self->{parent} = $par;
217 Scalar::Util::weaken $self->{parent}; 256 Scalar::Util::weaken ($self->{parent} = $parent);
218}
219
220sub get_parent {
221 $_[0]->{parent}
222} 257}
223 258
224sub update { 259sub update {
225 my ($self) = @_; 260 my ($self) = @_;
226 261
… …
260 my $class = shift; 295 my $class = shift;
261 296
262 # range [value, low, high, page] 297 # range [value, low, high, page]
263 298
264 $class->SUPER::new ( 299 $class->SUPER::new (
265 bg => [0, 0, 0, 0.4], 300 bg => [0, 0, 0, 0.2],
266 active_bg => [1, 1, 1], 301 active_bg => [1, 1, 1, 0.5],
267 @_ 302 @_
268 ) 303 )
269} 304}
270 305
271sub _draw { 306sub _draw {
272 my ($self) = @_; 307 my ($self) = @_;
273 308
274 my ($w, $h) = @$self{qw(w h)}; 309 my ($w, $h) = @$self{qw(w h)};
275 310
311 glEnable GL_BLEND;
312 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
276 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 313 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
314
277 glBegin GL_QUADS; 315 glBegin GL_QUADS;
278 glVertex 0 , 0; 316 glVertex 0 , 0;
279 glVertex 0 , $h; 317 glVertex 0 , $h;
280 glVertex $w, $h; 318 glVertex $w, $h;
281 glVertex $w, 0; 319 glVertex $w, 0;
282 glEnd; 320 glEnd;
321
322 glDisable GL_BLEND;
283} 323}
284 324
285############################################################################# 325#############################################################################
286 326
287package CFClient::UI::Empty; 327package CFClient::UI::Empty;
… …
310 350
311 $self 351 $self
312} 352}
313 353
314sub add { 354sub add {
315 my ($self, $chld, $expand) = @_; 355 my ($self, $child) = @_;
316 356
317 $chld->{expand} = $expand;
318 $chld->set_parent ($self); 357 $child->set_parent ($self);
358
359 use sort 'stable';
319 360
320 $self->{children} = [ 361 $self->{children} = [
321 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
322 @{$self->{children}}, $chld 363 @{$self->{children}}, $child
323 ]; 364 ];
324 365
325 $self->size_allocate ($self->{w}, $self->{h}) 366 $self->{w} = $self->{h} = -1;
326 if $self->{w}; #TODO: check for "realised state" 367 $self->update;
327} 368}
328 369
329sub remove { 370sub remove {
330 my ($self, $widget) = @_; 371 my ($self, $widget) = @_;
331 372
332 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 373 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
333 374
334 $self->size_allocate ($self->{w}, $self->{h}); 375 $self->size_allocate (0, 0, $self->{w}, $self->{h});
335} 376}
336 377
337sub find_widget { 378sub find_widget {
338 my ($self, $x, $y) = @_; 379 my ($self, $x, $y) = @_;
339 380
… …
392sub size_request { 433sub size_request {
393 $_[0]{children}[0]->size_request 434 $_[0]{children}[0]->size_request
394} 435}
395 436
396sub size_allocate { 437sub size_allocate {
397 my ($self, $w, $h) = @_; 438 my ($self, $x, $y, $w, $h) = @_;
398 439
399 return unless $self->{w} != $w || $self->{h} != $h; 440 $self->_size_allocate ($x, $y, $w, $h) or return;
400 441
401 $self->SUPER::size_allocate ($w, $h);
402 $self->{children}[0]->size_allocate ($w, $h); 442 $self->{children}[0]->size_allocate (0, 0, $w, $h);
403} 443}
404 444
405############################################################################# 445#############################################################################
406 446
407package CFClient::UI::Window; 447package CFClient::UI::Window;
… …
425} 465}
426 466
427sub render_chld { 467sub render_chld {
428 my ($self) = @_; 468 my ($self) = @_;
429 469
430 $self->{texture} = 470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
431 CFClient::Texture->new_from_opengl ( 471 glClearColor 0, 0, 0, 1;
432 $self->{w}, $self->{h}, sub { $self->child->draw } 472 glClear GL_COLOR_BUFFER_BIT;
433 ); 473 $self->child->draw;
474 };
434} 475}
435 476
436sub size_allocate { 477sub size_allocate {
437 my ($self, $w, $h) = @_; 478 my ($self, $x, $y, $w, $h) = @_;
438 479
439 return unless $self->{w} != $w || $self->{h} != $h; 480 $self->_size_allocate ($x, $y, $w, $h) or return;
440 481
441 $self->{w} = $w;
442 $self->{h} = $h;
443
444 $self->child->size_allocate ($w, $h); 482 $self->child->size_allocate (0, 0, $w, $h);
445 483
446 $self->render_chld; 484 $self->render_chld;
447} 485}
448 486
449sub _draw { 487sub _draw {
… …
482 520
483 map { $_ + 4 } $chld->size_request; 521 map { $_ + 4 } $chld->size_request;
484} 522}
485 523
486sub size_allocate { 524sub size_allocate {
487 my ($self, $w, $h) = @_; 525 my ($self, $x, $y, $w, $h) = @_;
488 526
489 return unless $self->{w} != $w || $self->{h} != $h; 527 $self->_size_allocate ($x, $y, $w, $h) or return;
490 528
491 $self->{w} = $w;
492 $self->{h} = $h;
493
494 $self->child->size_allocate ($w - 4, $h - 4); 529 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
495 $self->child->move (2, 2);
496} 530}
497 531
498sub _draw { 532sub _draw {
499 my ($self) = @_; 533 my ($self) = @_;
500 534
… …
523 557
524my @tex = 558my @tex =
525 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
526 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);
527 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
528sub size_request { 575sub size_request {
529 my ($self) = @_; 576 my ($self) = @_;
530 577
578 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
579
531 my ($w, $h) = $self->SUPER::size_request; 580 my ($w, $h) = $self->SUPER::size_request;
532 581
533 $h += $tex[1]->{h}; 582 (
534 $h += $tex[4]->{h}; 583 $w + $self->{border} * 2,
535 $w += $tex[2]->{w}; 584 $h + $self->{border} * 2,
536 $w += $tex[3]->{w}; 585 )
537
538 ($w, $h)
539} 586}
540 587
541sub size_allocate { 588sub size_allocate {
542 my ($self, $w, $h) = @_; 589 my ($self, $x, $y, $w, $h) = @_;
543 590
544 return unless $self->{w} != $w || $self->{h} != $h; 591 $self->_size_allocate ($x, $y, $w, $h) or return;
545 592
546 $self->SUPER::size_allocate ($w, $h); 593 $h -= List::Util::max 0, $self->{border} * 2;
594 $w -= List::Util::max 0, $self->{border} * 2;
547 595
548 $h -= $tex[1]->{h}; 596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
549 $h -= $tex[4]->{h}; 597}
550 $w -= $tex[2]->{w};
551 $w -= $tex[3]->{w};
552 598
553 $h = $h < 0 ? 0 : $h; 599sub button_down {
554 $w = $w < 0 ? 0 : $w; 600 my ($self, $ev, $x, $y) = @_;
555 601
556 my $child = $self->child; 602 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
603 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
557 604
558 $child->size_allocate ($w, $h); 605 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
559 $child->move ($tex[3]->{w}, $tex[1]->{h}); 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};
560} 645}
561 646
562sub _draw { 647sub _draw {
563 my ($self) = @_; 648 my ($self) = @_;
564 649
565 my ($w, $h) = ($self->{w}, $self->{h}); 650 my ($w, $h ) = ($self->{w}, $self->{h});
566 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
652
653 glEnable GL_BLEND;
654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
655 glEnable GL_TEXTURE_2D;
656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
657
658 glColor @{ $self->{border_bg} };
659 $tex[1]->draw_quad (0, 0, $w, $self->{border});
660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
663
664 my $bg = $tex[0];
665
666 # TODO: repeat texture not scale
667 my $rep_x = $cw / $bg->{w};
668 my $rep_y = $ch / $bg->{h};
669
670 glColor @{ $self->{bg} };
671
672 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1;
675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
676
677 glDisable GL_TEXTURE_2D;
678 glDisable GL_BLEND;
679
680 $self->child->draw;
681}
682
683#############################################################################
684
685package CFClient::UI::Table;
686
687our @ISA = CFClient::UI::Base::;
688
689use List::Util qw(max sum);
690
691use SDL::OpenGL;
692
693sub new {
694 my $class = shift;
695
696 $class->SUPER::new (
697 col_expand => [],
698 @_
699 )
700}
701
702sub add {
703 my ($self, $x, $y, $child) = @_;
704
705 $child->set_parent ($self);
706 $self->{children}[$y][$x] = $child;
707
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};
717 $self->update;
718}
719
720sub get_wh {
721 my ($self) = @_;
722
723 my (@w, @h);
724
725 for my $y (0 .. $#{$self->{children}}) {
726 my $row = $self->{children}[$y]
727 or next;
728
729 for my $x (0 .. $#$row) {
730 my $widget = $row->[$x]
731 or next;
732 my ($w, $h) = $widget->size_request;
733
734 $w[$x] = max $w[$x], $w;
735 $h[$y] = max $h[$y], $h;
736 }
737 }
738
739 (\@w, \@h)
740}
741
742sub size_request {
743 my ($self) = @_;
744
745 my ($ws, $hs) = $self->get_wh;
746
747 (
748 (sum @$ws),
749 (sum @$hs),
750 )
751}
752
753sub size_allocate {
754 my ($self, $x, $y, $w, $h) = @_;
755
756 $self->_size_allocate ($x, $y, $w, $h) or return;
757
758 my ($ws, $hs) = $self->get_wh;
759
760 my $req_w = sum @$ws;
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;
767
768 # linearly scale sizes
769 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
770 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
771
772 CFClient::UI::harmonize $ws;
773 CFClient::UI::harmonize $hs;
774
775 my $y;
776
777 for my $r (0 .. $#{$self->{children}}) {
778 my $row = $self->{children}[$r]
779 or next;
780
781 my $x = 0;
782 my $row_h = $hs->[$r];
783
784 for my $c (0 .. $#$row) {
785 my $col_w = $ws->[$c];
786
787 if (my $widget = $row->[$c]) {
788 $widget->size_allocate ($x, $y, $col_w, $row_h);
789 }
790
791 $x += $col_w;
792 }
793
794 $y += $row_h;
795 }
796
797}
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
815sub _draw {
816 my ($self) = @_;
817
818 for (grep $_, @{$self->{children}}) {
819 $_->draw for grep $_, @$_;
820 }
821}
822
823#############################################################################
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
885package CFClient::UI::VBox;
886
887# TODO: wrap into common Box base class
888
889our @ISA = CFClient::UI::Container::;
890
891sub size_request {
892 my ($self) = @_;
893
894 my @alloc = map [$_->size_request], @{$self->{children}};
895
896 (
897 (List::Util::max map $_->[0], @alloc),
898 (List::Util::sum map $_->[1], @alloc),
899 )
900}
901
902sub size_allocate {
903 my ($self, $x, $y, $w, $h) = @_;
904
905 $self->_size_allocate ($x, $y, $w, $h);
906
907 my $children = $self->{children};
908
909 my @h = map +($_->size_request)[1], @$children;
910
911 my $req_h = List::Util::sum @h;
912
913 if ($req_h > $h) {
914 # ah well, not enough space
915 $_ *= $h / $req_h for @h;
916 } else {
917 my $exp = List::Util::sum map $_->{expand}, @$children;
918 $exp ||= 1;
919
920 for (0 .. $#$children) {
921 my $child = $children->[$_];
922
923 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
924 }
925 }
926
927 CFClient::UI::harmonize \@h;
928
929 my $y = 0;
930 for (0 .. $#$children) {
931 my $child = $children->[$_];
932 my $h = $h[$_];
933 $child->size_allocate (0, $y, $w, $h);
934
935 $y += $h;
936 }
937}
938
939#############################################################################
940
941package CFClient::UI::Label;
942
943our @ISA = CFClient::UI::Base::;
944
945use SDL::OpenGL;
946
947sub new {
948 my ($class, %arg) = @_;
949
950 my $self = $class->SUPER::new (
951 fg => [1, 1, 1],
952 fontsize => $::FONTSIZE,
953 text => "",
954 align => -1,
955 padding => 2,
956 layout => new CFClient::Layout,
957 %arg
958 );
959
960 $self->set_text ($self->{text});
961
962 $self
963}
964
965sub escape_text {
966 local $_ = $_[1];
967
968 s/&/&amp;/g;
969 s/>/&gt;/g;
970 s/</&lt;/g;
971
972 $_[1]
973}
974
975sub set_text {
976 my ($self, $text) = @_;
977
978 $self->{text} = $text;
979 $self->{layout}->set_markup ($text);
980
981 delete $self->{texture};
982# $self->{w} = $self->{h} = -1;
983 $self->update;
984}
985
986sub get_text {
987 my ($self, $text) = @_;
988
989 $self->{text}
990}
991
992sub size_request {
993 my ($self) = @_;
994
995 $self->{layout}->set_width;
996 $self->{layout}->set_height ($self->{fontsize});
997 my ($w, $h) = $self->{layout}->size;
998
999 (
1000 $w + $self->{padding} * 2,
1001 $h + $self->{padding} * 2,
1002 )
1003}
1004
1005sub size_allocate {
1006 my ($self, $x, $y, $w, $h) = @_;
1007
1008 $self->_size_allocate ($x, $y, $w, $h) or return;
1009
1010 delete $self->{texture};
1011}
1012
1013sub update {
1014 my ($self) = @_;
1015
1016 delete $self->{texture};
1017 $self->SUPER::update;
1018}
1019
1020sub _draw {
1021 my ($self) = @_;
1022
1023 my $tex = $self->{texture} ||= do {
1024 $self->{layout}->set_width ($self->{w});
1025 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1026 new_from_layout CFClient::Texture $self->{layout}
1027 };
567 1028
568 glEnable GL_BLEND; 1029 glEnable GL_BLEND;
569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1030 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
570 glEnable GL_TEXTURE_2D; 1031 glEnable GL_TEXTURE_2D;
571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
572 1033
573 my $top = $tex[1];
574 $top->draw_quad (0, 0, $w, $top->{h});
575
576 my $left = $tex[3];
577 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
578
579 my $right = $tex[2];
580 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
581
582 my $bottom = $tex[4];
583 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
584
585 my $bg = $tex[0];
586 glBindTexture GL_TEXTURE_2D, $bg->{name};
587 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
588 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
589 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
590
591 my $rep_x = $cw / $bg->{w};
592 my $rep_y = $ch / $bg->{h};
593
594 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
595
596 glDisable GL_BLEND;
597 glDisable GL_TEXTURE_2D;
598
599 $self->child->draw;
600
601}
602
603#############################################################################
604
605package CFClient::UI::Table;
606
607our @ISA = CFClient::UI::Base::;
608
609use SDL::OpenGL;
610
611sub add {
612 my ($self, $x, $y, $chld) = @_;
613 my $old_chld = $self->{children}[$y][$x];
614
615 $self->{children}[$y][$x] = $chld;
616 $chld->set_parent ($self);
617 $self->update;
618}
619
620sub max_row_height {
621 my ($self, $row) = @_;
622
623 my $hs = 0;
624 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
625 my $c = $self->{children}->[$row]->[$xi];
626 if ($c) {
627 my ($w, $h) = $c->size_request;
628 if ($hs < $h) { $hs = $h }
629 }
630 }
631 return $hs;
632}
633
634sub max_col_width {
635 my ($self, $col) = @_;
636
637 my $ws = 0;
638 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
639 my $c = ($self->{children}->[$yi] || [])->[$col];
640 if ($c) {
641 my ($w, $h) = $c->size_request;
642 if ($ws < $w) { $ws = $w }
643 }
644 }
645 return $ws;
646}
647
648sub size_request {
649 my ($self) = @_;
650
651 my ($hs, $ws) = (0, 0);
652
653 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
654 $hs += $self->max_row_height ($yi);
655 }
656
657 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
658 my $wm = 0;
659 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
660 $wm += $self->max_col_width ($xi)
661 }
662 if ($ws < $wm) { $ws = $wm }
663 }
664
665 return ($ws, $hs);
666}
667
668sub _draw {
669 my ($self) = @_;
670
671 my $y = 0;
672 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
673 my $x = 0;
674
675 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
676
677 my $c = $self->{children}->[$yi]->[$xi];
678 if ($c) {
679 $c->move ($x, $y, 0); #TODO: Move to size_request
680 $c->draw if $c;
681 }
682
683 $x += $self->max_col_width ($xi);
684 }
685
686 $y += $self->max_row_height ($yi);
687 }
688}
689
690#############################################################################
691
692package CFClient::UI::VBox;
693
694our @ISA = CFClient::UI::Container::;
695
696use SDL::OpenGL;
697
698sub size_request {
699 my ($self) = @_;
700
701 my @alloc = map [$_->size_request], @{$self->{children}};
702
703 (
704 (List::Util::max map $_->[0], @alloc),
705 (List::Util::sum map $_->[1], @alloc),
706 )
707}
708
709sub size_allocate {
710 my ($self, $w, $h) = @_;
711
712 return unless $self->{w} != $w || $self->{h} != $h;
713
714 $self->{w} = $w;
715 $self->{h} = $h;
716
717 return unless $self->{h};
718
719 my $children = $self->{children};
720
721 my @h = map +($_->size_request)[1], @$children;
722
723 my $req_h = List::Util::sum @h;
724
725 if ($req_h > $h) {
726 # ah well, not enough space
727 $_ = $h[$_] * $h / $req_h for @h;
728 } else {
729 my @exp = grep $_->{expand}, @$children;
730 @exp = @$children unless @exp;
731
732 my %exp = map +($_ => 1), @exp;
733
734 for (0 .. $#$children) {
735 my $child = $children->[$_];
736
737 my $alloc_h = $h[$_];
738 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
739 $h[$_] = $alloc_h;
740 }
741 }
742
743 my $y = 0;
744 for (0 .. $#$children) {
745 my $child = $children->[$_];
746 my $h = $h[$_];
747 $child->move (0, $y);
748 $child->size_allocate ($w, $h);
749
750 $y += $h;
751 }
752}
753
754#############################################################################
755
756package CFClient::UI::Label;
757
758our @ISA = CFClient::UI::Base::;
759
760use SDL::OpenGL;
761
762sub new {
763 my ($class, %arg) = @_;
764
765 my $self = $class->SUPER::new (
766 fg => [1, 1, 1],
767 height => $::FONTSIZE,
768 text => "",
769 align => -1,
770 layout => new CFClient::Layout,
771 %arg
772 );
773
774 $self->set_text ($self->{text});
775
776 $self
777}
778
779sub escape_text {
780 local $_ = $_[1];
781
782 s/&/&amp;/g;
783 s/>/&gt;/g;
784 s/</&lt;/g;
785
786 $_[1]
787}
788
789sub set_text {
790 my ($self, $text) = @_;
791
792 $self->{text} = $text;
793 $self->{layout}->set_markup ($text);
794
795 delete $self->{texture};
796 $self->update;
797}
798
799sub get_text {
800 my ($self, $text) = @_;
801
802 $self->{text}
803}
804
805sub size_request {
806 my ($self) = @_;
807
808 $self->{layout}->set_width;
809 $self->{layout}->set_height ($self->{height});
810 $self->{layout}->size
811# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack
812# (
813# $self->{texture}{w},
814# $self->{texture}{h},
815# )
816# } else {
817# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
818#
819# ($w, $h)
820# }
821}
822
823sub size_allocate {
824 my ($self, $w, $h) = @_;
825
826 return unless $self->{w} != $w || $self->{h} != $h;
827
828 $self->SUPER::size_allocate ($w, $h);
829 delete $self->{texture};
830}
831
832sub update {
833 my ($self) = @_;
834
835 delete $self->{texture};
836 $self->SUPER::update;
837}
838
839sub _draw {
840 my ($self) = @_;
841
842 my $tex = $self->{texture} ||= do {
843 $self->{layout}->set_width ($self->{w});
844 new_from_layout CFClient::Texture $self->{layout}
845 };
846
847 glEnable GL_BLEND;
848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
849 glEnable GL_TEXTURE_2D;
850 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
851
852 glColor @{$self->{fg}}; 1034 glColor @{$self->{fg}};
853 1035
854 my $x = 1036 my $x =
855 $self->{align} < 0 ? 0 1037 $self->{align} < 0 ? $self->{padding}
856 : $self->{align} > 0 ? $self->{w} - $tex->{w} 1038 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
857 : ($self->{w} - $tex->{w}) * 0.5; 1039 : ($self->{w} - $tex->{w}) * 0.5;
858 1040
859 $tex->draw_quad ($x, 0); 1041 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
860 1042
861 glDisable GL_TEXTURE_2D; 1043 glDisable GL_TEXTURE_2D;
862 glDisable GL_BLEND; 1044 glDisable GL_BLEND;
863 glGetError and die;
864} 1045}
865 1046
866############################################################################# 1047#############################################################################
867 1048
868package CFClient::UI::Entry; 1049package CFClient::UI::Entry;
… …
875sub new { 1056sub new {
876 my $class = shift; 1057 my $class = shift;
877 1058
878 $class->SUPER::new ( 1059 $class->SUPER::new (
879 fg => [1, 1, 1], 1060 fg => [1, 1, 1],
880 bg => [0, 0, 0, 0.4], 1061 bg => [0, 0, 0, 0.2],
881 active_bg => [1, 1, 1], 1062 active_bg => [1, 1, 1, 0.5],
882 active_fg => [0, 0, 0], 1063 active_fg => [0, 0, 0],
1064 can_hover => 1,
1065 can_focus => 1,
883 @_ 1066 @_
884 ) 1067 )
885} 1068}
886 1069
887sub _set_text { 1070sub _set_text {
888 my ($self, $text) = @_; 1071 my ($self, $text) = @_;
889 1072
1073 my $old_text = $self->{text};
1074
890 $self->{last_activity} = $::NOW; 1075 $self->{last_activity} = $::NOW;
891 1076
892 $self->{text} = $text; 1077 $self->{text} = $text;
893 $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});
894 1080
895 $text =~ s/./*/g if $self->{hidden}; 1081 $text =~ s/./*/g if $self->{hidden};
896 1082
897
898 $self->{layout}->set_markup ($self->escape_text ($text)); 1083 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
899 1084
900 $text = substr $text, 0, $self->{cursor}; 1085 $text = substr $text, 0, $self->{cursor};
901 utf8::encode $text; 1086 utf8::encode $text;
902 1087
903 @$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};
904} 1092}
905 1093
906sub size_request { 1094sub size_request {
907 my ($self) = @_; 1095 my ($self) = @_;
908 1096
… …
910 1098
911 ($w + 1, $h) # add 1 for cursor 1099 ($w + 1, $h) # add 1 for cursor
912} 1100}
913 1101
914sub size_allocate { 1102sub size_allocate {
915 my ($self, $w, $h) = @_; 1103 my ($self, $x, $y, $w, $h) = @_;
916 1104
917 return unless $self->{w} != $w || $self->{h} != $h;
918
919 $self->SUPER::size_allocate ($w, $h); 1105 $self->SUPER::size_allocate ($x, $y, $w, $h);
920 1106
921 $self->_set_text ($self->{text}); 1107 $self->_set_text ($self->{text});
922} 1108}
923 1109
924sub set_text { 1110sub set_text {
… …
945 substr $text, $self->{cursor}, 1, ""; 1131 substr $text, $self->{cursor}, 1, "";
946 } elsif ($sym == SDLK_LEFT) { 1132 } elsif ($sym == SDLK_LEFT) {
947 --$self->{cursor} if $self->{cursor}; 1133 --$self->{cursor} if $self->{cursor};
948 } elsif ($sym == SDLK_RIGHT) { 1134 } elsif ($sym == SDLK_RIGHT) {
949 ++$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');
950 } elsif ($uni) { 1142 } elsif ($uni) {
951 substr $text, $self->{cursor}++, 0, chr $uni; 1143 substr $text, $self->{cursor}++, 0, chr $uni;
952 } 1144 }
953 1145
954 $self->_set_text ($text); 1146 $self->_set_text ($text);
… …
969 $self->SUPER::button_down ($ev, $x, $y); 1161 $self->SUPER::button_down ($ev, $x, $y);
970 1162
971 my $idx = $self->{layout}->xy_to_index ($x, $y); 1163 my $idx = $self->{layout}->xy_to_index ($x, $y);
972 1164
973 # byte-index to char-index 1165 # byte-index to char-index
974 my $text = $self->{layout}; 1166 my $text = $self->{text};
975 utf8::encode $text; 1167 utf8::encode $text;
976 $self->{cursor} = length substr $text, 0, $idx; 1168 $self->{cursor} = length substr $text, 0, $idx;
977 1169
978 $self->_set_text ($self->{text}); 1170 $self->_set_text ($self->{text});
979 $self->update; 1171 $self->update;
… …
994 $self->{fg} = $self->{active_fg}; 1186 $self->{fg} = $self->{active_fg};
995 } else { 1187 } else {
996 glColor @{$self->{bg}}; 1188 glColor @{$self->{bg}};
997 } 1189 }
998 1190
1191 glEnable GL_BLEND;
1192 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
999 glBegin GL_QUADS; 1193 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1194 glVertex 0 , 0;
1001 glVertex 0 , $self->{h}; 1195 glVertex 0 , $self->{h};
1002 glVertex $self->{w}, $self->{h}; 1196 glVertex $self->{w}, $self->{h};
1003 glVertex $self->{w}, 0; 1197 glVertex $self->{w}, 0;
1004 glEnd; 1198 glEnd;
1199 glDisable GL_BLEND;
1005 1200
1006 $self->SUPER::_draw; 1201 $self->SUPER::_draw;
1007 1202
1008 #TODO: force update every cursor change :( 1203 #TODO: force update every cursor change :(
1009 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1204 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
… …
1013 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1208 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1014 glEnd; 1209 glEnd;
1015 } 1210 }
1016} 1211}
1017 1212
1018#############################################################################
1019
1020package CFClient::UI::Slider; 1213package CFClient::UI::LineEntry;
1021 1214
1022use strict; 1215our @ISA = CFClient::UI::Entry::;
1023 1216
1217use SDL;
1024use SDL::OpenGL; 1218use SDL::OpenGL;
1025 1219
1026our @ISA = CFClient::UI::DrawBG::; 1220sub key_down {
1027
1028sub size_request {
1029 my ($self) = @_; 1221 my ($self, $ev) = @_;
1030 1222
1031 my $w = 50; 1223 my $sym = $ev->key_sym;
1032 my $h = 10;
1033 1224
1034 $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
1035} 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);
1036 1247
1037sub new { 1248sub new {
1038 my $class = shift; 1249 my $class = shift;
1039 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
1040 # range [value, low, high, page] 1383 # range [value, low, high, page]
1041 1384
1385 # TODO: 0-width page
1386 # TODO: req_w/h are wrong with vertical
1387 # TODO: calculations are off
1042 $class->SUPER::new ( 1388 my $self = $class->SUPER::new (
1043 fg => [1, 1, 1], 1389 fg => [1, 1, 1],
1044 active_fg => [0, 0, 0], 1390 active_fg => [0, 0, 0],
1045 range => [0, 0, 100, 10], 1391 range => [0, 0, 100, 10],
1392 req_w => 40,
1393 req_h => 13,
1046 vertical => 1, 1394 vertical => 0,
1395 can_hover => 1,
1396 inner_pad => 5,
1047 @_ 1397 @_
1048 ) 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)
1049} 1410}
1050 1411
1051sub button_down { 1412sub button_down {
1052 my ($self, $ev, $x, $y) = @_; 1413 my ($self, $ev, $x, $y) = @_;
1053 1414
… …
1061 if ($GRAB == $self) { 1422 if ($GRAB == $self) {
1062 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1423 my ($value, $lo, $hi, $page) = @{$self->{range}};
1063 1424
1064 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1425 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1065 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
1066 $x = $x * ($hi - $lo) / $w + $lo; 1431 $x = $x * ($hi - $lo) / $inner_w + $lo;
1067 $x = $lo if $x < $lo; 1432 $x = $lo if $x < $lo;
1068 $x = $hi - $page if $x > $hi - $page; 1433 $x = $hi - $page if $x > $hi - $page;
1069 $self->{range}[0] = $x; 1434 $self->{range}[0] = $x;
1070 1435
1071 $self->emit (changed => $x); 1436 $self->emit (changed => $x);
1072 $self->update; 1437 $self->update;
1073 } 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
1074} 1447}
1075 1448
1076sub _draw { 1449sub _draw {
1077 my ($self) = @_; 1450 my ($self) = @_;
1078 1451
… …
1092 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1465 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1093 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1466 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1094 1467
1095 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1468 my ($value, $lo, $hi, $page) = @{$self->{range}};
1096 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
1097 $page = int $page * $w / ($hi - $lo); 1475 $page = int $page * $inner_w / ($hi - $lo);
1098 $value = int +($value - $lo) * $w / ($hi - $lo); 1476 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1099 1477
1100 $w -= $page; 1478 $w -= $page;
1101 $page &= ~1; 1479 $page &= ~1;
1102 glTranslate $page * 0.5, 0, 0; 1480 glTranslate $page * 0.5, 0, 0;
1481 $page ||= 2;
1103 1482
1104 glColor @$fg;
1105 glBegin GL_LINES;
1106 glVertex 0, 0; glVertex 0, $h;
1107 glVertex $w - 1, 0; glVertex $w - 1, $h;
1108 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1109 glEnd;
1110
1111 my $knob_a = $value - $page * 0.5; 1483 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1112 my $knob_b = $value + $page * 0.5; 1484 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1113 1485
1114 glBegin GL_QUADS; 1486 glEnable GL_BLEND;
1115 glColor @$fg; 1487 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1116 glVertex $knob_a, 0; 1488 glEnable GL_TEXTURE_2D;
1117 glVertex $knob_a, $h; 1489 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1118 glVertex $knob_b, $h;
1119 glVertex $knob_b, 0;
1120 1490
1121 if ($knob_a < $knob_b - 2) { 1491 # draw background
1122 glColor @$bg; 1492 $tex[1]->draw_quad (0, 0, $w, $h);
1123 glVertex $knob_a + 1, 1; 1493
1124 glVertex $knob_a + 1, $h - 1; 1494 # draw handle
1125 glVertex $knob_b - 1, $h - 1; 1495 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1126 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);
1127 } 1549
1128 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
1129} 1665}
1130 1666
1131############################################################################# 1667#############################################################################
1132 1668
1133package CFClient::UI::MapWidget; 1669package CFClient::UI::MapWidget;
… …
1143 1679
1144sub new { 1680sub new {
1145 my $class = shift; 1681 my $class = shift;
1146 1682
1147 $class->SUPER::new ( 1683 $class->SUPER::new (
1148 z => -1, 1684 z => -1,
1685 can_focus => 1,
1149 list => (glGenLists 1), 1686 list => (glGenLists 1),
1150 @_ 1687 @_
1151 ) 1688 )
1152} 1689}
1153 1690
1154sub key_down { 1691sub key_down {
… …
1156} 1693}
1157 1694
1158sub key_up { 1695sub key_up {
1159} 1696}
1160 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
1161sub size_request { 1732sub size_request {
1162 ( 1733 (
1163 1 + int $::WIDTH / 32, 1734 1 + 32 * int $::WIDTH / 32,
1164 1 + int $::HEIGHT / 32, 1735 1 + 32 * int $::HEIGHT / 32,
1165 ) 1736 )
1166} 1737}
1167 1738
1168sub update { 1739sub update {
1169 my ($self) = @_; 1740 my ($self) = @_;
1170 1741
1171 $self->{need_update} = 1; 1742 $self->{need_update} = 1;
1172 $self->SUPER::update; 1743 $self->SUPER::update;
1173} 1744}
1174 1745
1175sub _draw { 1746sub draw {
1176 my ($self) = @_; 1747 my ($self) = @_;
1177 1748
1178 if (delete $self->{need_update}) { 1749 if (delete $self->{need_update}) {
1179 glNewList $self->{list}, GL_COMPILE; 1750 glNewList $self->{list}, GL_COMPILE;
1180 1751
1181 my $mx = $::CONN->{mapx}; 1752 if ($::MAP) {
1182 my $my = $::CONN->{mapy};
1183
1184 my $map = $::CONN->{map};
1185
1186 my ($xofs, $yofs);
1187
1188 my $sw = 1 + int $::WIDTH / 32; 1753 my $sw = int $::WIDTH / 32;
1189 my $sh = 1 + int $::HEIGHT / 32; 1754 my $sh = int $::HEIGHT / 32;
1190 1755
1191 if ($::CONN->{mapw} > $sw) { 1756 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1192 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1757 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1193 } else { 1758
1194 $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
1195 } 1821 }
1196 1822
1197 if ($::CONN->{maph} > $sh) {
1198 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1199 } else {
1200 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1201 }
1202
1203 glEnable GL_TEXTURE_2D;
1204 glEnable GL_BLEND;
1205 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1207
1208 my $sw4 = ($sw + 3) & ~3;
1209 my $darkness = "\x00" x ($sw4 * $sh);
1210
1211 for my $x (0 .. $sw - 1) {
1212 my $row = $map->[$x + $xofs];
1213 for my $y (0 .. $sh - 1) {
1214
1215 my $cell = $row->[$y + $yofs]
1216 or next;
1217
1218 my $dark = $cell->[0];
1219 if ($dark < 0) {
1220 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1221 } else {
1222 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1223 }
1224
1225 for my $num (grep $_, @$cell[1,2,3]) {
1226 my $tex = $::CONN->{face}[$num]{texture} || next;
1227
1228 my ($w, $h) = @$tex{qw(w h)};
1229
1230 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1231 }
1232 }
1233 }
1234
1235# if (1) { # higher quality darkness
1236# $lighting =~ s/(.)/$1$1$1/gs;
1237# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1238#
1239# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1240#
1241# $lighting = $pb->get_pixels;
1242# $lighting =~ s/(.)../$1/gs;
1243# }
1244
1245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1246
1247 $darkness = new CFClient::Texture
1248 w => $sw4,
1249 h => $sh,
1250 data => $darkness,
1251 internalformat => GL_ALPHA,
1252 format => GL_ALPHA;
1253
1254 glColor 0.45, 0.45, 0.45, 1;
1255 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1256
1257 glDisable GL_TEXTURE_2D;
1258 glDisable GL_BLEND;
1259
1260 glEndList; 1823 glEndList;
1261 } 1824 }
1262 1825
1826 glPushMatrix;
1263 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 }
1264} 1842}
1265 1843
1266my %DIR = ( 1844my %DIR = (
1267 SDLK_KP8, [1, "north"], 1845 SDLK_KP8, [1, "north"],
1268 SDLK_KP9, [2, "northeast"], 1846 SDLK_KP9, [2, "northeast"],
… …
1284 1862
1285 my $mod = $ev->key_mod; 1863 my $mod = $ev->key_mod;
1286 my $sym = $ev->key_sym; 1864 my $sym = $ev->key_sym;
1287 1865
1288 if ($sym == SDLK_KP5) { 1866 if ($sym == SDLK_KP5) {
1289 $::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' => '/');
1290 } elsif (exists $DIR{$sym}) { 1874 } elsif (exists $DIR{$sym}) {
1291 if ($mod & KMOD_SHIFT) { 1875 if ($mod & KMOD_SHIFT) {
1292 $self->{shft}++; 1876 $self->{shft}++;
1293 $::CONN->send ("command fire $DIR{$sym}[0]"); 1877 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1294 } elsif ($mod & KMOD_CTRL) { 1878 } elsif ($mod & KMOD_CTRL) {
1295 $self->{ctrl}++; 1879 $self->{ctrl}++;
1296 $::CONN->send ("command run $DIR{$sym}[0]"); 1880 $::CONN->user_send ("command run $DIR{$sym}[0]");
1297 } else { 1881 } else {
1298 $::CONN->send ("command $DIR{$sym}[1]"); 1882 $::CONN->user_send ("command $DIR{$sym}[1]");
1299 } 1883 }
1300 } 1884 }
1301} 1885}
1302 1886
1303sub key_up { 1887sub key_up {
… …
1305 1889
1306 my $mod = $ev->key_mod; 1890 my $mod = $ev->key_mod;
1307 my $sym = $ev->key_sym; 1891 my $sym = $ev->key_sym;
1308 1892
1309 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1893 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1310 $::CONN->send ("command fire_stop"); 1894 $::CONN->user_send ("command fire_stop");
1311 } 1895 }
1312 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1896 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1313 $::CONN->send ("command run_stop"); 1897 $::CONN->user_send ("command run_stop");
1314 } 1898 }
1315} 1899}
1316 1900
1317############################################################################# 1901#############################################################################
1318 1902
… …
1356 glPopMatrix; 1940 glPopMatrix;
1357} 1941}
1358 1942
1359############################################################################# 1943#############################################################################
1360 1944
1361package 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;
1362 1985
1363our @ISA = CFClient::UI::Container::; 1986our @ISA = CFClient::UI::Container::;
1987
1988use SDL::OpenGL;
1364 1989
1365sub size_request { 1990sub size_request {
1366 ($::WIDTH, $::HEIGHT) 1991 ($::WIDTH, $::HEIGHT)
1367} 1992}
1368 1993
1369sub size_allocate { 1994sub size_allocate {
1370 my ($self, $w, $h) = @_; 1995 my ($self, $x, $y, $w, $h) = @_;
1371 1996
1372 $self->SUPER::size_allocate ($w, $h); 1997 $self->_size_allocate ($x, $y, $w, $h);
1373 1998
1374 $_->size_allocate ($_->size_request) 1999 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1375 for @{$self->{children}}; 2000 for @{$self->{children}};
1376} 2001}
1377 2002
1378sub translate { 2003sub _topleft {
1379 my ($self, $x, $y) = @_; 2004 my ($self, $x, $y) = @_;
1380 2005
1381 ($x, $y) 2006 ($x, $y)
1382} 2007}
1383 2008
1384sub update { 2009sub update {
1385 my ($self) = @_; 2010 my ($self) = @_;
1386 2011
1387 $self->size_allocate ($self->size_request); 2012 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1388 ::refresh (); 2013 ::refresh ();
1389} 2014}
1390 2015
1391sub add { 2016sub add {
1392 my ($self, $widget) = @_; 2017 my ($self, $widget) = @_;
1393 2018
1394 $self->SUPER::add ($widget); 2019 $self->SUPER::add ($widget);
1395 2020
1396 $widget->size_allocate ($widget->size_request); 2021 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
2022}
2023
2024sub on_refresh {
2025 my ($self, $id, $cb) = @_;
2026
2027 $self->{refresh_hook}{$id} = $cb;
1397} 2028}
1398 2029
1399sub draw { 2030sub draw {
1400 my ($self) = @_; 2031 my ($self) = @_;
1401 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
1402 $self->_draw; 2047 $self->_draw;
1403} 2048}
1404 2049
1405############################################################################# 2050#############################################################################
1406 2051
1407package CFClient::UI; 2052package CFClient::UI;
1408 2053
1409$TOPLEVEL = new CFClient::UI::Toplevel; 2054$ROOT = new CFClient::UI::Root;
1410 2055
14111 20561
1412 2057

Diff Legend

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