ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.73 by root, Tue Apr 11 18:06:53 2006 UTC vs.
Revision 1.123 by root, Mon Apr 17 19:50:22 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines