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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines