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.77 by root, Tue Apr 11 22:14:13 2006 UTC vs.
Revision 1.130 by root, Tue Apr 18 01:51:06 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_up ($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) = @_;
117
96 $self->{x} = $x; 118 $self->{x} = int $x;
97 $self->{y} = $y; 119 $self->{y} = int $y;
98 $self->{z} = $z if defined $z; 120 $self->{z} = $z if defined $z;
121
122 $self->update;
99} 123}
100 124
101sub needs_redraw { 125sub needs_redraw {
102 0 126 0
103} 127}
105sub size_request { 129sub size_request {
106 require Carp; 130 require Carp;
107 Carp::confess "size_request is abtract"; 131 Carp::confess "size_request is abtract";
108} 132}
109 133
110sub _size_allocate { 134sub configure {
111 my ($self, $x, $y, $w, $h) = @_; 135 my ($self, $x, $y, $w, $h) = @_;
112 136
113 $self->{x} = $x; 137 $self->{x} = $x;
114 $self->{y} = $y; 138 $self->{y} = $y;
115 139
116 return unless $self->{w} != $w || $self->{h} != $h; 140 return unless $self->{w} != $w || $self->{h} != $h;
117 141
118 $self->{w} = $w; 142 $self->{w} = $w;
119 $self->{h} = $h; 143 $self->{h} = $h;
120 144
121 1 145 $self->size_allocate ($w, $h);
122} 146}
123 147
124sub size_allocate { 148sub size_allocate {
125 my ($self, $x, $y, $w, $h) = @_; 149 # nothing to be done
126
127 $self->_size_allocate ($x, $y, $w, $h);
128} 150}
129 151
130# translate global koordinates to local coordinate system 152# return top left coordinates
131sub translate { 153sub _topleft {
132 my ($self, $x, $y) = @_; 154 my ($self, $x, $y) = @_;
133 155
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 156 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
157}
158
159# translate global coordinates to local coordinate system
160sub coord2local {
161 my ($self, $x, $y) = @_;
162
163 my ($X, $Y) = $self->_topleft;
164 ($x - $X, $y - $Y)
165}
166
167# translate local coordinates to global coordinate system
168sub coord2global {
169 my ($self, $x, $y) = @_;
170
171 my ($X, $Y) = $self->_topleft;
172 ($x + $X, $y + $Y)
135} 173}
136 174
137sub focus_in { 175sub focus_in {
138 my ($self) = @_; 176 my ($self) = @_;
139 177
140 return if $FOCUS == $self; 178 return if $FOCUS == $self;
179 return unless $self->{can_focus};
141 180
142 my $focus = $FOCUS; $FOCUS = $self; 181 my $focus = $FOCUS; $FOCUS = $self;
182
183 $self->emit (focus_in => $focus);
184
143 $focus->update if $focus; 185 $focus->update if $focus;
144 $FOCUS->update; 186 $FOCUS->update;
145} 187}
146 188
147sub focus_out { 189sub focus_out {
148 my ($self) = @_; 190 my ($self) = @_;
149 191
150 return unless $FOCUS == $self; 192 return unless $FOCUS == $self;
151 193
152 my $focus = $FOCUS; undef $FOCUS; 194 my $focus = $FOCUS; undef $FOCUS;
195
196 $self->emit (focus_out => $focus);
197
153 $focus->update if $focus; #? 198 $focus->update if $focus; #?
154} 199}
155 200
156sub mouse_motion { } 201sub mouse_motion { }
157sub button_up { } 202sub button_up { }
178 glPushMatrix; 223 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 224 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 225 $self->_draw;
181 glPopMatrix; 226 glPopMatrix;
182 227
183 if ($self == $HOVER) { 228 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 229 my ($x, $y) = @$self{qw(x y)};
185 230
186 glColor 0, 0, 1, 0.2; 231 glColor 1, 0.8, 0.5, 0.2;
187 glEnable GL_BLEND; 232 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 233 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189 glBegin GL_QUADS; 234 glBegin GL_QUADS;
190 glVertex $x , $y; 235 glVertex $x , $y;
191 glVertex $x + $self->{w}, $y; 236 glVertex $x + $self->{w}, $y;
200 my ($self) = @_; 245 my ($self) = @_;
201 246
202 warn "no draw defined for $self\n"; 247 warn "no draw defined for $self\n";
203} 248}
204 249
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 { 250sub find_widget {
217 my ($self, $x, $y) = @_; 251 my ($self, $x, $y) = @_;
218 252
219 return $self 253 return $self
220 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 254 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 255 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
222 256
223 () 257 ()
224} 258}
225 259
226sub del_parent { $_[0]->{parent} = undef }
227
228sub set_parent { 260sub set_parent {
229 my ($self, $par) = @_; 261 my ($self, $parent) = @_;
230 262
231 $self->{parent} = $par;
232 Scalar::Util::weaken $self->{parent}; 263 Scalar::Util::weaken ($self->{parent} = $parent);
233} 264}
234 265
235sub get_parent { 266sub check_size {
236 $_[0]->{parent} 267 my ($self) = @_;
268
269 my ($w, $h) = $self->size_request;
270
271 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w;
273 $self->{req_h} = $h;
274
275 $self->{parent}->check_size
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 }
237} 281}
238 282
239sub update { 283sub update {
240 my ($self) = @_; 284 my ($self) = @_;
241 285
276 320
277 # range [value, low, high, page] 321 # range [value, low, high, page]
278 322
279 $class->SUPER::new ( 323 $class->SUPER::new (
280 bg => [0, 0, 0, 0.2], 324 bg => [0, 0, 0, 0.2],
281 active_bg => [1, 1, 1], 325 active_bg => [1, 1, 1, 0.5],
282 @_ 326 @_
283 ) 327 )
284} 328}
285 329
286sub _draw { 330sub _draw {
330 374
331 $self 375 $self
332} 376}
333 377
334sub add { 378sub add {
335 my ($self, $chld) = @_; 379 my ($self, $child) = @_;
336 380
337 $chld->set_parent ($self); 381 $child->set_parent ($self);
382
383 use sort 'stable';
338 384
339 $self->{children} = [ 385 $self->{children} = [
340 sort { $a->{z} <=> $b->{z} } 386 sort { $a->{z} <=> $b->{z} }
341 @{$self->{children}}, $chld 387 @{$self->{children}}, $child
342 ]; 388 ];
343 389
344 $self->{w} = $self->{h} = -1; 390 $self->{w} = $self->{h} = -1;
345 $self->update; 391
392 $child->check_size;
346} 393}
347 394
348sub remove { 395sub remove {
349 my ($self, $widget) = @_; 396 my ($self, $widget) = @_;
350 397
351 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 398 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
352 399
353 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 400 $self->check_size;
354} 401}
355 402
356sub find_widget { 403sub find_widget {
357 my ($self, $x, $y) = @_; 404 my ($self, $x, $y) = @_;
358 405
411sub size_request { 458sub size_request {
412 $_[0]{children}[0]->size_request 459 $_[0]{children}[0]->size_request
413} 460}
414 461
415sub size_allocate { 462sub size_allocate {
416 my ($self, $x, $y, $w, $h) = @_; 463 my ($self, $w, $h) = @_;
417 464
418 $self->_size_allocate ($x, $y, $w, $h) or return;
419
420 $self->{children}[0]->size_allocate (0, 0, $w, $h); 465 $self->{children}[0]->configure (0, 0, $w, $h);
421} 466}
422 467
423############################################################################# 468#############################################################################
424 469
425package CFClient::UI::Window; 470package CFClient::UI::Window;
443} 488}
444 489
445sub render_chld { 490sub render_chld {
446 my ($self) = @_; 491 my ($self) = @_;
447 492
448 $self->{texture} = 493 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
449 CFClient::Texture->new_from_opengl ( 494 glClearColor 0, 0, 0, 1;
450 $self->{w}, $self->{h}, sub { $self->child->draw } 495 glClear GL_COLOR_BUFFER_BIT;
451 ); 496 $self->child->draw;
497 };
452} 498}
453 499
454sub size_allocate { 500sub size_allocate {
455 my ($self, $x, $y, $w, $h) = @_; 501 my ($self, $w, $h) = @_;
456 502
457 $self->_size_allocate ($x, $y, $w, $h) or return;
458
459 $self->child->size_allocate (0, 0, $w, $h); 503 $self->child->configure (0, 0, $w, $h);
460 504
461 $self->render_chld; 505 $self->render_chld;
462} 506}
463 507
464sub _draw { 508sub _draw {
480 glDisable GL_TEXTURE_2D; 524 glDisable GL_TEXTURE_2D;
481} 525}
482 526
483############################################################################# 527#############################################################################
484 528
529package CFClient::UI::ViewPort;
530
531our @ISA = CFClient::UI::Window::;
532
533sub new { die }
534
535sub size_request {
536 my ($self) = @_;
537
538 @$self{qw(child_w child_h)} = $self->child->size_request;
539 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
540
541 @$self{qw(child_w child_h)}
542}
543
544sub _draw {
545 my ($self) = @_;
546
547 $self->{children}[1]->draw;
548}
549
550
551#############################################################################
552
485package CFClient::UI::Frame; 553package CFClient::UI::Frame;
486 554
487our @ISA = CFClient::UI::Bin::; 555our @ISA = CFClient::UI::Bin::;
488 556
489use SDL::OpenGL; 557use SDL::OpenGL;
499} 567}
500 568
501sub size_allocate { 569sub size_allocate {
502 my ($self, $x, $y, $w, $h) = @_; 570 my ($self, $x, $y, $w, $h) = @_;
503 571
504 $self->_size_allocate ($x, $y, $w, $h) or return;
505
506 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 572 $self->child->configure (2, 2, $w - 4, $h - 4);
507} 573}
508 574
509sub _draw { 575sub _draw {
510 my ($self) = @_; 576 my ($self) = @_;
511 577
534 600
535my @tex = 601my @tex =
536 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 602 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
537 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 603 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
538 604
605sub new {
606 my $class = shift;
607
608 # TODO: user_x, user_y, overwrite moveto?
609
610 $class->SUPER::new (
611 bg => [1, 1, 1, 1],
612 border_bg => [1, 1, 1, 1],
613 border => int $::FONTSIZE * 0.8,
614 @_
615 )
616}
617
539sub size_request { 618sub size_request {
540 my ($self) = @_; 619 my ($self) = @_;
541 620
542 my ($w, $h) = 621 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
543 $self->{user_w} && $self->{user_h} 622
544 ? ($self->{user_w}, $self->{user_h})
545 : ($self->SUPER::size_request); 623 my ($w, $h) = $self->SUPER::size_request;
546 624
547 $h += $tex[1]->{h}; 625 (
548 $h += $tex[4]->{h}; 626 $w + $self->{border} * 2,
549 $w += $tex[2]->{w}; 627 $h + $self->{border} * 2,
550 $w += $tex[3]->{w}; 628 )
551
552 ($w, $h)
553} 629}
554 630
555sub size_allocate { 631sub size_allocate {
556 my ($self, $x, $y, $w, $h) = @_; 632 my ($self, $w, $h) = @_;
557 633
558 $self->_size_allocate ($x, $y, $w, $h) or return; 634 $h -= List::Util::max 0, $self->{border} * 2;
635 $w -= List::Util::max 0, $self->{border} * 2;
559 636
560 $h -= $tex[1]{h}; 637 $self->child->configure ($self->{border}, $self->{border}, $w, $h);
561 $h -= $tex[4]{h};
562 $w -= $tex[2]{w};
563 $w -= $tex[3]{w};
564
565 $h = $h < 0 ? 0 : $h;
566 $w = $w < 0 ? 0 : $w;
567
568 my $child = $self->child;
569
570 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
571} 638}
572 639
573sub button_down { 640sub button_down {
574 my ($self, $ev, $x, $y) = @_; 641 my ($self, $ev, $x, $y) = @_;
575 642
576 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 643 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
577 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 644 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
578 645
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 646 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
580 my ($bw, $bh) = ($self->{w}, $self->{h}); 647 my ($bw, $bh) = ($self->{w}, $self->{h});
581 648
582 $self->{motion} = sub { 649 $self->{motion} = sub {
584 651
585 ($x, $y) = ($ev->motion_x, $ev->motion_y); 652 ($x, $y) = ($ev->motion_x, $ev->motion_y);
586 653
587 $self->{user_w} = $bw + $x - $ox; 654 $self->{user_w} = $bw + $x - $ox;
588 $self->{user_h} = $bh + $y - $oy; 655 $self->{user_h} = $bh + $y - $oy;
589 $self->update; 656 $self->check_size;
590 }; 657 };
591 658
592 } elsif ($x >= 0 && $x < $self->{w} 659 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $tex[1]{h}) { 660 && $y >= 0 && $y < $self->{border}) {
594 661
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 662 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
596 my ($bx, $by) = ($self->{x}, $self->{y}); 663 my ($bx, $by) = ($self->{x}, $self->{y});
597 664
598 $self->{motion} = sub { 665 $self->{motion} = sub {
619} 686}
620 687
621sub _draw { 688sub _draw {
622 my ($self) = @_; 689 my ($self) = @_;
623 690
624 my ($w, $h) = ($self->{w}, $self->{h}); 691 my ($w, $h ) = ($self->{w}, $self->{h});
625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 692 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
626 693
627 glEnable GL_BLEND; 694 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629 glEnable GL_TEXTURE_2D; 696 glEnable GL_TEXTURE_2D;
630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631 698
632 my $top = $tex[1]; 699 glColor @{ $self->{border_bg} };
633 $top->draw_quad (0, 0, $w, $top->{h}); 700 $tex[1]->draw_quad (0, 0, $w, $self->{border});
634 701 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
635 my $left = $tex[3]; 702 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
636 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 703 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
637
638 my $right = $tex[2];
639 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
640
641 my $bottom = $tex[4];
642 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
643 704
644 my $bg = $tex[0]; 705 my $bg = $tex[0];
645 706
646 glBindTexture GL_TEXTURE_2D, $bg->{name}; 707 # TODO: repeat texture not scale
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
648 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
649 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
650
651 my $rep_x = $cw / $bg->{w}; 708 my $rep_x = $cw / $bg->{w};
652 my $rep_y = $ch / $bg->{h}; 709 my $rep_y = $ch / $bg->{h};
653 710
711 glColor @{ $self->{bg} };
712
713 $bg->{s} = $rep_x;
714 $bg->{t} = $rep_y;
715 $bg->{wrap_mode} = 1;
654 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 716 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
655 717
656 glDisable GL_TEXTURE_2D; 718 glDisable GL_TEXTURE_2D;
657 glDisable GL_BLEND; 719 glDisable GL_BLEND;
658 720
659 $self->child->draw; 721 $self->child->draw;
660
661} 722}
662 723
663############################################################################# 724#############################################################################
664 725
665package CFClient::UI::Table; 726package CFClient::UI::Table;
668 729
669use List::Util qw(max sum); 730use List::Util qw(max sum);
670 731
671use SDL::OpenGL; 732use SDL::OpenGL;
672 733
734sub new {
735 my $class = shift;
736
737 $class->SUPER::new (
738 col_expand => [],
739 @_
740 )
741}
742
673sub add { 743sub add {
674 my ($self, $x, $y, $chld) = @_; 744 my ($self, $x, $y, $child) = @_;
675 745
746 $child->set_parent ($self);
676 $self->{children}[$y][$x] = $chld; 747 $self->{children}[$y][$x] = $child;
677 $chld->set_parent ($self);
678 748
679 $self->{w} = $self->{h} = -1; 749 $self->{w} = $self->{h} = -1;
750
751 $child->check_size;
752}
753
754# TODO: move to container class maybe? send childs a signal on removal?
755sub clear {
756 my ($self) = @_;
757
758 delete $self->{children};
680 $self->update; 759 $self->update;
681} 760}
682 761
683sub get_wh { 762sub get_wh {
684 my ($self) = @_; 763 my ($self) = @_;
706 my ($self) = @_; 785 my ($self) = @_;
707 786
708 my ($ws, $hs) = $self->get_wh; 787 my ($ws, $hs) = $self->get_wh;
709 788
710 ( 789 (
711 (List::Util::sum @$ws), 790 (sum @$ws),
712 (List::Util::sum @$hs), 791 (sum @$hs),
713 ) 792 )
714} 793}
715 794
716sub size_allocate { 795sub size_allocate {
717 my ($self, $x, $y, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
718
719 $self->_size_allocate ($x, $y, $w, $h) or return;
720 797
721 my ($ws, $hs) = $self->get_wh; 798 my ($ws, $hs) = $self->get_wh;
722 799
723 my $req_w = List::Util::sum @$ws; 800 my $req_w = sum @$ws;
724 my $req_h = List::Util::sum @$hs; 801 my $req_h = sum @$hs;
802
803 # TODO: nicer code && do row_expand
804 my @col_expand = @{$self->{col_expand}};
805 @col_expand = (1) x @$ws unless @col_expand;
806 my $col_expand = (sum @col_expand) || 1;
725 807
726 # linearly scale sizes 808 # linearly scale sizes
727 $_ *= $w / $req_w for @$ws; 809 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $_ *= $h / $req_h for @$hs; 810 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
811
812 CFClient::UI::harmonize $ws;
813 CFClient::UI::harmonize $hs;
729 814
730 my $y; 815 my $y;
731 816
732 for my $r (0 .. $#{$self->{children}}) { 817 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r] 818 my $row = $self->{children}[$r]
735 820
736 my $x = 0; 821 my $x = 0;
737 my $row_h = $hs->[$r]; 822 my $row_h = $hs->[$r];
738 823
739 for my $c (0 .. $#$row) { 824 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 825 my $col_w = $ws->[$c];
744 826
827 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 828 $widget->configure ($x, $y, $col_w, $row_h);
829 }
746 830
747 $x += $col_w; 831 $x += $col_w;
748 } 832 }
749 833
750 $y += $row_h; 834 $y += $row_h;
794 (List::Util::max map $_->[1], @alloc), 878 (List::Util::max map $_->[1], @alloc),
795 ) 879 )
796} 880}
797 881
798sub size_allocate { 882sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
800
801 $self->_size_allocate ($x, $y, $w, $h) or return;
802
803 return unless $self->{w};
804 884
805 ($h, $w) = ($w, $h); 885 ($h, $w) = ($w, $h);
806 886
807 my $children = $self->{children}; 887 my $children = $self->{children};
808 888
810 890
811 my $req_h = List::Util::sum @h; 891 my $req_h = List::Util::sum @h;
812 892
813 if ($req_h > $h) { 893 if ($req_h > $h) {
814 # ah well, not enough space 894 # ah well, not enough space
815 $_ = $h[$_] * $h / $req_h for @h; 895 $_ *= $h / $req_h for @h;
816 } else { 896 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children; 897 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1; 898 $exp ||= 1;
819 899
820 for (0 .. $#$children) { 900 for (0 .. $#$children) {
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 904 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h; 905 $h[$_] = $alloc_h;
826 } 906 }
827 } 907 }
828 908
909 CFClient::UI::harmonize \@h;
910
829 my $y = 0; 911 my $y = 0;
830 for (0 .. $#$children) { 912 for (0 .. $#$children) {
831 my $child = $children->[$_]; 913 my $child = $children->[$_];
832 my $h = $h[$_]; 914 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 915 $child->configure ($y, 0, $h, $w);
834 916
835 $y += $h; 917 $y += $h;
836 } 918 }
919
920 1
837} 921}
838 922
839############################################################################# 923#############################################################################
840 924
841package CFClient::UI::VBox; 925package CFClient::UI::VBox;
854 (List::Util::sum map $_->[1], @alloc), 938 (List::Util::sum map $_->[1], @alloc),
855 ) 939 )
856} 940}
857 941
858sub size_allocate { 942sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 943 my ($self, $w, $h) = @_;
860
861 $self->_size_allocate ($x, $y, $w, $h) or return;
862
863 return unless $self->{h};
864 944
865 my $children = $self->{children}; 945 my $children = $self->{children};
866 946
867 my @h = map +($_->size_request)[1], @$children; 947 my @h = map +($_->size_request)[1], @$children;
868 948
869 my $req_h = List::Util::sum @h; 949 my $req_h = List::Util::sum @h;
870 950
871 if ($req_h > $h) { 951 if ($req_h > $h) {
872 # ah well, not enough space 952 # ah well, not enough space
873 $_ = $h[$_] * $h / $req_h for @h; 953 $_ *= $h / $req_h for @h;
874 } else { 954 } else {
875 my $exp = List::Util::sum map $_->{expand}, @$children; 955 my $exp = List::Util::sum map $_->{expand}, @$children;
876 $exp ||= 1; 956 $exp ||= 1;
877 957
878 for (0 .. $#$children) { 958 for (0 .. $#$children) {
880 960
881 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 961 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
882 } 962 }
883 } 963 }
884 964
965 CFClient::UI::harmonize \@h;
966
885 my $y = 0; 967 my $y = 0;
886 for (0 .. $#$children) { 968 for (0 .. $#$children) {
887 my $child = $children->[$_]; 969 my $child = $children->[$_];
888 my $h = $h[$_]; 970 my $h = $h[$_];
889 $child->size_allocate (0, $y, $w, $h); 971 $child->configure (0, $y, $w, $h);
890 972
891 $y += $h; 973 $y += $h;
892 } 974 }
975
976 1
893} 977}
894 978
895############################################################################# 979#############################################################################
896 980
897package CFClient::UI::Label; 981package CFClient::UI::Label;
902 986
903sub new { 987sub new {
904 my ($class, %arg) = @_; 988 my ($class, %arg) = @_;
905 989
906 my $self = $class->SUPER::new ( 990 my $self = $class->SUPER::new (
907 fg => [1, 1, 1], 991 fg => [1, 1, 1],
908 height => $::FONTSIZE, 992 fontsize => $::FONTSIZE,
909 text => "", 993 text => "",
910 align => -1, 994 align => -1,
995 valign => -1,
911 padding => 2, 996 padding => 2,
912 layout => new CFClient::Layout, 997 layout => new CFClient::Layout,
913 %arg 998 %arg
914 ); 999 );
915 1000
916 $self->set_text ($self->{text}); 1001 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1002
1003 $self->set_text (delete $self->{text}) if exists $self->{text};
1004 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
917 1005
918 $self 1006 $self
919} 1007}
920 1008
921sub escape_text { 1009sub escape_text {
929} 1017}
930 1018
931sub set_text { 1019sub set_text {
932 my ($self, $text) = @_; 1020 my ($self, $text) = @_;
933 1021
934 $self->{text} = $text;
935 $self->{layout}->set_markup ($text); 1022 $self->{layout}->set_text ($text);
936 1023
937 delete $self->{texture}; 1024 delete $self->{texture};
938 $self->update; 1025 $self->update;
939} 1026}
940 1027
941sub get_text { 1028sub set_markup {
942 my ($self, $text) = @_; 1029 my ($self, $markup) = @_;
943 1030
944 $self->{text} 1031 $self->{layout}->set_markup ($markup);
1032
1033 delete $self->{texture};
1034 $self->update;
945} 1035}
946 1036
947sub size_request { 1037sub size_request {
948 my ($self) = @_; 1038 my ($self) = @_;
949 1039
950 $self->{layout}->set_width; 1040 $self->{layout}->set_width;
951 $self->{layout}->set_height ($self->{height}); 1041 $self->{layout}->set_height ($self->{fontsize});
1042
952 my ($w, $h) = $self->{layout}->size; 1043 my ($w, $h) = $self->{layout}->size;
953 1044
954 ( 1045 (
955 $w + $self->{padding} * 2, 1046 $w + $self->{padding} * 2,
956 $h + $self->{padding} * 2, 1047 $h + $self->{padding} * 2,
957 ) 1048 )
958} 1049}
959 1050
960sub size_allocate { 1051sub size_allocate {
961 my ($self, $x, $y, $w, $h) = @_; 1052 my ($self, $w, $h) = @_;
962
963 $self->_size_allocate ($x, $y, $w, $h) or return;
964 1053
965 delete $self->{texture}; 1054 delete $self->{texture};
966} 1055}
967 1056
968sub update { 1057sub update {
975sub _draw { 1064sub _draw {
976 my ($self) = @_; 1065 my ($self) = @_;
977 1066
978 my $tex = $self->{texture} ||= do { 1067 my $tex = $self->{texture} ||= do {
979 $self->{layout}->set_width ($self->{w}); 1068 $self->{layout}->set_width ($self->{w});
1069 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
980 new_from_layout CFClient::Texture $self->{layout} 1070 new_from_layout CFClient::Texture $self->{layout}
981 }; 1071 };
982 1072
983 glEnable GL_BLEND; 1073 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1074 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D; 1075 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1076 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987 1077
988 glColor @{$self->{fg}}; 1078 glColor @{$self->{fg}};
989 1079
990 my $x = 1080 $self->{ox} = int (
991 $self->{align} < 0 ? $self->{padding} 1081 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1082 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5; 1083 : ($self->{w} - $tex->{w}) * 0.5
1084 );
994 1085
995 $tex->draw_quad ($x, $self->{padding}); 1086 $self->{oy} = int (
1087 $self->{valign} < 0 ? $self->{padding}
1088 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1089 : ($self->{h} - $tex->{h}) * 0.5
1090 );
1091
1092 $tex->draw_quad ($self->{ox}, $self->{oy});
996 1093
997 glDisable GL_TEXTURE_2D; 1094 glDisable GL_TEXTURE_2D;
998 glDisable GL_BLEND; 1095 glDisable GL_BLEND;
999} 1096}
1000 1097
1001############################################################################# 1098#############################################################################
1002 1099
1003package CFClient::UI::Entry; 1100package CFClient::UI::EntryBase;
1004 1101
1005our @ISA = CFClient::UI::Label::; 1102our @ISA = CFClient::UI::Label::;
1006 1103
1007use SDL; 1104use SDL;
1008use SDL::OpenGL; 1105use SDL::OpenGL;
1011 my $class = shift; 1108 my $class = shift;
1012 1109
1013 $class->SUPER::new ( 1110 $class->SUPER::new (
1014 fg => [1, 1, 1], 1111 fg => [1, 1, 1],
1015 bg => [0, 0, 0, 0.2], 1112 bg => [0, 0, 0, 0.2],
1016 active_bg => [1, 1, 1], 1113 active_bg => [1, 1, 1, 0.5],
1017 active_fg => [0, 0, 0], 1114 active_fg => [0, 0, 0],
1115 can_hover => 1,
1116 can_focus => 1,
1117 valign => 0,
1018 @_ 1118 @_
1019 ) 1119 )
1020} 1120}
1021 1121
1022sub _set_text { 1122sub _set_text {
1023 my ($self, $text) = @_; 1123 my ($self, $text) = @_;
1024 1124
1125 delete $self->{cur_h};
1126
1127 return if $self->{text} eq $text;
1128
1025 $self->{last_activity} = $::NOW; 1129 $self->{last_activity} = $::NOW;
1026
1027 $self->{text} = $text; 1130 $self->{text} = $text;
1028 $self->{layout}->set_width ($self->{w});
1029 1131
1030 $text =~ s/./*/g if $self->{hidden}; 1132 $text =~ s/./*/g if $self->{hidden};
1133 $self->{layout}->set_text ("$text ");
1031 1134
1032 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1135 $self->emit (changed => $self->{text});
1136}
1033 1137
1034 $text = substr $text, 0, $self->{cursor}; 1138sub get_text {
1035 utf8::encode $text; 1139 $_[0]{text}
1036
1037 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1038} 1140}
1039 1141
1040sub size_request { 1142sub size_request {
1041 my ($self) = @_; 1143 my ($self) = @_;
1042 1144
1044 1146
1045 ($w + 1, $h) # add 1 for cursor 1147 ($w + 1, $h) # add 1 for cursor
1046} 1148}
1047 1149
1048sub size_allocate { 1150sub size_allocate {
1049 my ($self, $x, $y, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1050
1051 $self->SUPER::size_allocate ($x, $y, $w, $h);
1052 1152
1053 $self->_set_text ($self->{text}); 1153 $self->_set_text ($self->{text});
1054} 1154}
1055 1155
1056sub set_text { 1156sub set_text {
1081 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1181 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1082 } elsif ($sym == SDLK_HOME) { 1182 } elsif ($sym == SDLK_HOME) {
1083 $self->{cursor} = 0; 1183 $self->{cursor} = 0;
1084 } elsif ($sym == SDLK_END) { 1184 } elsif ($sym == SDLK_END) {
1085 $self->{cursor} = length $text; 1185 $self->{cursor} = length $text;
1186 } elsif ($sym == SDLK_ESCAPE) {
1187 $self->emit ('escape');
1086 } elsif ($uni) { 1188 } elsif ($uni) {
1087 substr $text, $self->{cursor}++, 0, chr $uni; 1189 substr $text, $self->{cursor}++, 0, chr $uni;
1088 } 1190 }
1089 1191
1090 $self->_set_text ($text); 1192 $self->_set_text ($text);
1144 1246
1145 $self->SUPER::_draw; 1247 $self->SUPER::_draw;
1146 1248
1147 #TODO: force update every cursor change :( 1249 #TODO: force update every cursor change :(
1148 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1250 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1251
1252 unless (exists $self->{cur_h}) {
1253 my $text = substr $self->{text}, 0, $self->{cursor};
1254 utf8::encode $text;
1255
1256 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1257 }
1258
1149 glColor @{$self->{fg}}; 1259 glColor @{$self->{fg}};
1150 glBegin GL_LINES; 1260 glBegin GL_LINES;
1151 glVertex $self->{cur_x}, $self->{cur_y};
1152 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1261 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1262 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1153 glEnd; 1263 glEnd;
1154 } 1264 }
1155} 1265}
1156 1266
1157#############################################################################
1158
1159package CFClient::UI::Slider; 1267package CFClient::UI::Entry;
1160 1268
1161use strict; 1269our @ISA = CFClient::UI::EntryBase::;
1162 1270
1271use SDL;
1163use SDL::OpenGL; 1272use SDL::OpenGL;
1164 1273
1274sub key_down {
1275 my ($self, $ev) = @_;
1276
1277 my $sym = $ev->key_sym;
1278
1279 if ($sym == SDLK_RETURN) {
1280 $self->emit (activate => $self->get_text);
1281 $self->update;
1282
1283 } else {
1284 $self->SUPER::key_down ($ev);
1285 }
1286
1287}
1288
1289#############################################################################
1290
1291package CFClient::UI::Button;
1292
1165our @ISA = CFClient::UI::DrawBG::; 1293our @ISA = CFClient::UI::Label::;
1294
1295use SDL;
1296use SDL::OpenGL;
1297
1298my @tex =
1299 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1300 qw(b1_button_active.png);
1166 1301
1167sub new { 1302sub new {
1168 my $class = shift; 1303 my $class = shift;
1169 1304
1305 $class->SUPER::new (
1306 padding => 4,
1307 fg => [1, 1, 1],
1308 bg => [1, 1, 1, 0.2],
1309 active_fg => [0, 0, 1],
1310 can_hover => 1,
1311 align => 0,
1312 valign => 0,
1313 @_
1314 )
1315}
1316
1317sub button_up {
1318 my ($self, $ev, $x, $y) = @_;
1319
1320 if ($x >= 0 && $x < $self->{w}
1321 && $y >= 0 && $y < $self->{h}) {
1322 $self->emit ("activate");
1323 }
1324}
1325
1326sub _draw {
1327 my ($self) = @_;
1328
1329 local $self->{fg} = $self->{fg};
1330
1331 if ($GRAB == $self) {
1332 $self->{fg} = $self->{active_fg};
1333 }
1334
1335 glEnable GL_BLEND;
1336 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1337 glEnable GL_TEXTURE_2D;
1338 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1339 glColor 0, 0, 0, 1;
1340
1341 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1342
1343 glDisable GL_TEXTURE_2D;
1344 glDisable GL_BLEND;
1345
1346 $self->SUPER::_draw;
1347}
1348
1349#############################################################################
1350
1351package CFClient::UI::CheckBox;
1352
1353our @ISA = CFClient::UI::DrawBG::;
1354
1355my @tex =
1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1357 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1358
1359use SDL;
1360use SDL::OpenGL;
1361
1362sub new {
1363 my $class = shift;
1364
1365 $class->SUPER::new (
1366 padding => 2,
1367 fg => [1, 1, 1],
1368 active_fg => [1, 1, 0],
1369 state => 0,
1370 can_hover => 1,
1371 @_
1372 )
1373}
1374
1375sub size_request {
1376 my ($self) = @_;
1377
1378 ($self->{padding} * 2 + 6) x 2
1379}
1380
1381sub button_down {
1382 my ($self, $ev, $x, $y) = @_;
1383
1384 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1385 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1386 $self->{state} = !$self->{state};
1387 $self->emit (changed => $self->{state});
1388 }
1389}
1390
1391sub _draw {
1392 my ($self) = @_;
1393
1394 $self->SUPER::_draw;
1395
1396 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1397
1398 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1399
1400 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1401
1402 glEnable GL_BLEND;
1403 glEnable GL_TEXTURE_2D;
1404 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1405
1406 my $tex = $self->{state} ? $tex[1] : $tex[0];
1407
1408 $tex->draw_quad (0, 0, $s, $s);
1409
1410 glDisable GL_TEXTURE_2D;
1411 glDisable GL_BLEND;
1412}
1413
1414#############################################################################
1415
1416package CFClient::UI::VGauge;
1417
1418our @ISA = CFClient::UI::Base::;
1419
1420use SDL::OpenGL;
1421
1422my %tex = (
1423 food => [
1424 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1425 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1426 ],
1427 grace => [
1428 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1429 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1430 ],
1431 hp => [
1432 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1433 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1434 ],
1435 mana => [
1436 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1437 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1438 ],
1439);
1440
1441# eg. VGauge->new (gauge => 'food'), default gauge: food
1442sub new {
1443 my $class = shift;
1444
1445 my $self = $class->SUPER::new (gauge => 'food', @_);
1446
1447 $self
1448}
1449
1450sub size_request {
1451 my ($self) = @_;
1452
1453 my $tex = $tex{$self->{gauge}}[0];
1454
1455 @$tex{qw(w h)}
1456}
1457
1458sub set_max {
1459 my ($self, $max) = @_;
1460
1461 $self->{max_val} = $max;
1462}
1463
1464sub set_value {
1465 my ($self, $val, $max) = @_;
1466
1467 $self->set_max ($max)
1468 if defined $max;
1469
1470 $max = $self->{max_val};
1471 $self->{val} = $val;
1472
1473 $self->update;
1474}
1475
1476sub _draw {
1477 my ($self) = @_;
1478
1479 my $tex = $tex{$self->{gauge}};
1480
1481 my ($w, $h) = ($self->{w}, $self->{h});
1482
1483 my $ycut = $self->{val} / ($self->{max_val} || 1);
1484 $ycut = 1 if $self->{val} > $self->{max_val};
1485
1486 my $t1 = $tex->[0];
1487 my $t2 = $tex->[1];
1488
1489 glEnable GL_BLEND;
1490 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1491 glEnable GL_TEXTURE_2D;
1492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1493
1494 my $h1 = $self->{h} - $ycut * $self->{h};
1495 my $h2 = $ycut * $self->{h};
1496
1497 my $yp = 0;
1498
1499 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1500 glBegin (GL_QUADS);
1501 glTexCoord (0, 0); glVertex (0 , $yp);
1502 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1503 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1504 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1505 glEnd ();
1506
1507 $yp += $h1;
1508
1509 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1510 glBegin (GL_QUADS);
1511 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1512 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1513 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1514 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1515 glEnd ();
1516
1517 glDisable GL_BLEND;
1518 glDisable GL_TEXTURE_2D;
1519}
1520
1521#############################################################################
1522
1523package CFClient::UI::Slider;
1524
1525use strict;
1526
1527use SDL::OpenGL;
1528
1529our @ISA = CFClient::UI::DrawBG::;
1530
1531my @tex =
1532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1533 qw(s1_slider.png s1_slider_bg.png);
1534
1535sub new {
1536 my $class = shift;
1537
1170 # range [value, low, high, page] 1538 # range [value, low, high, page]
1171 1539
1540 # TODO: 0-width page
1541 # TODO: req_w/h are wrong with vertical
1542 # TODO: calculations are off
1172 my $self = $class->SUPER::new ( 1543 my $self = $class->SUPER::new (
1173 fg => [1, 1, 1], 1544 fg => [1, 1, 1],
1174 active_fg => [0, 0, 0], 1545 active_fg => [0, 0, 0],
1175 range => [0, 0, 100, 10], 1546 range => [0, 0, 100, 10],
1176 req_w => 40, 1547 req_w => 40,
1177 req_h => 10, 1548 req_h => 13,
1178 vertical => 0, 1549 vertical => 0,
1550 can_hover => 1,
1551 inner_pad => 5,
1179 @_ 1552 @_
1180 ); 1553 );
1181 1554
1182 $self 1555 $self
1183} 1556}
1204 if ($GRAB == $self) { 1577 if ($GRAB == $self) {
1205 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1578 my ($value, $lo, $hi, $page) = @{$self->{range}};
1206 1579
1207 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1580 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1208 1581
1582 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1583 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1584
1585 $x -= $inner_pad_px; # substract the padding
1209 $x = $x * ($hi - $lo) / $w + $lo; 1586 $x = $x * ($hi - $lo) / $inner_w + $lo;
1210 $x = $lo if $x < $lo; 1587 $x = $lo if $x < $lo;
1211 $x = $hi - $page if $x > $hi - $page; 1588 $x = $hi - $page if $x > $hi - $page;
1212 $self->{range}[0] = $x; 1589 $self->{range}[0] = $x;
1213 1590
1214 $self->emit (changed => $x); 1591 $self->emit (changed => $x);
1215 $self->update; 1592 $self->update;
1216 } 1593 }
1594}
1595
1596# the inner_* stuff is for generating a padding for the slider handle,
1597# so that the handle doesn't leave the texture. This calculation isn't 100%
1598# correct propably, but it does the job for now
1599sub _calc_inner_pad_px {
1600 my ($self, $w) = @_;
1601 ($w / 100) * $self->{inner_pad} # % to pixels
1217} 1602}
1218 1603
1219sub _draw { 1604sub _draw {
1220 my ($self) = @_; 1605 my ($self) = @_;
1221 1606
1235 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1620 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1236 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1621 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1237 1622
1238 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1623 my ($value, $lo, $hi, $page) = @{$self->{range}};
1239 1624
1625 $hi = $value + 1 if $lo == $hi;
1626
1627 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1628 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1629
1240 $page = int $page * $w / ($hi - $lo); 1630 $page = int $page * $inner_w / ($hi - $lo);
1241 $value = int +($value - $lo) * $w / ($hi - $lo); 1631 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1242 1632
1243 $w -= $page; 1633 $w -= $page;
1244 $page &= ~1; 1634 $page &= ~1;
1245 glTranslate $page * 0.5, 0, 0; 1635 glTranslate $page * 0.5, 0, 0;
1636 $page ||= 2;
1246 1637
1247 glColor @$fg;
1248 glBegin GL_LINES;
1249 glVertex 0, 0; glVertex 0, $h;
1250 glVertex $w - 1, 0; glVertex $w - 1, $h;
1251 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1252 glEnd;
1253
1254 my $knob_a = $value - $page * 0.5; 1638 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1255 my $knob_b = $value + $page * 0.5; 1639 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1256 1640
1257 glBegin GL_QUADS; 1641 glEnable GL_BLEND;
1258 glColor @$fg; 1642 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1259 glVertex $knob_a, 0; 1643 glEnable GL_TEXTURE_2D;
1260 glVertex $knob_a, $h; 1644 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1261 glVertex $knob_b, $h;
1262 glVertex $knob_b, 0;
1263 1645
1264 if ($knob_a < $knob_b - 2) { 1646 # draw background
1265 glColor @$bg; 1647 $tex[1]->draw_quad (0, 0, $w, $h);
1266 glVertex $knob_a + 1, 1; 1648
1267 glVertex $knob_a + 1, $h - 1; 1649 # draw handle
1268 glVertex $knob_b - 1, $h - 1; 1650 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1269 glVertex $knob_b - 1, 1; 1651
1652 glDisable GL_BLEND;
1653 glDisable GL_TEXTURE_2D;
1654}
1655
1656#############################################################################
1657
1658package CFClient::UI::TextView;
1659
1660our @ISA = CFClient::UI::HBox::;
1661
1662use SDL::OpenGL;
1663
1664sub new {
1665 my $class = shift;
1666
1667 my $self = $class->SUPER::new (
1668 req_w => $::WIDTH / 6,
1669 req_h => $::HEIGHT / 6,
1670 fontsize => $::FONTSIZE,
1671 @_,
1672
1673 layout => (new CFClient::Layout),
1674 par => [],
1675 height => 0,
1676 children => [
1677 (new CFClient::UI::Empty expand => 1),
1678 (new CFClient::UI::Slider vertical => 1),
1679 ],
1680 );
1681
1682 $self->{children}[1]->connect (changed => sub {
1683 $self->update;
1684 });
1685
1686 $self
1687}
1688
1689sub set_fontsize {
1690 my ($self, $fontsize) = @_;
1691
1692 $self->{fontsize} = $fontsize;
1693 $self->reflow;
1694}
1695
1696sub text_height {
1697 my ($self, $text) = @_;
1698
1699 my $layout = $self->{layout};
1700
1701 $layout->set_height ($self->{fontsize});
1702 $layout->set_width ($self->{w});
1703 $layout->set_text ($text);
1270 } 1704
1271 glEnd; 1705 ($layout->size)[1]
1706}
1707
1708sub reflow {
1709 my ($self) = @_;
1710
1711 $self->{need_reflow}++;
1712 $self->update;
1713}
1714
1715sub size_request {
1716 my ($self) = @_;
1717
1718 ($self->{req_w}, $self->{req_h})
1719}
1720
1721sub size_allocate {
1722 my ($self, $w, $h) = @_;
1723
1724 $self->{layout}->set_height ($self->{fontsize});
1725 $self->{layout}->set_width ($self->{w});
1726
1727 $self->reflow;
1728 $self->update;
1729}
1730
1731sub add_paragraph {
1732 my ($self, $color, $text) = @_;
1733
1734 #TODO: intelligently "reformat" paragraph
1735
1736 my $height = $self->text_height ($text);
1737
1738 $self->{height} += $height;
1739
1740 push @{$self->{par}}, [$height, $color, $text];
1741
1742 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1743 $self->{children}[1]->update;
1744}
1745
1746sub update {
1747 my ($self) = @_;
1748
1749 $self->SUPER::update;
1750
1751 return unless $self->{h} > 0;
1752
1753 delete $self->{texture};
1754
1755 $ROOT->on_refresh ($self, sub {
1756 if (delete $self->{need_reflow}) {
1757 my $height = 0;
1758
1759 $height += $_->[0] = $self->text_height ($_->[2])
1760 for @{$self->{par}};
1761
1762 $self->{height} = $height;
1763
1764 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1765
1766 delete $self->{texture};
1767 }
1768
1769 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1770 glClearColor 0, 0, 0, 1;
1771 glClear GL_COLOR_BUFFER_BIT;
1772
1773 glEnable GL_BLEND;
1774 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1775 glEnable GL_TEXTURE_2D;
1776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1777
1778 my $top = int $self->{children}[1]{range}[0];
1779
1780 my $y0 = $top;
1781 my $y1 = $top + $self->{h};
1782
1783 my $y = 0;
1784
1785 my $layout = $self->{layout};
1786
1787 for my $par (@{$self->{par}}) {
1788 my $h = $par->[0];
1789
1790 if ($y0 < $y + $h && $y < $y1) {
1791 $layout->set_text ($par->[2]);
1792
1793 glColor @{ $par->[1] };
1794 my ($W, $H) = $layout->size;
1795 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1796 }
1797
1798 $y += $h;
1799 }
1800
1801 glDisable GL_TEXTURE_2D;
1802 glDisable GL_BLEND;
1803 };
1804 });
1805}
1806
1807sub _draw {
1808 my ($self) = @_;
1809
1810 if ($self->{texture}) {
1811 glEnable GL_TEXTURE_2D;
1812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1813 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1814 glDisable GL_TEXTURE_2D;
1815 }
1816
1817 $self->{children}[1]->draw;
1818
1272} 1819}
1273 1820
1274############################################################################# 1821#############################################################################
1275 1822
1276package CFClient::UI::MapWidget; 1823package CFClient::UI::MapWidget;
1286 1833
1287sub new { 1834sub new {
1288 my $class = shift; 1835 my $class = shift;
1289 1836
1290 $class->SUPER::new ( 1837 $class->SUPER::new (
1291 z => -1, 1838 z => -1,
1839 can_focus => 1,
1292 list => (glGenLists 1), 1840 list => (glGenLists 1),
1293 @_ 1841 @_
1294 ) 1842 )
1295} 1843}
1296 1844
1297sub key_down { 1845sub key_down {
1298 print "MAPKEYDOWN\n"; 1846 print "MAPKEYDOWN\n";
1299} 1847}
1300 1848
1301sub key_up { 1849sub key_up {
1850}
1851
1852sub button_down {
1853 my ($self, $ev, $x, $y) = @_;
1854
1855 $self->focus_in;
1856
1857 if ($ev->button == 2) {
1858 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1859 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1860
1861 $self->{motion} = sub {
1862 my ($ev, $x, $y) = @_;
1863
1864 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1865
1866 $::CFG->{map_shift_x} = $bw + $x - $ox;
1867 $::CFG->{map_shift_y} = $bh + $y - $oy;
1868
1869 $self->update;
1870 };
1871 }
1872}
1873
1874sub button_up {
1875 my ($self, $ev, $x, $y) = @_;
1876
1877 delete $self->{motion};
1878}
1879
1880sub mouse_motion {
1881 my ($self, $ev, $x, $y) = @_;
1882
1883 $self->{motion}->($ev, $x, $y) if $self->{motion};
1302} 1884}
1303 1885
1304sub size_request { 1886sub size_request {
1305 ( 1887 (
1306 1 + 32 * int $::WIDTH / 32, 1888 1 + 32 * int $::WIDTH / 32,
1319 my ($self) = @_; 1901 my ($self) = @_;
1320 1902
1321 if (delete $self->{need_update}) { 1903 if (delete $self->{need_update}) {
1322 glNewList $self->{list}, GL_COMPILE; 1904 glNewList $self->{list}, GL_COMPILE;
1323 1905
1324 my $mx = $::CONN->{mapx}; 1906 if ($::MAP) {
1325 my $my = $::CONN->{mapy};
1326
1327 my $map = $::CONN->{map};
1328
1329 my ($xofs, $yofs);
1330
1331 my $sw = 1 + int $::WIDTH / 32; 1907 my $sw = int $::WIDTH / 32;
1332 my $sh = 1 + int $::HEIGHT / 32; 1908 my $sh = int $::HEIGHT / 32;
1333 1909
1334 if ($::CONN->{mapw} > $sw) { 1910 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1335 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1911 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1336 } else { 1912
1337 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1913 glTranslate $sx0 - 32, $sy0 - 32, 0;
1914
1915 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1916
1917 if ($::CFG->{fow_enable}) {
1918 if ($::CFG->{fow_smooth}) { # smooth fog of war
1919 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1920 glConvolutionFilter2D (
1921 GL_CONVOLUTION_2D,
1922 GL_ALPHA,
1923 3, 3,
1924 GL_ALPHA, GL_FLOAT,
1925 pack "f*",
1926 0.1, 0.1, 0.1,
1927 0.1, 0.2, 0.1,
1928 0.1, 0.1, 0.1,
1929 );
1930 glEnable GL_CONVOLUTION_2D;
1931 }
1932
1933 $self->{fow_texture} = new CFClient::Texture
1934 w => $w,
1935 h => $h,
1936 data => $data,
1937 internalformat => GL_ALPHA,
1938 format => GL_ALPHA;
1939
1940 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1941
1942 glEnable GL_BLEND;
1943 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1944 glEnable GL_TEXTURE_2D;
1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1946
1947 glColor +($::CFG->{fow_intensity}) x 3, 1;
1948 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1949
1950 glDisable GL_TEXTURE_2D;
1951 glDisable GL_BLEND;
1952 }
1953
1954 # HACK BEGIN
1955 {
1956 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1957 my ($w, $h) = (250, 250);
1958
1959 glEnable GL_BLEND;
1960 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961 glEnable GL_TEXTURE_2D;
1962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963
1964 $self->{mapmap_texture} =
1965 new CFClient::Texture
1966 w => $w,
1967 h => $h,
1968 data => $::MAP->mapmap ($w, $h),
1969 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1970
1971 $self->{mapmap_texture}->draw_quad (100, 100);
1972
1973 glDisable GL_TEXTURE_2D;
1974 glDisable GL_BLEND;
1975 }
1976 # HACK END
1338 } 1977 }
1339 1978
1340 if ($::CONN->{maph} > $sh) {
1341 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1342 } else {
1343 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1344 }
1345
1346 glEnable GL_TEXTURE_2D;
1347 glEnable GL_BLEND;
1348 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1350
1351 my $sw4 = ($sw + 3) & ~3;
1352 my $darkness = "\x00" x ($sw4 * $sh);
1353
1354 for my $x (0 .. $sw - 1) {
1355 my $row = $map->[$x + $xofs];
1356 for my $y (0 .. $sh - 1) {
1357
1358 my $cell = $row->[$y + $yofs]
1359 or next;
1360
1361 my $dark = $cell->[0];
1362 if ($dark < 0) {
1363 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1364 } else {
1365 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1366 }
1367
1368 for my $num (grep $_, @$cell[1,2,3]) {
1369 my $tex = $::CONN->{face}[$num]{texture} || next;
1370
1371 my ($w, $h) = @$tex{qw(w h)};
1372
1373 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1374 }
1375 }
1376 }
1377
1378# if (1) { # higher quality darkness
1379# $lighting =~ s/(.)/$1$1$1/gs;
1380# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1381#
1382# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1383#
1384# $lighting = $pb->get_pixels;
1385# $lighting =~ s/(.)../$1/gs;
1386# }
1387
1388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1389
1390 $darkness = new CFClient::Texture
1391 w => $sw4,
1392 h => $sh,
1393 data => $darkness,
1394 internalformat => GL_ALPHA,
1395 format => GL_ALPHA;
1396
1397 glColor 0.45, 0.45, 0.45, 1;
1398 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1399
1400 glDisable GL_TEXTURE_2D;
1401 glDisable GL_BLEND;
1402
1403 glEndList; 1979 glEndList;
1404 } 1980 }
1405 1981
1982 glPushMatrix;
1406 glCallList $self->{list}; 1983 glCallList $self->{list};
1984 glPopMatrix;
1985
1986 if ($FOCUS != $self) {
1987 glColor 64/255, 64/255, 64/255;
1988 glLogicOp GL_AND;
1989 glEnable GL_COLOR_LOGIC_OP;
1990 glBegin GL_QUADS;
1991 glVertex 0, 0;
1992 glVertex 0, $::HEIGHT;
1993 glVertex $::WIDTH, $::HEIGHT;
1994 glVertex $::WIDTH, 0;
1995 glEnd;
1996 glDisable GL_COLOR_LOGIC_OP;
1997 }
1407} 1998}
1408 1999
1409my %DIR = ( 2000my %DIR = (
1410 SDLK_KP8, [1, "north"], 2001 SDLK_KP8, [1, "north"],
1411 SDLK_KP9, [2, "northeast"], 2002 SDLK_KP9, [2, "northeast"],
1427 2018
1428 my $mod = $ev->key_mod; 2019 my $mod = $ev->key_mod;
1429 my $sym = $ev->key_sym; 2020 my $sym = $ev->key_sym;
1430 2021
1431 if ($sym == SDLK_KP5) { 2022 if ($sym == SDLK_KP5) {
1432 $::CONN->send ("command stay fire"); 2023 $::CONN->user_send ("stay fire");
2024 } elsif ($sym == SDLK_a) {
2025 $::CONN->user_send ("apply");
2026 } elsif ($sym == SDLK_QUOTE) {
2027 $self->emit ('activate_console');
2028 } elsif ($sym == SDLK_SLASH) {
2029 $self->emit ('activate_console' => '/');
1433 } elsif (exists $DIR{$sym}) { 2030 } elsif (exists $DIR{$sym}) {
1434 if ($mod & KMOD_SHIFT) { 2031 if ($mod & KMOD_SHIFT) {
1435 $self->{shft}++; 2032 $self->{shft}++;
1436 $::CONN->send ("command fire $DIR{$sym}[0]"); 2033 $::CONN->user_send ("fire $DIR{$sym}[0]");
1437 } elsif ($mod & KMOD_CTRL) { 2034 } elsif ($mod & KMOD_CTRL) {
1438 $self->{ctrl}++; 2035 $self->{ctrl}++;
1439 $::CONN->send ("command run $DIR{$sym}[0]"); 2036 $::CONN->user_send ("run $DIR{$sym}[0]");
1440 } else { 2037 } else {
1441 $::CONN->send ("command $DIR{$sym}[1]"); 2038 $::CONN->user_send ("$DIR{$sym}[1]");
1442 } 2039 }
1443 } 2040 }
1444} 2041}
1445 2042
1446sub key_up { 2043sub key_up {
1448 2045
1449 my $mod = $ev->key_mod; 2046 my $mod = $ev->key_mod;
1450 my $sym = $ev->key_sym; 2047 my $sym = $ev->key_sym;
1451 2048
1452 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2049 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1453 $::CONN->send ("command fire_stop"); 2050 $::CONN->user_send ("fire_stop");
1454 } 2051 }
1455 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2052 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1456 $::CONN->send ("command run_stop"); 2053 $::CONN->user_send ("run_stop");
1457 } 2054 }
1458} 2055}
1459 2056
1460############################################################################# 2057#############################################################################
1461 2058
1499 glPopMatrix; 2096 glPopMatrix;
1500} 2097}
1501 2098
1502############################################################################# 2099#############################################################################
1503 2100
1504package CFClient::UI::Toplevel; 2101package CFClient::UI::Flopper;
2102
2103our @ISA = CFClient::UI::Button::;
2104
2105sub new {
2106 my $class = shift;
2107
2108 my $self = $class->SUPER::new (
2109 state => 0,
2110 connect_activate => \&toggle_flopper,
2111 @_
2112 );
2113
2114 if ($self->{state}) {
2115 $self->{state} = 0;
2116 $self->toggle_flopper;
2117 }
2118
2119 $self
2120}
2121
2122sub toggle_flopper {
2123 my ($self) = @_;
2124
2125 # TODO: use animation
2126 if ($self->{state} = !$self->{state}) {
2127 $CFClient::UI::ROOT->add ($self->{other});
2128 $self->{other}->move ($self->coord2global (0, $self->{h}));
2129 $self->emit ("open");
2130 } else {
2131 $CFClient::UI::ROOT->remove ($self->{other});
2132 $self->emit ("close");
2133 }
2134
2135 $self->emit (changed => $self->{state});
2136}
2137
2138#############################################################################
2139
2140package CFClient::UI::Root;
1505 2141
1506our @ISA = CFClient::UI::Container::; 2142our @ISA = CFClient::UI::Container::;
2143
2144use SDL::OpenGL;
2145
2146sub check_size {
2147 my ($self) = @_;
2148
2149 $self->configure (0, 0, $::WITH, $::HEIGHT);
2150}
1507 2151
1508sub size_request { 2152sub size_request {
1509 ($::WIDTH, $::HEIGHT) 2153 ($::WIDTH, $::HEIGHT)
1510} 2154}
1511 2155
1512sub size_allocate { 2156sub configure {
1513 my ($self, $x, $y, $w, $h) = @_; 2157 my ($self, $x, $y, $w, $h) = @_;
1514 2158
1515 $self->_size_allocate ($x, $y, $w, $h); 2159 $self->SUPER::configure ($x, $y, $w, $h);
1516 2160
1517 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2161 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1518 for @{$self->{children}}; 2162 for @{$self->{children}};
1519} 2163}
1520 2164
1521sub translate { 2165sub _topleft {
1522 my ($self, $x, $y) = @_; 2166 my ($self, $x, $y) = @_;
1523 2167
1524 ($x, $y) 2168 ($x, $y)
1525} 2169}
1526 2170
1527sub update { 2171sub update {
1528 my ($self) = @_; 2172 my ($self) = @_;
1529 2173
1530 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2174 $self->check_size;
1531 ::refresh (); 2175 ::refresh ();
1532} 2176}
1533 2177
1534sub add { 2178sub add {
1535 my ($self, $widget) = @_; 2179 my ($self, $child) = @_;
1536 2180
1537 $self->SUPER::add ($widget); 2181 $self->SUPER::add ($child);
2182}
1538 2183
1539 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2184sub on_refresh {
2185 my ($self, $id, $cb) = @_;
2186
2187 $self->{refresh_hook}{$id} = $cb;
1540} 2188}
1541 2189
1542sub draw { 2190sub draw {
1543 my ($self) = @_; 2191 my ($self) = @_;
1544 2192
2193 while (my $rcb = delete $self->{refresh_hook}) {
2194 $_->() for values %$rcb;
2195 }
2196
2197 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2198 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2199 glClear GL_COLOR_BUFFER_BIT;
2200
2201 glMatrixMode GL_PROJECTION;
2202 glLoadIdentity;
2203 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2204 glMatrixMode GL_MODELVIEW;
2205 glLoadIdentity;
2206
1545 $self->_draw; 2207 $self->_draw;
1546} 2208}
1547 2209
1548############################################################################# 2210#############################################################################
1549 2211
1550package CFClient::UI; 2212package CFClient::UI;
1551 2213
1552$TOPLEVEL = new CFClient::UI::Toplevel; 2214$ROOT = new CFClient::UI::Root;
1553 2215
15541 22161
1555 2217

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines