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.88 by root, Wed Apr 12 21:01:46 2006 UTC vs.
Revision 1.140 by root, Thu Apr 20 04:20:52 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;
… …
21 $FOCUS->key_up ($_[0]) if $FOCUS; 21 $FOCUS->key_up ($_[0]) if $FOCUS;
22} 22}
23 23
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->{x}, $ev->{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->{x}, $ev->{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;
54 } 54 }
55} 55}
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->{x}, $ev->{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;
76 89
77use strict; 90use strict;
78 91
79use SDL::OpenGL; 92use CFClient::OpenGL;
80 93
81sub new { 94sub new {
82 my $class = shift; 95 my $class = shift;
83 96
84 my $self = 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,
89 h => -1,
90 @_ 101 @_
91 }, $class; 102 }, $class;
92 103
93 for (keys %$self) { 104 for (keys %$self) {
94 if (/^connect_(.*)$/) { 105 if (/^connect_(.*)$/) {
… …
97 } 108 }
98 109
99 $self 110 $self
100} 111}
101 112
113sub show {
114 my ($self) = @_;
115
116 return if $self->{parent};
117
118 $CFClient::UI::ROOT->add ($self);
119}
120
121sub hide {
122 my ($self) = @_;
123
124 return unless $self->{parent};
125
126 $self->{parent}->remove ($self);
127}
128
102sub move { 129sub move {
103 my ($self, $x, $y, $z) = @_; 130 my ($self, $x, $y, $z) = @_;
131
104 $self->{x} = $x; 132 $self->{x} = int $x;
105 $self->{y} = $y; 133 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 134 $self->{z} = $z if defined $z;
135
136 $self->update;
107} 137}
108 138
109sub needs_redraw { 139sub needs_redraw {
110 0 140 0
111} 141}
… …
113sub size_request { 143sub size_request {
114 require Carp; 144 require Carp;
115 Carp::confess "size_request is abtract"; 145 Carp::confess "size_request is abtract";
116} 146}
117 147
118sub _size_allocate { 148sub configure {
119 my ($self, $x, $y, $w, $h) = @_; 149 my ($self, $x, $y, $w, $h) = @_;
120 150
121 $self->{x} = $x; 151 $self->{x} = $x;
122 $self->{y} = $y; 152 $self->{y} = $y;
123 153
154 if ($self->{aspect}) {
155 $w = List::Util::min $w, int $h * $self->{aspect};
156 $h = List::Util::min $h, int $w / $self->{aspect};
157 }
158
124 return unless $self->{w} != $w || $self->{h} != $h; 159 return unless $self->{w} != $w || $self->{h} != $h;
125 160
126 $self->{w} = $w; 161 $self->{w} = $w;
127 $self->{h} = $h; 162 $self->{h} = $h;
128 163
129 1 164 $self->size_allocate ($w, $h);
165 $self->update;
130} 166}
131 167
132sub size_allocate { 168sub size_allocate {
169 # nothing to be done
170}
171
172# return top left coordinates
173sub _topleft {
133 my ($self, $x, $y, $w, $h) = @_; 174 my ($self, $x, $y) = @_;
134 175
135 $self->_size_allocate ($x, $y, $w, $h); 176 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
136} 177}
137 178
138# translate global coordinates to local coordinate system 179# translate global coordinates to local coordinate system
139sub translate { 180sub coord2local {
140 my ($self, $x, $y) = @_; 181 my ($self, $x, $y) = @_;
141 182
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 183 my ($X, $Y) = $self->_topleft;
184 ($x - $X, $y - $Y)
185}
186
187# translate local coordinates to global coordinate system
188sub coord2global {
189 my ($self, $x, $y) = @_;
190
191 my ($X, $Y) = $self->_topleft;
192 ($x + $X, $y + $Y)
143} 193}
144 194
145sub focus_in { 195sub focus_in {
146 my ($self) = @_; 196 my ($self) = @_;
147 197
148 return if $FOCUS == $self; 198 return if $FOCUS == $self;
199 return unless $self->{can_focus};
149 200
150 my $focus = $FOCUS; $FOCUS = $self; 201 my $focus = $FOCUS; $FOCUS = $self;
202
203 $self->emit (focus_in => $focus);
204
151 $focus->update if $focus; 205 $focus->update if $focus;
152 $FOCUS->update; 206 $FOCUS->update;
153} 207}
154 208
155sub focus_out { 209sub focus_out {
156 my ($self) = @_; 210 my ($self) = @_;
157 211
158 return unless $FOCUS == $self; 212 return unless $FOCUS == $self;
159 213
160 my $focus = $FOCUS; undef $FOCUS; 214 my $focus = $FOCUS; undef $FOCUS;
215
216 $self->emit (focus_out => $focus);
217
161 $focus->update if $focus; #? 218 $focus->update if $focus; #?
162} 219}
163 220
164sub mouse_motion { } 221sub mouse_motion { }
165sub button_up { } 222sub button_up { }
… …
186 glPushMatrix; 243 glPushMatrix;
187 glTranslate $self->{x}, $self->{y}, 0; 244 glTranslate $self->{x}, $self->{y}, 0;
188 $self->_draw; 245 $self->_draw;
189 glPopMatrix; 246 glPopMatrix;
190 247
191 if ($self == $HOVER) { 248 if ($self == $HOVER && $self->{can_hover}) {
192 my ($x, $y) = @$self{qw(x y)}; 249 my ($x, $y) = @$self{qw(x y)};
193 250
194 glColor 0, 0, 1, 0.2; 251 glColor 1, 0.8, 0.5, 0.2;
195 glEnable GL_BLEND; 252 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 253 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
197 glBegin GL_QUADS; 254 glBegin GL_QUADS;
198 glVertex $x , $y; 255 glVertex $x , $y;
199 glVertex $x + $self->{w}, $y; 256 glVertex $x + $self->{w}, $y;
… …
219 276
220 () 277 ()
221} 278}
222 279
223sub set_parent { 280sub set_parent {
224 my ($self, $par) = @_; 281 my ($self, $parent) = @_;
225 282
226 $self->{parent} = $par;
227 Scalar::Util::weaken $self->{parent}; 283 Scalar::Util::weaken ($self->{parent} = $parent);
228} 284}
229 285
230sub get_parent { 286sub check_size {
231 $_[0]->{parent} 287 my ($self) = @_;
288
289 my ($w, $h) = $self->size_request;
290
291 if ($w != $self->{req_w} || $h != $self->{req_h}) {
292 $self->{req_w} = $w;
293 $self->{req_h} = $h;
294
295 $self->{parent}->check_size
296 if $self->{parent};
297 }
232} 298}
233 299
234sub update { 300sub update {
235 my ($self) = @_; 301 my ($self) = @_;
236 302
… …
239} 305}
240 306
241sub connect { 307sub connect {
242 my ($self, $signal, $cb) = @_; 308 my ($self, $signal, $cb) = @_;
243 309
244 push @{ $self->{cb}{$signal} }, $cb; 310 push @{ $self->{signal_cb}{$signal} }, $cb;
245} 311}
246 312
247sub emit { 313sub emit {
248 my ($self, $signal, @args) = @_; 314 my ($self, $signal, @args) = @_;
249 315
316 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
250 $_->($self, @args) 317 $cb->($self, @args);
251 for @{$self->{cb}{$signal} || []}; 318 }
252} 319}
253 320
254sub DESTROY { 321sub DESTROY {
255 my ($self) = @_; 322 my ($self) = @_;
256 323
… …
262package CFClient::UI::DrawBG; 329package CFClient::UI::DrawBG;
263 330
264our @ISA = CFClient::UI::Base::; 331our @ISA = CFClient::UI::Base::;
265 332
266use strict; 333use strict;
267use SDL::OpenGL; 334use CFClient::OpenGL;
268 335
269sub new { 336sub new {
270 my $class = shift; 337 my $class = shift;
271 338
272 # range [value, low, high, page] 339 # range [value, low, high, page]
… …
325 392
326 $self 393 $self
327} 394}
328 395
329sub add { 396sub add {
330 my ($self, $chld) = @_; 397 my ($self, $child) = @_;
331 398
332 $chld->set_parent ($self); 399 $child->set_parent ($self);
400
401 use sort 'stable';
333 402
334 $self->{children} = [ 403 $self->{children} = [
335 sort { $a->{z} <=> $b->{z} } 404 sort { $a->{z} <=> $b->{z} }
336 @{$self->{children}}, $chld 405 @{$self->{children}}, $child
337 ]; 406 ];
338 407
339 $self->{w} = $self->{h} = -1; 408 $child->check_size;
340 $self->update;
341} 409}
342 410
343sub remove { 411sub remove {
344 my ($self, $widget) = @_; 412 my ($self, $child) = @_;
345 413
414 delete $child->{parent};
415
346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 416 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
347 417
348 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 418 $self->check_size;
349} 419}
350 420
351sub find_widget { 421sub find_widget {
352 my ($self, $x, $y) = @_; 422 my ($self, $x, $y) = @_;
353 423
… …
383 453
384 $class->SUPER::new (children => [$child], %arg) 454 $class->SUPER::new (children => [$child], %arg)
385} 455}
386 456
387sub add { 457sub add {
388 my ($self, $widget) = @_; 458 my ($self, $child) = @_;
389 459
390 $self->{children} = []; 460 $self->{children} = [];
391 461
392 $self->SUPER::add ($widget); 462 $self->SUPER::add ($child);
393} 463}
394 464
395sub remove { 465sub remove {
396 my ($self, $widget) = @_; 466 my ($self, $widget) = @_;
397 467
… …
406sub size_request { 476sub size_request {
407 $_[0]{children}[0]->size_request 477 $_[0]{children}[0]->size_request
408} 478}
409 479
410sub size_allocate { 480sub size_allocate {
411 my ($self, $x, $y, $w, $h) = @_; 481 my ($self, $w, $h) = @_;
412 482
413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
415 $self->{children}[0]->size_allocate (0, 0, $w, $h); 483 $self->{children}[0]->configure (0, 0, $w, $h);
416} 484}
417 485
418############################################################################# 486#############################################################################
419 487
420package CFClient::UI::Window; 488package CFClient::UI::Window;
421 489
422our @ISA = CFClient::UI::Bin::; 490our @ISA = CFClient::UI::Bin::;
423 491
424use SDL::OpenGL; 492use CFClient::OpenGL;
425 493
426sub new { 494sub new {
427 my ($class, %arg) = @_; 495 my ($class, %arg) = @_;
428 496
429 my $self = $class->SUPER::new (%arg); 497 my $self = $class->SUPER::new (%arg);
… …
438} 506}
439 507
440sub render_chld { 508sub render_chld {
441 my ($self) = @_; 509 my ($self) = @_;
442 510
443 $self->{texture} = 511 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
444 CFClient::Texture->new_from_opengl ( 512 glClearColor 0, 0, 0, 1;
445 $self->{w}, $self->{h}, sub { $self->child->draw } 513 glClear GL_COLOR_BUFFER_BIT;
446 ); 514 $self->child->draw;
515 };
447} 516}
448 517
449sub size_allocate { 518sub size_allocate {
450 my ($self, $x, $y, $w, $h) = @_; 519 my ($self, $w, $h) = @_;
451 520
452 $self->_size_allocate ($x, $y, $w, $h) or return;
453
454 $self->child->size_allocate (0, 0, $w, $h); 521 $self->child->configure (0, 0, $w, $h);
455 522
456 $self->render_chld; 523 $self->render_chld;
457} 524}
458 525
459sub _draw { 526sub _draw {
… …
475 glDisable GL_TEXTURE_2D; 542 glDisable GL_TEXTURE_2D;
476} 543}
477 544
478############################################################################# 545#############################################################################
479 546
547package CFClient::UI::ViewPort;
548
549our @ISA = CFClient::UI::Window::;
550
551sub new { die }
552
553sub size_request {
554 my ($self) = @_;
555
556 @$self{qw(child_w child_h)} = $self->child->size_request;
557 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
558
559 @$self{qw(child_w child_h)}
560}
561
562sub _draw {
563 my ($self) = @_;
564
565 $self->{children}[1]->draw;
566}
567
568
569#############################################################################
570
480package CFClient::UI::Frame; 571package CFClient::UI::Frame;
481 572
482our @ISA = CFClient::UI::Bin::; 573our @ISA = CFClient::UI::Bin::;
483 574
484use SDL::OpenGL; 575use CFClient::OpenGL;
485 576
486sub size_request { 577sub size_request {
487 my ($self) = @_; 578 my ($self) = @_;
488 my $chld = $self->child 579 my $chld = $self->child
489 or return (0, 0); 580 or return (0, 0);
… …
494} 585}
495 586
496sub size_allocate { 587sub size_allocate {
497 my ($self, $x, $y, $w, $h) = @_; 588 my ($self, $x, $y, $w, $h) = @_;
498 589
499 $self->_size_allocate ($x, $y, $w, $h) or return;
500
501 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 590 $self->child->configure (2, 2, $w - 4, $h - 4);
502} 591}
503 592
504sub _draw { 593sub _draw {
505 my ($self) = @_; 594 my ($self) = @_;
506 595
… …
523 612
524package CFClient::UI::FancyFrame; 613package CFClient::UI::FancyFrame;
525 614
526our @ISA = CFClient::UI::Bin::; 615our @ISA = CFClient::UI::Bin::;
527 616
528use SDL::OpenGL; 617use CFClient::OpenGL;
529 618
530my @tex = 619my @tex =
531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 620 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 621 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533 622
623sub new {
624 my $class = shift;
625
626 # TODO: user_x, user_y, overwrite moveto?
627
628 $class->SUPER::new (
629 bg => [1, 1, 1, 1],
630 border_bg => [1, 1, 1, 1],
631 border => 0.8,
632 @_
633 )
634}
635
636sub border {
637 int $_[0]{border} * $::FONTSIZE
638}
639
534sub size_request { 640sub size_request {
535 my ($self) = @_; 641 my ($self) = @_;
536 642
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 643 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538 644
539 my ($w, $h) = $self->SUPER::size_request; 645 my ($w, $h) = $self->SUPER::size_request;
540 646
541 $h += $tex[1]->{h}; 647 (
542 $h += $tex[4]->{h}; 648 $w + $self->border * 2,
543 $w += $tex[2]->{w}; 649 $h + $self->border * 2,
544 $w += $tex[3]->{w}; 650 )
545
546 ($w, $h)
547} 651}
548 652
549sub size_allocate { 653sub size_allocate {
550 my ($self, $x, $y, $w, $h) = @_; 654 my ($self, $w, $h) = @_;
551 655
552 $self->_size_allocate ($x, $y, $w, $h) or return; 656 $h -= List::Util::max 0, $self->border * 2;
657 $w -= List::Util::max 0, $self->border * 2;
553 658
554 $h -= $tex[1]{h}; 659 $self->child->configure ($self->border, $self->border, $w, $h);
555 $h -= $tex[4]{h};
556 $w -= $tex[2]{w};
557 $w -= $tex[3]{w};
558
559 $h = $h < 0 ? 0 : $h;
560 $w = $w < 0 ? 0 : $w;
561
562 my $child = $self->child;
563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565} 660}
566 661
567sub button_down { 662sub button_down {
568 my ($self, $ev, $x, $y) = @_; 663 my ($self, $ev, $x, $y) = @_;
569 664
665 my $border = $self->border;
666
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 667 if ($x < $self->{w} && $x >= $self->{w} - $border
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 668 && $y < $self->{h} && $y >= $self->{h} - $border) {
572 669
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 670 my ($ox, $oy) = ($ev->{x}, $ev->{y});
574 my ($bw, $bh) = ($self->{w}, $self->{h}); 671 my ($bw, $bh) = ($self->{w}, $self->{h});
575 672
576 $self->{motion} = sub { 673 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_; 674 my ($ev, $x, $y) = @_;
578 675
579 ($x, $y) = ($ev->motion_x, $ev->motion_y); 676 ($x, $y) = ($ev->{x}, $ev->{y});
580 677
581 $self->{user_w} = $bw + $x - $ox; 678 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy; 679 $self->{user_h} = $bh + $y - $oy;
583 $self->update; 680 $self->check_size;
584 }; 681 };
585 682
586 } elsif ($x >= 0 && $x < $self->{w} 683 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) { 684 && $y >= 0 && $y < $border) {
588 685
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 686 my ($ox, $oy) = ($ev->{x}, $ev->{y});
590 my ($bx, $by) = ($self->{x}, $self->{y}); 687 my ($bx, $by) = ($self->{x}, $self->{y});
591 688
592 $self->{motion} = sub { 689 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_; 690 my ($ev, $x, $y) = @_;
594 691
595 ($x, $y) = ($ev->motion_x, $ev->motion_y); 692 ($x, $y) = ($ev->{x}, $ev->{y});
596 693
597 $self->move ($bx + $x - $ox, $by + $y - $oy); 694 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update; 695 $self->update;
599 }; 696 };
600 } 697 }
… …
613} 710}
614 711
615sub _draw { 712sub _draw {
616 my ($self) = @_; 713 my ($self) = @_;
617 714
618 my ($w, $h) = ($self->{w}, $self->{h}); 715 my ($w, $h ) = ($self->{w}, $self->{h});
619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 716 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620 717
621 glEnable GL_BLEND; 718 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 719 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623 glEnable GL_TEXTURE_2D; 720 glEnable GL_TEXTURE_2D;
624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625 722
626 my $top = $tex[1]; 723 my $border = $self->border;
724
725 glColor @{ $self->{border_bg} };
627 $top->draw_quad (0, 0, $w, $top->{h}); 726 $tex[1]->draw_quad (0, 0, $w, $border);
628 727 $tex[3]->draw_quad (0, $border, $border, $ch);
629 my $left = $tex[3]; 728 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 729 $tex[4]->draw_quad (0, $h - $border, $w, $border);
631
632 my $right = $tex[2];
633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635 my $bottom = $tex[4];
636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637 730
638 my $bg = $tex[0]; 731 my $bg = $tex[0];
639 732
640 glBindTexture GL_TEXTURE_2D, $bg->{name}; 733 # TODO: repeat texture not scale
641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642
643 my $rep_x = $cw / $bg->{w}; 734 my $rep_x = $cw / $bg->{w};
644 my $rep_y = $ch / $bg->{h}; 735 my $rep_y = $ch / $bg->{h};
645 736
646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 737 glColor @{ $self->{bg} };
738
739 $bg->{s} = $rep_x;
740 $bg->{t} = $rep_y;
741 $bg->{wrap_mode} = 1;
742 $bg->draw_quad ($border, $border, $cw, $ch);
647 743
648 glDisable GL_TEXTURE_2D; 744 glDisable GL_TEXTURE_2D;
649 glDisable GL_BLEND; 745 glDisable GL_BLEND;
650 746
651 $self->child->draw; 747 $self->child->draw;
652
653} 748}
654 749
655############################################################################# 750#############################################################################
656 751
657package CFClient::UI::Table; 752package CFClient::UI::Table;
658 753
659our @ISA = CFClient::UI::Base::; 754our @ISA = CFClient::UI::Base::;
660 755
661use List::Util qw(max sum); 756use List::Util qw(max sum);
662 757
663use SDL::OpenGL; 758use CFClient::OpenGL;
664 759
665sub new { 760sub new {
666 my $class = shift; 761 my $class = shift;
667 762
668 $class->SUPER::new ( 763 $class->SUPER::new (
… …
670 @_ 765 @_
671 ) 766 )
672} 767}
673 768
674sub add { 769sub add {
675 my ($self, $x, $y, $chld) = @_; 770 my ($self, $x, $y, $child) = @_;
676 771
772 $child->set_parent ($self);
677 $self->{children}[$y][$x] = $chld; 773 $self->{children}[$y][$x] = $child;
678 $chld->set_parent ($self);
679 774
680 $self->{w} = $self->{h} = -1; 775 $child->check_size;
776}
777
778# TODO: move to container class maybe? send childs a signal on removal?
779sub clear {
780 my ($self) = @_;
781
782 delete $self->{children};
681 $self->update; 783 $self->update;
682} 784}
683 785
684sub get_wh { 786sub get_wh {
685 my ($self) = @_; 787 my ($self) = @_;
… …
713 (sum @$hs), 815 (sum @$hs),
714 ) 816 )
715} 817}
716 818
717sub size_allocate { 819sub size_allocate {
718 my ($self, $x, $y, $w, $h) = @_; 820 my ($self, $w, $h) = @_;
719
720 $self->_size_allocate ($x, $y, $w, $h) or return;
721 821
722 my ($ws, $hs) = $self->get_wh; 822 my ($ws, $hs) = $self->get_wh;
723 823
724 my $req_w = sum @$ws; 824 my $req_w = sum @$ws;
725 my $req_h = sum @$hs; 825 my $req_h = sum @$hs;
… …
730 my $col_expand = (sum @col_expand) || 1; 830 my $col_expand = (sum @col_expand) || 1;
731 831
732 # linearly scale sizes 832 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 833 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 834 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
835
836 CFClient::UI::harmonize $ws;
837 CFClient::UI::harmonize $hs;
735 838
736 my $y; 839 my $y;
737 840
738 for my $r (0 .. $#{$self->{children}}) { 841 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r] 842 my $row = $self->{children}[$r]
… …
744 847
745 for my $c (0 .. $#$row) { 848 for my $c (0 .. $#$row) {
746 my $col_w = $ws->[$c]; 849 my $col_w = $ws->[$c];
747 850
748 if (my $widget = $row->[$c]) { 851 if (my $widget = $row->[$c]) {
749 $widget->size_allocate ($x, $y, $col_w, $row_h); 852 $widget->configure ($x, $y, $col_w, $row_h);
750 } 853 }
751 854
752 $x += $col_w; 855 $x += $col_w;
753 } 856 }
754 857
… …
799 (List::Util::max map $_->[1], @alloc), 902 (List::Util::max map $_->[1], @alloc),
800 ) 903 )
801} 904}
802 905
803sub size_allocate { 906sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_; 907 my ($self, $w, $h) = @_;
805
806 $self->_size_allocate ($x, $y, $w, $h);
807 908
808 ($h, $w) = ($w, $h); 909 ($h, $w) = ($w, $h);
809 910
810 my $children = $self->{children}; 911 my $children = $self->{children};
811 912
… …
827 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 928 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
828 $h[$_] = $alloc_h; 929 $h[$_] = $alloc_h;
829 } 930 }
830 } 931 }
831 932
933 CFClient::UI::harmonize \@h;
934
832 my $y = 0; 935 my $y = 0;
833 for (0 .. $#$children) { 936 for (0 .. $#$children) {
834 my $child = $children->[$_]; 937 my $child = $children->[$_];
835 my $h = $h[$_]; 938 my $h = $h[$_];
836 $child->size_allocate ($y, 0, $h, $w); 939 $child->configure ($y, 0, $h, $w);
837 940
838 $y += $h; 941 $y += $h;
839 } 942 }
943
944 1
840} 945}
841 946
842############################################################################# 947#############################################################################
843 948
844package CFClient::UI::VBox; 949package CFClient::UI::VBox;
… …
857 (List::Util::sum map $_->[1], @alloc), 962 (List::Util::sum map $_->[1], @alloc),
858 ) 963 )
859} 964}
860 965
861sub size_allocate { 966sub size_allocate {
862 my ($self, $x, $y, $w, $h) = @_; 967 my ($self, $w, $h) = @_;
863
864 $self->_size_allocate ($x, $y, $w, $h);
865 968
866 my $children = $self->{children}; 969 my $children = $self->{children};
867 970
868 my @h = map +($_->size_request)[1], @$children; 971 my @h = map +($_->size_request)[1], @$children;
869 972
… …
881 984
882 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 985 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
883 } 986 }
884 } 987 }
885 988
989 CFClient::UI::harmonize \@h;
990
886 my $y = 0; 991 my $y = 0;
887 for (0 .. $#$children) { 992 for (0 .. $#$children) {
888 my $child = $children->[$_]; 993 my $child = $children->[$_];
889 my $h = $h[$_]; 994 my $h = $h[$_];
890 $child->size_allocate (0, $y, $w, $h); 995 $child->configure (0, $y, $w, $h);
891 996
892 $y += $h; 997 $y += $h;
893 } 998 }
999
1000 1
894} 1001}
895 1002
896############################################################################# 1003#############################################################################
897 1004
898package CFClient::UI::Label; 1005package CFClient::UI::Label;
899 1006
900our @ISA = CFClient::UI::Base::; 1007our @ISA = CFClient::UI::Base::;
901 1008
902use SDL::OpenGL; 1009use CFClient::OpenGL;
903 1010
904sub new { 1011sub new {
905 my ($class, %arg) = @_; 1012 my ($class, %arg) = @_;
906 1013
907 my $self = $class->SUPER::new ( 1014 my $self = $class->SUPER::new (
908 fg => [1, 1, 1], 1015 fg => [1, 1, 1],
909 height => $::FONTSIZE, 1016 fontsize => 1,
910 text => "", 1017 text => "",
911 align => -1, 1018 align => -1,
1019 valign => -1,
912 padding => 2, 1020 padding => 2,
913 layout => new CFClient::Layout, 1021 layout => new CFClient::Layout,
914 %arg 1022 %arg
915 ); 1023 );
916 1024
917 $self->set_text ($self->{text}); 1025 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1026
1027 $self->set_text (delete $self->{text}) if exists $self->{text};
1028 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
918 1029
919 $self 1030 $self
920} 1031}
921 1032
922sub escape_text { 1033sub escape_text {
… …
930} 1041}
931 1042
932sub set_text { 1043sub set_text {
933 my ($self, $text) = @_; 1044 my ($self, $text) = @_;
934 1045
935 $self->{text} = $text;
936 $self->{layout}->set_markup ($text); 1046 $self->{layout}->set_text ($text);
937 1047
938 delete $self->{texture}; 1048 delete $self->{texture};
939# $self->{w} = $self->{h} = -1;
940 $self->update; 1049 $self->update;
941} 1050}
942 1051
943sub get_text { 1052sub set_markup {
944 my ($self, $text) = @_; 1053 my ($self, $markup) = @_;
945 1054
946 $self->{text} 1055 $self->{layout}->set_markup ($markup);
1056
1057 delete $self->{texture};
1058 $self->update;
947} 1059}
948 1060
949sub size_request { 1061sub size_request {
950 my ($self) = @_; 1062 my ($self) = @_;
951 1063
952 $self->{layout}->set_width; 1064 $self->{layout}->set_width;
953 $self->{layout}->set_height ($self->{height}); 1065 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1066
954 my ($w, $h) = $self->{layout}->size; 1067 my ($w, $h) = $self->{layout}->size;
955 1068
956 ( 1069 (
957 $w + $self->{padding} * 2, 1070 $w + $self->{padding} * 2,
958 $h + $self->{padding} * 2, 1071 $h + $self->{padding} * 2,
959 ) 1072 )
960} 1073}
961 1074
962sub size_allocate { 1075sub size_allocate {
963 my ($self, $x, $y, $w, $h) = @_; 1076 my ($self, $w, $h) = @_;
964
965 $self->_size_allocate ($x, $y, $w, $h) or return;
966 1077
967 delete $self->{texture}; 1078 delete $self->{texture};
968}
969
970sub update {
971 my ($self) = @_;
972
973 delete $self->{texture};
974 $self->SUPER::update;
975} 1079}
976 1080
977sub _draw { 1081sub _draw {
978 my ($self) = @_; 1082 my ($self) = @_;
979 1083
980 my $tex = $self->{texture} ||= do { 1084 my $tex = $self->{texture} ||= do {
981 $self->{layout}->set_width ($self->{w}); 1085 $self->{layout}->set_width ($self->{w});
982 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1086 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
983 new_from_layout CFClient::Texture $self->{layout} 1087 new_from_layout CFClient::Texture $self->{layout}
984 }; 1088 };
985 1089
986 glEnable GL_BLEND; 1090 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1091 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
988 glEnable GL_TEXTURE_2D; 1092 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1093 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
990 1094
991 glColor @{$self->{fg}}; 1095 glColor @{$self->{fg}};
992 1096
993 my $x = 1097 $self->{ox} = int (
994 $self->{align} < 0 ? $self->{padding} 1098 $self->{align} < 0 ? $self->{padding}
995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1099 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996 : ($self->{w} - $tex->{w}) * 0.5; 1100 : ($self->{w} - $tex->{w}) * 0.5
1101 );
997 1102
998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0; 1103 $self->{oy} = int (
999 $tex->draw_quad (0, 0); 1104 $self->{valign} < 0 ? $self->{padding}
1105 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1106 : ($self->{h} - $tex->{h}) * 0.5
1107 );
1108
1109 $tex->draw_quad ($self->{ox}, $self->{oy});
1000 1110
1001 glDisable GL_TEXTURE_2D; 1111 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND; 1112 glDisable GL_BLEND;
1003} 1113}
1004 1114
1005############################################################################# 1115#############################################################################
1006 1116
1007package CFClient::UI::Entry; 1117package CFClient::UI::EntryBase;
1008 1118
1009our @ISA = CFClient::UI::Label::; 1119our @ISA = CFClient::UI::Label::;
1010 1120
1011use SDL; 1121use CFClient::OpenGL;
1012use SDL::OpenGL;
1013 1122
1014sub new { 1123sub new {
1015 my $class = shift; 1124 my $class = shift;
1016 1125
1017 $class->SUPER::new ( 1126 $class->SUPER::new (
1018 fg => [1, 1, 1], 1127 fg => [1, 1, 1],
1019 bg => [0, 0, 0, 0.2], 1128 bg => [0, 0, 0, 0.2],
1020 active_bg => [1, 1, 1, 0.5], 1129 active_bg => [1, 1, 1, 0.5],
1021 active_fg => [0, 0, 0], 1130 active_fg => [0, 0, 0],
1131 can_hover => 1,
1132 can_focus => 1,
1133 valign => 0,
1022 @_ 1134 @_
1023 ) 1135 )
1024} 1136}
1025 1137
1026sub _set_text { 1138sub _set_text {
1027 my ($self, $text) = @_; 1139 my ($self, $text) = @_;
1028 1140
1141 delete $self->{cur_h};
1142
1143 return if $self->{text} eq $text;
1144
1145 delete $self->{texture};
1146
1029 $self->{last_activity} = $::NOW; 1147 $self->{last_activity} = $::NOW;
1030
1031 $self->{text} = $text; 1148 $self->{text} = $text;
1032 $self->{layout}->set_width ($self->{w});
1033 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1034 1149
1035 $text =~ s/./*/g if $self->{hidden}; 1150 $text =~ s/./*/g if $self->{hidden};
1151 $self->{layout}->set_text ("$text ");
1036 1152
1037 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1153 $self->emit (changed => $self->{text});
1154}
1038 1155
1039 $text = substr $text, 0, $self->{cursor}; 1156sub get_text {
1040 utf8::encode $text; 1157 $_[0]{text}
1041
1042 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1043} 1158}
1044 1159
1045sub size_request { 1160sub size_request {
1046 my ($self) = @_; 1161 my ($self) = @_;
1047 1162
… …
1049 1164
1050 ($w + 1, $h) # add 1 for cursor 1165 ($w + 1, $h) # add 1 for cursor
1051} 1166}
1052 1167
1053sub size_allocate { 1168sub size_allocate {
1054 my ($self, $x, $y, $w, $h) = @_; 1169 my ($self, $w, $h) = @_;
1055
1056 $self->SUPER::size_allocate ($x, $y, $w, $h);
1057 1170
1058 $self->_set_text ($self->{text}); 1171 $self->_set_text ($self->{text});
1059} 1172}
1060 1173
1061sub set_text { 1174sub set_text {
… …
1067} 1180}
1068 1181
1069sub key_down { 1182sub key_down {
1070 my ($self, $ev) = @_; 1183 my ($self, $ev) = @_;
1071 1184
1072 my $mod = $ev->key_mod; 1185 my $mod = $ev->{mod};
1073 my $sym = $ev->key_sym; 1186 my $sym = $ev->{sym};
1074
1075 my $uni = $ev->key_unicode; 1187 my $uni = $ev->{unicode};
1076 1188
1077 my $text = $self->get_text; 1189 my $text = $self->get_text;
1078 1190
1079 if ($sym == SDLK_BACKSPACE) { 1191 if ($sym == 8) {
1080 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1192 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1081 } elsif ($sym == SDLK_DELETE) { 1193 } elsif ($sym == 127) {
1082 substr $text, $self->{cursor}, 1, ""; 1194 substr $text, $self->{cursor}, 1, "";
1083 } elsif ($sym == SDLK_LEFT) { 1195 } elsif ($sym == CFClient::SDLK_LEFT) {
1084 --$self->{cursor} if $self->{cursor}; 1196 --$self->{cursor} if $self->{cursor};
1085 } elsif ($sym == SDLK_RIGHT) { 1197 } elsif ($sym == CFClient::SDLK_RIGHT) {
1086 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1198 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1087 } elsif ($sym == SDLK_HOME) { 1199 } elsif ($sym == CFClient::SDLK_HOME) {
1088 $self->{cursor} = 0; 1200 $self->{cursor} = 0;
1089 } elsif ($sym == SDLK_END) { 1201 } elsif ($sym == CFClient::SDLK_END) {
1090 $self->{cursor} = length $text; 1202 $self->{cursor} = length $text;
1203 } elsif ($sym == 27) {
1204 $self->emit ('escape');
1091 } elsif ($uni) { 1205 } elsif ($uni) {
1092 substr $text, $self->{cursor}++, 0, chr $uni; 1206 substr $text, $self->{cursor}++, 0, chr $uni;
1093 } 1207 }
1094 1208
1095 $self->_set_text ($text); 1209 $self->_set_text ($text);
… …
1149 1263
1150 $self->SUPER::_draw; 1264 $self->SUPER::_draw;
1151 1265
1152 #TODO: force update every cursor change :( 1266 #TODO: force update every cursor change :(
1153 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1267 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1268
1269 unless (exists $self->{cur_h}) {
1270 my $text = substr $self->{text}, 0, $self->{cursor};
1271 utf8::encode $text;
1272
1273 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1274 }
1275
1154 glColor @{$self->{fg}}; 1276 glColor @{$self->{fg}};
1155 glBegin GL_LINES; 1277 glBegin GL_LINES;
1156 glVertex $self->{cur_x}, $self->{cur_y};
1157 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1278 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1279 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1158 glEnd; 1280 glEnd;
1159 } 1281 }
1160} 1282}
1161 1283
1284package CFClient::UI::Entry;
1285
1286our @ISA = CFClient::UI::EntryBase::;
1287
1288use CFClient::OpenGL;
1289
1290sub key_down {
1291 my ($self, $ev) = @_;
1292
1293 my $sym = $ev->{sym};
1294
1295 if ($sym == 13) {
1296 $self->emit (activate => $self->get_text);
1297 $self->update;
1298
1299 } else {
1300 $self->SUPER::key_down ($ev);
1301 }
1302
1303}
1304
1162############################################################################# 1305#############################################################################
1163 1306
1164package CFClient::UI::Button; 1307package CFClient::UI::Button;
1165 1308
1166our @ISA = CFClient::UI::Label::; 1309our @ISA = CFClient::UI::Label::;
1167 1310
1168use SDL; 1311use CFClient::OpenGL;
1169use SDL::OpenGL;
1170 1312
1171my @tex = 1313my @tex =
1172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1314 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1173 qw(b1_button_active.png); 1315 qw(b1_button_active.png);
1174 1316
… …
1177 1319
1178 $class->SUPER::new ( 1320 $class->SUPER::new (
1179 padding => 4, 1321 padding => 4,
1180 fg => [1, 1, 1], 1322 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2], 1323 bg => [1, 1, 1, 0.2],
1182 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5], 1324 active_fg => [0, 0, 1],
1184# border_fg => [1, 1, 0], 1325 can_hover => 1,
1326 align => 0,
1327 valign => 0,
1185 @_ 1328 @_
1186 ) 1329 )
1187} 1330}
1188 1331
1189sub button_up { 1332sub button_up {
… …
1197 1340
1198sub _draw { 1341sub _draw {
1199 my ($self) = @_; 1342 my ($self) = @_;
1200 1343
1201 local $self->{fg} = $self->{fg}; 1344 local $self->{fg} = $self->{fg};
1202 my $tex = $tex[0];
1203
1204 glEnable GL_BLEND;
1205 glEnable GL_TEXTURE_2D;
1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1207 1345
1208 if ($GRAB == $self) { 1346 if ($GRAB == $self) {
1209 $self->{fg} = $self->{active_fg}; 1347 $self->{fg} = $self->{active_fg};
1210 } 1348 }
1211 1349
1212 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1350 glEnable GL_BLEND;
1351 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1352 glEnable GL_TEXTURE_2D;
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1353 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1354 glColor 0, 0, 0, 1;
1214 1355
1215 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1356 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1216 1357
1217 glDisable GL_TEXTURE_2D; 1358 glDisable GL_TEXTURE_2D;
1218 glDisable GL_BLEND; 1359 glDisable GL_BLEND;
1219 1360
1220 $self->SUPER::_draw; 1361 $self->SUPER::_draw;
… …
1224 1365
1225package CFClient::UI::CheckBox; 1366package CFClient::UI::CheckBox;
1226 1367
1227our @ISA = CFClient::UI::DrawBG::; 1368our @ISA = CFClient::UI::DrawBG::;
1228 1369
1229use SDL; 1370my @tex =
1230use SDL::OpenGL; 1371 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1372 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1373
1374use CFClient::OpenGL;
1231 1375
1232sub new { 1376sub new {
1233 my $class = shift; 1377 my $class = shift;
1234 1378
1235 $class->SUPER::new ( 1379 $class->SUPER::new (
1236 padding => 2, 1380 padding => 2,
1237 fg => [1, 1, 1], 1381 fg => [1, 1, 1],
1238 active_fg => [1, 1, 0], 1382 active_fg => [1, 1, 0],
1239 state => 0, 1383 state => 0,
1384 can_hover => 1,
1240 @_ 1385 @_
1241 ) 1386 )
1242} 1387}
1243 1388
1244sub size_request { 1389sub size_request {
1245 my ($self) = @_; 1390 my ($self) = @_;
1246 1391
1247 ($self->{padding} * 2 + 6) x 2 1392 ($self->{padding} * 2 + 6) x 2
1248}
1249
1250sub size_allocate {
1251 my ($self, $x, $y, $w, $h) = @_;
1252
1253 $self->_size_allocate ($x, $y, $w, $h);
1254} 1393}
1255 1394
1256sub button_down { 1395sub button_down {
1257 my ($self, $ev, $x, $y) = @_; 1396 my ($self, $ev, $x, $y) = @_;
1258 1397
… …
1269 $self->SUPER::_draw; 1408 $self->SUPER::_draw;
1270 1409
1271 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1410 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1272 1411
1273 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1412 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1274 1413
1275 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1414 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276 1415
1277 glBegin GL_LINE_LOOP; 1416 glEnable GL_BLEND;
1278 glVertex 0 , 0; 1417 glEnable GL_TEXTURE_2D;
1279 glVertex 0 , $s; 1418 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1280 glVertex $s, $s;
1281 glVertex $s, 0;
1282 glEnd;
1283 1419
1284 if ($self->{state}) { 1420 my $tex = $self->{state} ? $tex[1] : $tex[0];
1285 glBegin GL_LINES;
1286 glVertex 0 , 0;
1287 glVertex $s, $s;
1288 glVertex $s, 0;
1289 glVertex 0 , $s;
1290 glEnd;
1291 }
1292}
1293 1421
1294############################################################################# 1422 $tex->draw_quad (0, 0, $s, $s);
1295 1423
1424 glDisable GL_TEXTURE_2D;
1425 glDisable GL_BLEND;
1426}
1427
1428#############################################################################
1429
1296package CFClient::UI::Slider; 1430package CFClient::UI::VGauge;
1297 1431
1298use strict;
1299
1300use SDL::OpenGL;
1301
1302our @ISA = CFClient::UI::DrawBG::; 1432our @ISA = CFClient::UI::Base::;
1303 1433
1434use CFClient::OpenGL;
1435
1436my %tex = (
1437 food => [
1438 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1439 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1440 ],
1441 grace => [
1442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1443 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1444 ],
1445 hp => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1447 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1448 ],
1449 mana => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1452 ],
1453);
1454
1455# eg. VGauge->new (gauge => 'food'), default gauge: food
1304sub new { 1456sub new {
1305 my $class = shift; 1457 my $class = shift;
1306 1458
1459 my $self = $class->SUPER::new (
1460 gauge => 'food',
1461 @_
1462 );
1463
1464 $self->{aspect} = $tex{$self->{gauge}}[0]{w} / $tex{$self->{gauge}}[0]{h};
1465
1466 $self
1467}
1468
1469sub size_request {
1470 my ($self) = @_;
1471
1472 my $tex = $tex{$self->{gauge}}[0];
1473
1474 @$tex{qw(w h)}
1475}
1476
1477sub set_max {
1478 my ($self, $max) = @_;
1479
1480 $self->{max_val} = $max;
1481}
1482
1483sub set_value {
1484 my ($self, $val, $max) = @_;
1485
1486 $self->set_max ($max)
1487 if defined $max;
1488
1489 $max = $self->{max_val};
1490 $self->{val} = $val;
1491
1492 $self->update;
1493}
1494
1495sub _draw {
1496 my ($self) = @_;
1497
1498 my $tex = $tex{$self->{gauge}};
1499
1500 my ($w, $h) = ($self->{w}, $self->{h});
1501
1502 my $ycut = $self->{val} / ($self->{max_val} || 1);
1503 $ycut = 1 if $self->{val} > $self->{max_val};
1504
1505 my $t1 = $tex->[0];
1506 my $t2 = $tex->[1];
1507
1508 glEnable GL_BLEND;
1509 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1510 glEnable GL_TEXTURE_2D;
1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512
1513 my $h1 = $self->{h} - $ycut * $self->{h};
1514 my $h2 = $ycut * $self->{h};
1515
1516 my $yp = 0;
1517
1518 glBindTexture GL_TEXTURE_2D, $t1->{name};
1519 glBegin GL_QUADS;
1520 glTexCoord 0 , 0; glVertex 0 , $yp;
1521 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;
1522 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
1523 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;
1524 glEnd;
1525
1526 $yp += $h1;
1527
1528 glBindTexture GL_TEXTURE_2D, $t2->{name};
1529 glBegin GL_QUADS;
1530 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
1531 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;
1532 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1533 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
1534 glEnd;
1535
1536 glDisable GL_BLEND;
1537 glDisable GL_TEXTURE_2D;
1538}
1539
1540#############################################################################
1541
1542package CFClient::UI::Slider;
1543
1544use strict;
1545
1546use CFClient::OpenGL;
1547
1548our @ISA = CFClient::UI::DrawBG::;
1549
1550my @tex =
1551 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1552 qw(s1_slider.png s1_slider_bg.png);
1553
1554sub new {
1555 my $class = shift;
1556
1307 # range [value, low, high, page] 1557 # range [value, low, high, page]
1308 1558
1559 # TODO: 0-width page
1560 # TODO: req_w/h are wrong with vertical
1561 # TODO: calculations are off
1309 my $self = $class->SUPER::new ( 1562 my $self = $class->SUPER::new (
1310 fg => [1, 1, 1], 1563 fg => [1, 1, 1],
1311 active_fg => [0, 0, 0], 1564 active_fg => [0, 0, 0],
1312 range => [0, 0, 100, 10], 1565 range => [0, 0, 100, 10],
1313 req_w => 40, 1566 req_w => 20,
1314 req_h => 10, 1567 req_h => 20,
1315 vertical => 0, 1568 vertical => 0,
1569 can_hover => 1,
1570 inner_pad => 5,
1316 @_ 1571 @_
1317 ); 1572 );
1318 1573
1319 $self 1574 $self
1320} 1575}
… …
1341 if ($GRAB == $self) { 1596 if ($GRAB == $self) {
1342 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1597 my ($value, $lo, $hi, $page) = @{$self->{range}};
1343 1598
1344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1599 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1345 1600
1601 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1602 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1603
1604 $x -= $inner_pad_px; # substract the padding
1346 $x = $x * ($hi - $lo) / $w + $lo; 1605 $x = $x * ($hi - $lo) / $inner_w + $lo;
1347 $x = $lo if $x < $lo; 1606 $x = $lo if $x < $lo;
1348 $x = $hi - $page if $x > $hi - $page; 1607 $x = $hi - $page if $x > $hi - $page;
1349 $self->{range}[0] = $x; 1608 $self->{range}[0] = $x;
1350 1609
1351 $self->emit (changed => $x); 1610 $self->emit (changed => $x);
1352 $self->update; 1611 $self->update;
1353 } 1612 }
1613}
1614
1615# the inner_* stuff is for generating a padding for the slider handle,
1616# so that the handle doesn't leave the texture. This calculation isn't 100%
1617# correct propably, but it does the job for now
1618sub _calc_inner_pad_px {
1619 my ($self, $w) = @_;
1620 ($w / 100) * $self->{inner_pad} # % to pixels
1354} 1621}
1355 1622
1356sub _draw { 1623sub _draw {
1357 my ($self) = @_; 1624 my ($self) = @_;
1358 1625
… …
1372 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1639 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1640 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374 1641
1375 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1642 my ($value, $lo, $hi, $page) = @{$self->{range}};
1376 1643
1644 $hi = $value + 1 if $lo == $hi;
1645
1646 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1647 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1648
1377 $page = int $page * $w / ($hi - $lo); 1649 $page = int $page * $inner_w / ($hi - $lo);
1378 $value = int +($value - $lo) * $w / ($hi - $lo); 1650 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1379 1651
1380 $w -= $page; 1652 $w -= $page;
1381 $page &= ~1; 1653 $page &= ~1;
1382 glTranslate $page * 0.5, 0, 0; 1654 glTranslate $page * 0.5, 0, 0;
1383 $page ||= 2; 1655 $page ||= 2;
1384 1656
1385 glColor @$fg;
1386 glBegin GL_LINES;
1387 glVertex 0, 0; glVertex 0, $h;
1388 glVertex $w - 1, 0; glVertex $w - 1, $h;
1389 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390 glEnd;
1391
1392 my $knob_a = $value - $page * 0.5; 1657 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1393 my $knob_b = $value + $page * 0.5; 1658 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1394 1659
1395 glBegin GL_QUADS; 1660 glEnable GL_BLEND;
1396 glColor @$fg; 1661 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1397 glVertex $knob_a, 0; 1662 glEnable GL_TEXTURE_2D;
1398 glVertex $knob_a, $h; 1663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1399 glVertex $knob_b, $h;
1400 glVertex $knob_b, 0;
1401 1664
1402 if ($knob_a < $knob_b - 2) { 1665 # draw background
1403 glColor @$bg; 1666 $tex[1]->draw_quad (0, 0, $w, $h);
1404 glVertex $knob_a + 1, 1;
1405 glVertex $knob_a + 1, $h - 1;
1406 glVertex $knob_b - 1, $h - 1;
1407 glVertex $knob_b - 1, 1;
1408 }
1409 glEnd;
1410}
1411 1667
1412############################################################################# 1668 # draw handle
1669 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1413 1670
1671 glDisable GL_BLEND;
1672 glDisable GL_TEXTURE_2D;
1673}
1674
1675#############################################################################
1676
1414package CFClient::UI::MapWidget; 1677package CFClient::UI::TextView;
1415 1678
1416use strict;
1417
1418use List::Util qw(min max);
1419
1420use SDL;
1421use SDL::OpenGL;
1422
1423our @ISA = CFClient::UI::Base::; 1679our @ISA = CFClient::UI::HBox::;
1680
1681use CFClient::OpenGL;
1424 1682
1425sub new { 1683sub new {
1426 my $class = shift; 1684 my $class = shift;
1427 1685
1428 $class->SUPER::new ( 1686 my $self = $class->SUPER::new (
1429 z => -1, 1687 fontsize => 1,
1430 list => (glGenLists 1),
1431 @_ 1688 @_,
1689
1690 layout => (new CFClient::Layout),
1691 par => [],
1692 height => 0,
1693 children => [
1694 (new CFClient::UI::Empty expand => 1),
1695 (new CFClient::UI::Slider vertical => 1),
1696 ],
1432 ) 1697 );
1433}
1434 1698
1435sub key_down { 1699 $self->{children}[1]->connect (changed => sub {
1436 print "MAPKEYDOWN\n"; 1700 $self->update;
1437} 1701 });
1438 1702
1439sub key_up { 1703 $self
1440} 1704}
1441 1705
1442sub size_request { 1706sub set_fontsize {
1707 my ($self, $fontsize) = @_;
1708
1709 $self->{fontsize} = $fontsize;
1710 $self->reflow;
1711}
1712
1713sub text_height {
1714 my ($self, $text) = @_;
1715
1716 my $layout = $self->{layout};
1717
1718 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1719 $layout->set_width ($self->{w});
1720 $layout->set_text ($text);
1443 ( 1721
1444 1 + 32 * int $::WIDTH / 32, 1722 ($layout->size)[1]
1445 1 + 32 * int $::HEIGHT / 32, 1723}
1446 ) 1724
1725sub reflow {
1726 my ($self) = @_;
1727
1728 $self->{need_reflow}++;
1729 $self->update;
1730}
1731
1732sub size_allocate {
1733 my ($self, $w, $h) = @_;
1734
1735 $self->SUPER::size_allocate ($w, $h);
1736
1737 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1738 $self->{layout}->set_width ($self->{children}[0]{w});
1739
1740 $self->reflow;
1741}
1742
1743sub add_paragraph {
1744 my ($self, $color, $text) = @_;
1745
1746 #TODO: intelligently "reformat" paragraph
1747
1748 my $height = $self->text_height ($text);
1749
1750 $self->{height} += $height;
1751
1752 push @{$self->{par}}, [$height, $color, $text];
1753
1754 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1755 $self->{children}[1]->update;
1447} 1756}
1448 1757
1449sub update { 1758sub update {
1450 my ($self) = @_; 1759 my ($self) = @_;
1451 1760
1452 $self->{need_update} = 1;
1453 $self->SUPER::update; 1761 $self->SUPER::update;
1454}
1455 1762
1456sub draw { 1763 return unless $self->{h} > 0;
1457 my ($self) = @_;
1458 1764
1765 delete $self->{texture};
1766
1767 $ROOT->on_refresh ($self, sub {
1459 if (delete $self->{need_update}) { 1768 if (delete $self->{need_reflow}) {
1460 glNewList $self->{list}, GL_COMPILE; 1769 my $height = 0;
1461 1770
1462 my $mx = $::CONN->{mapx}; 1771 $height += $_->[0] = $self->text_height ($_->[2])
1463 my $my = $::CONN->{mapy}; 1772 for @{$self->{par}};
1464 1773
1465 my $map = $::CONN->{map}; 1774 $self->{height} = $height;
1466 1775
1467 my ($xofs, $yofs); 1776 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1468 1777
1469 my $sw = 1 + int $::WIDTH / 32; 1778 delete $self->{texture};
1470 my $sh = 1 + int $::HEIGHT / 32;
1471
1472 if ($::CONN->{mapw} > $sw) {
1473 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
1474 } else {
1475 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1476 } 1779 }
1477 1780
1478 if ($::CONN->{maph} > $sh) { 1781 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1479 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1782 glClearColor 0, 0, 0, 1;
1480 } else { 1783 glClear GL_COLOR_BUFFER_BIT;
1481 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1784
1785 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1787 glEnable GL_TEXTURE_2D;
1788 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1789
1790 my $top = int $self->{children}[1]{range}[0];
1791
1792 my $y0 = $top;
1793 my $y1 = $top + $self->{h};
1794
1795 my $y = 0;
1796
1797 my $layout = $self->{layout};
1798
1799 for my $par (@{$self->{par}}) {
1800 my $h = $par->[0];
1801
1802 if ($y0 < $y + $h && $y < $y1) {
1803 $layout->set_text ($par->[2]);
1804
1805 glColor @{ $par->[1] };
1806 my ($W, $H) = $layout->size;
1807 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1808 }
1809
1810 $y += $h;
1811 }
1812
1813 glDisable GL_TEXTURE_2D;
1814 glDisable GL_BLEND;
1482 } 1815 };
1816 });
1817}
1483 1818
1819sub _draw {
1820 my ($self) = @_;
1821
1822 if ($self->{texture}) {
1484 glEnable GL_TEXTURE_2D; 1823 glEnable GL_TEXTURE_2D;
1485 glEnable GL_BLEND;
1486 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1488 glColor 1, 1, 1, 1; 1825 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1489
1490 my $sw4 = ($sw + 3) & ~3;
1491 my $darkness = "\x00" x ($sw4 * $sh);
1492
1493 for my $x (0 .. $sw - 1) {
1494 my $row = $map->[$x + $xofs];
1495 for my $y (0 .. $sh - 1) {
1496
1497 my $cell = $row->[$y + $yofs]
1498 or next;
1499
1500 my $dark = $cell->[0];
1501 if ($dark < 0) {
1502 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1503 } else {
1504 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1505 }
1506
1507 for my $num (grep $_, @$cell[1,2,3]) {
1508 my $tex = $::CONN->{face}[$num]{texture} || next;
1509
1510 my ($w, $h) = @$tex{qw(w h)};
1511
1512 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1513 }
1514 }
1515 }
1516
1517# if (1) { # higher quality darkness
1518# $lighting =~ s/(.)/$1$1$1/gs;
1519# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1520#
1521# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1522#
1523# $lighting = $pb->get_pixels;
1524# $lighting =~ s/(.)../$1/gs;
1525# }
1526
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1528
1529 $darkness = new CFClient::Texture
1530 w => $sw4,
1531 h => $sh,
1532 data => $darkness,
1533 internalformat => GL_ALPHA,
1534 format => GL_ALPHA;
1535
1536 glColor 0.45, 0.45, 0.45, 1;
1537 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1538
1539 glDisable GL_TEXTURE_2D; 1826 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541
1542 glEndList;
1543 } 1827 }
1544 1828
1545 glCallList $self->{list}; 1829 $self->{children}[1]->draw;
1546 1830
1547 if ($FOCUS != $self) {
1548 glEnable GL_BLEND;
1549 glColor 0, 0, 1, 0.4;
1550 glBegin GL_QUADS;
1551 glVertex 0, 0;
1552 glVertex 0, $::HEIGHT;
1553 glVertex $::WIDTH, $::HEIGHT;
1554 glVertex $::WIDTH, 0;
1555 glEnd;
1556 glDisable GL_BLEND;
1557 }
1558}
1559
1560my %DIR = (
1561 SDLK_KP8, [1, "north"],
1562 SDLK_KP9, [2, "northeast"],
1563 SDLK_KP6, [3, "east"],
1564 SDLK_KP3, [4, "southeast"],
1565 SDLK_KP2, [5, "south"],
1566 SDLK_KP1, [6, "southwest"],
1567 SDLK_KP4, [7, "west"],
1568 SDLK_KP7, [8, "northwest"],
1569
1570 SDLK_UP, [1, "north"],
1571 SDLK_RIGHT, [3, "east"],
1572 SDLK_DOWN, [5, "south"],
1573 SDLK_LEFT, [7, "west"],
1574);
1575
1576sub key_down {
1577 my ($self, $ev) = @_;
1578
1579 my $mod = $ev->key_mod;
1580 my $sym = $ev->key_sym;
1581
1582 if ($sym == SDLK_KP5) {
1583 $::CONN->send ("command stay fire");
1584 } elsif ($sym == SDLK_a) {
1585 $::CONN->send ("command apply");
1586 } elsif (exists $DIR{$sym}) {
1587 if ($mod & KMOD_SHIFT) {
1588 $self->{shft}++;
1589 $::CONN->send ("command fire $DIR{$sym}[0]");
1590 } elsif ($mod & KMOD_CTRL) {
1591 $self->{ctrl}++;
1592 $::CONN->send ("command run $DIR{$sym}[0]");
1593 } else {
1594 $::CONN->send ("command $DIR{$sym}[1]");
1595 }
1596 }
1597}
1598
1599sub key_up {
1600 my ($self, $ev) = @_;
1601
1602 my $mod = $ev->key_mod;
1603 my $sym = $ev->key_sym;
1604
1605 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1606 $::CONN->send ("command fire_stop");
1607 }
1608 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1609 $::CONN->send ("command run_stop");
1610 }
1611} 1831}
1612 1832
1613############################################################################# 1833#############################################################################
1614 1834
1615package CFClient::UI::Animator; 1835package CFClient::UI::Animator;
1616 1836
1617use SDL::OpenGL; 1837use CFClient::OpenGL;
1618 1838
1619our @ISA = CFClient::UI::Bin::; 1839our @ISA = CFClient::UI::Bin::;
1620 1840
1621sub moveto { 1841sub moveto {
1622 my ($self, $x, $y) = @_; 1842 my ($self, $x, $y) = @_;
… …
1652 glPopMatrix; 1872 glPopMatrix;
1653} 1873}
1654 1874
1655############################################################################# 1875#############################################################################
1656 1876
1657package CFClient::UI::Toplevel; 1877package CFClient::UI::Flopper;
1878
1879our @ISA = CFClient::UI::Button::;
1880
1881sub new {
1882 my $class = shift;
1883
1884 my $self = $class->SUPER::new (
1885 state => 0,
1886 connect_activate => \&toggle_flopper,
1887 @_
1888 );
1889
1890 if ($self->{state}) {
1891 $self->{state} = 0;
1892 $self->toggle_flopper;
1893 }
1894
1895 $self
1896}
1897
1898sub toggle_flopper {
1899 my ($self) = @_;
1900
1901 # TODO: use animation
1902 if ($self->{state} = !$self->{state}) {
1903 $CFClient::UI::ROOT->add ($self->{other});
1904 $self->{other}->move ($self->coord2global (0, $self->{h}));
1905 $self->emit ("open");
1906 } else {
1907 $CFClient::UI::ROOT->remove ($self->{other});
1908 $self->emit ("close");
1909 }
1910
1911 $self->emit (changed => $self->{state});
1912}
1913
1914#############################################################################
1915
1916package CFClient::UI::Root;
1658 1917
1659our @ISA = CFClient::UI::Container::; 1918our @ISA = CFClient::UI::Container::;
1919
1920use CFClient::OpenGL;
1921
1922sub check_size {
1923 my ($self) = @_;
1924
1925 $self->configure (0, 0, $::WITH, $::HEIGHT);
1926}
1660 1927
1661sub size_request { 1928sub size_request {
1662 ($::WIDTH, $::HEIGHT) 1929 ($::WIDTH, $::HEIGHT)
1663} 1930}
1664 1931
1665sub size_allocate { 1932sub configure {
1666 my ($self, $x, $y, $w, $h) = @_; 1933 my ($self, $x, $y, $w, $h) = @_;
1667 1934
1668 $self->_size_allocate ($x, $y, $w, $h); 1935 $self->SUPER::configure ($x, $y, $w, $h);
1669 1936
1670 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1937 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1671 for @{$self->{children}}; 1938 for @{$self->{children}};
1672} 1939}
1673 1940
1674sub translate { 1941sub _topleft {
1675 my ($self, $x, $y) = @_; 1942 my ($self, $x, $y) = @_;
1676 1943
1677 ($x, $y) 1944 ($x, $y)
1678} 1945}
1679 1946
1680sub update { 1947sub update {
1681 my ($self) = @_; 1948 my ($self) = @_;
1682 1949
1683 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 1950 $self->check_size;
1684 ::refresh (); 1951 ::refresh ();
1685} 1952}
1686 1953
1687sub add { 1954sub add {
1688 my ($self, $widget) = @_; 1955 my ($self, $child) = @_;
1689 1956
1690 $self->SUPER::add ($widget); 1957 $self->SUPER::add ($child);
1958}
1691 1959
1692 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 1960sub on_refresh {
1961 my ($self, $id, $cb) = @_;
1962
1963 $self->{refresh_hook}{$id} = $cb;
1693} 1964}
1694 1965
1695sub draw { 1966sub draw {
1696 my ($self) = @_; 1967 my ($self) = @_;
1697 1968
1969 while (my $rcb = delete $self->{refresh_hook}) {
1970 $_->() for values %$rcb;
1971 }
1972
1973 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1974 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1975 glClear GL_COLOR_BUFFER_BIT;
1976
1977 glMatrixMode GL_PROJECTION;
1978 glLoadIdentity;
1979 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
1980 glMatrixMode GL_MODELVIEW;
1981 glLoadIdentity;
1982
1698 $self->_draw; 1983 $self->_draw;
1699} 1984}
1700 1985
1701############################################################################# 1986#############################################################################
1702 1987
1703package CFClient::UI; 1988package CFClient::UI;
1704 1989
1705$TOPLEVEL = new CFClient::UI::Toplevel; 1990$ROOT = new CFClient::UI::Root;
1706 1991
17071 19921
1708 1993

Diff Legend

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