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.97 by root, Fri Apr 14 02:03:11 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} = int $x; 151 $self->{x} = $x;
122 $self->{y} = int $y; 152 $self->{y} = $y;
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 }
123 158
124 return unless $self->{w} != $w || $self->{h} != $h; 159 return unless $self->{w} != $w || $self->{h} != $h;
125 160
126 $self->{w} = int $w; 161 $self->{w} = $w;
127 $self->{h} = int $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;
149 return unless $self->{can_focus}; 199 return unless $self->{can_focus};
150 200
151 my $focus = $FOCUS; $FOCUS = $self; 201 my $focus = $FOCUS; $FOCUS = $self;
202
203 $self->emit (focus_in => $focus);
204
152 $focus->update if $focus; 205 $focus->update if $focus;
153 $FOCUS->update; 206 $FOCUS->update;
154} 207}
155 208
156sub focus_out { 209sub focus_out {
157 my ($self) = @_; 210 my ($self) = @_;
158 211
159 return unless $FOCUS == $self; 212 return unless $FOCUS == $self;
160 213
161 my $focus = $FOCUS; undef $FOCUS; 214 my $focus = $FOCUS; undef $FOCUS;
215
216 $self->emit (focus_out => $focus);
217
162 $focus->update if $focus; #? 218 $focus->update if $focus; #?
163} 219}
164 220
165sub mouse_motion { } 221sub mouse_motion { }
166sub button_up { } 222sub button_up { }
… …
190 glPopMatrix; 246 glPopMatrix;
191 247
192 if ($self == $HOVER && $self->{can_hover}) { 248 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)}; 249 my ($x, $y) = @$self{qw(x y)};
194 250
195 glColor 0, 0, 1, 0.2; 251 glColor 1, 0.8, 0.5, 0.2;
196 glEnable GL_BLEND; 252 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 253 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198 glBegin GL_QUADS; 254 glBegin GL_QUADS;
199 glVertex $x , $y; 255 glVertex $x , $y;
200 glVertex $x + $self->{w}, $y; 256 glVertex $x + $self->{w}, $y;
… …
220 276
221 () 277 ()
222} 278}
223 279
224sub set_parent { 280sub set_parent {
225 my ($self, $par) = @_; 281 my ($self, $parent) = @_;
226 282
227 $self->{parent} = $par;
228 Scalar::Util::weaken $self->{parent}; 283 Scalar::Util::weaken ($self->{parent} = $parent);
229} 284}
230 285
231sub get_parent { 286sub check_size {
232 $_[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 }
233} 298}
234 299
235sub update { 300sub update {
236 my ($self) = @_; 301 my ($self) = @_;
237 302
… …
240} 305}
241 306
242sub connect { 307sub connect {
243 my ($self, $signal, $cb) = @_; 308 my ($self, $signal, $cb) = @_;
244 309
245 push @{ $self->{cb}{$signal} }, $cb; 310 push @{ $self->{signal_cb}{$signal} }, $cb;
246} 311}
247 312
248sub emit { 313sub emit {
249 my ($self, $signal, @args) = @_; 314 my ($self, $signal, @args) = @_;
250 315
316 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
251 $_->($self, @args) 317 $cb->($self, @args);
252 for @{$self->{cb}{$signal} || []}; 318 }
253} 319}
254 320
255sub DESTROY { 321sub DESTROY {
256 my ($self) = @_; 322 my ($self) = @_;
257 323
… …
263package CFClient::UI::DrawBG; 329package CFClient::UI::DrawBG;
264 330
265our @ISA = CFClient::UI::Base::; 331our @ISA = CFClient::UI::Base::;
266 332
267use strict; 333use strict;
268use SDL::OpenGL; 334use CFClient::OpenGL;
269 335
270sub new { 336sub new {
271 my $class = shift; 337 my $class = shift;
272 338
273 # range [value, low, high, page] 339 # range [value, low, high, page]
… …
326 392
327 $self 393 $self
328} 394}
329 395
330sub add { 396sub add {
331 my ($self, $chld) = @_; 397 my ($self, $child) = @_;
332 398
333 $chld->set_parent ($self); 399 $child->set_parent ($self);
400
401 use sort 'stable';
334 402
335 $self->{children} = [ 403 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 404 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 405 @{$self->{children}}, $child
338 ]; 406 ];
339 407
340 $self->{w} = $self->{h} = -1; 408 $child->check_size;
341 $self->update;
342} 409}
343 410
344sub remove { 411sub remove {
345 my ($self, $widget) = @_; 412 my ($self, $child) = @_;
346 413
414 delete $child->{parent};
415
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 416 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
348 417
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 418 $self->check_size;
350} 419}
351 420
352sub find_widget { 421sub find_widget {
353 my ($self, $x, $y) = @_; 422 my ($self, $x, $y) = @_;
354 423
… …
384 453
385 $class->SUPER::new (children => [$child], %arg) 454 $class->SUPER::new (children => [$child], %arg)
386} 455}
387 456
388sub add { 457sub add {
389 my ($self, $widget) = @_; 458 my ($self, $child) = @_;
390 459
391 $self->{children} = []; 460 $self->{children} = [];
392 461
393 $self->SUPER::add ($widget); 462 $self->SUPER::add ($child);
394} 463}
395 464
396sub remove { 465sub remove {
397 my ($self, $widget) = @_; 466 my ($self, $widget) = @_;
398 467
… …
407sub size_request { 476sub size_request {
408 $_[0]{children}[0]->size_request 477 $_[0]{children}[0]->size_request
409} 478}
410 479
411sub size_allocate { 480sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_; 481 my ($self, $w, $h) = @_;
413 482
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h); 483 $self->{children}[0]->configure (0, 0, $w, $h);
417} 484}
418 485
419############################################################################# 486#############################################################################
420 487
421package CFClient::UI::Window; 488package CFClient::UI::Window;
422 489
423our @ISA = CFClient::UI::Bin::; 490our @ISA = CFClient::UI::Bin::;
424 491
425use SDL::OpenGL; 492use CFClient::OpenGL;
426 493
427sub new { 494sub new {
428 my ($class, %arg) = @_; 495 my ($class, %arg) = @_;
429 496
430 my $self = $class->SUPER::new (%arg); 497 my $self = $class->SUPER::new (%arg);
… …
439} 506}
440 507
441sub render_chld { 508sub render_chld {
442 my ($self) = @_; 509 my ($self) = @_;
443 510
444 $self->{texture} = 511 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 512 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 513 glClear GL_COLOR_BUFFER_BIT;
447 ); 514 $self->child->draw;
515 };
448} 516}
449 517
450sub size_allocate { 518sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 519 my ($self, $w, $h) = @_;
452 520
453 $self->_size_allocate ($x, $y, $w, $h) or return;
454
455 $self->child->size_allocate (0, 0, $w, $h); 521 $self->child->configure (0, 0, $w, $h);
456 522
457 $self->render_chld; 523 $self->render_chld;
458} 524}
459 525
460sub _draw { 526sub _draw {
… …
476 glDisable GL_TEXTURE_2D; 542 glDisable GL_TEXTURE_2D;
477} 543}
478 544
479############################################################################# 545#############################################################################
480 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
481package CFClient::UI::Frame; 571package CFClient::UI::Frame;
482 572
483our @ISA = CFClient::UI::Bin::; 573our @ISA = CFClient::UI::Bin::;
484 574
485use SDL::OpenGL; 575use CFClient::OpenGL;
486 576
487sub size_request { 577sub size_request {
488 my ($self) = @_; 578 my ($self) = @_;
489 my $chld = $self->child 579 my $chld = $self->child
490 or return (0, 0); 580 or return (0, 0);
… …
495} 585}
496 586
497sub size_allocate { 587sub size_allocate {
498 my ($self, $x, $y, $w, $h) = @_; 588 my ($self, $x, $y, $w, $h) = @_;
499 589
500 $self->_size_allocate ($x, $y, $w, $h) or return;
501
502 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 590 $self->child->configure (2, 2, $w - 4, $h - 4);
503} 591}
504 592
505sub _draw { 593sub _draw {
506 my ($self) = @_; 594 my ($self) = @_;
507 595
… …
524 612
525package CFClient::UI::FancyFrame; 613package CFClient::UI::FancyFrame;
526 614
527our @ISA = CFClient::UI::Bin::; 615our @ISA = CFClient::UI::Bin::;
528 616
529use SDL::OpenGL; 617use CFClient::OpenGL;
530 618
531my @tex = 619my @tex =
532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 620 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
533 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);
534 622
… …
538 # TODO: user_x, user_y, overwrite moveto? 626 # TODO: user_x, user_y, overwrite moveto?
539 627
540 $class->SUPER::new ( 628 $class->SUPER::new (
541 bg => [1, 1, 1, 1], 629 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1], 630 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8, 631 border => 0.8,
544 @_ 632 @_
545 ) 633 )
546} 634}
547 635
636sub border {
637 int $_[0]{border} * $::FONTSIZE
638}
639
548sub size_request { 640sub size_request {
549 my ($self) = @_; 641 my ($self) = @_;
550 642
551 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};
552 644
553 my ($w, $h) = $self->SUPER::size_request; 645 my ($w, $h) = $self->SUPER::size_request;
554 646
555 ( 647 (
556 $w + $self->{border} * 2, 648 $w + $self->border * 2,
557 $h + $self->{border} * 2, 649 $h + $self->border * 2,
558 ) 650 )
559} 651}
560 652
561sub size_allocate { 653sub size_allocate {
562 my ($self, $x, $y, $w, $h) = @_; 654 my ($self, $w, $h) = @_;
563 655
564 $self->_size_allocate ($x, $y, $w, $h) or return;
565
566 $h -= List::Util::max 0, $self->{border} * 2; 656 $h -= List::Util::max 0, $self->border * 2;
567 $w -= List::Util::max 0, $self->{border} * 2; 657 $w -= List::Util::max 0, $self->border * 2;
568 658
569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 659 $self->child->configure ($self->border, $self->border, $w, $h);
570} 660}
571 661
572sub button_down { 662sub button_down {
573 my ($self, $ev, $x, $y) = @_; 663 my ($self, $ev, $x, $y) = @_;
574 664
665 my $border = $self->border;
666
575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 667 if ($x < $self->{w} && $x >= $self->{w} - $border
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 668 && $y < $self->{h} && $y >= $self->{h} - $border) {
577 669
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 670 my ($ox, $oy) = ($ev->{x}, $ev->{y});
579 my ($bw, $bh) = ($self->{w}, $self->{h}); 671 my ($bw, $bh) = ($self->{w}, $self->{h});
580 672
581 $self->{motion} = sub { 673 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_; 674 my ($ev, $x, $y) = @_;
583 675
584 ($x, $y) = ($ev->motion_x, $ev->motion_y); 676 ($x, $y) = ($ev->{x}, $ev->{y});
585 677
586 $self->{user_w} = $bw + $x - $ox; 678 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy; 679 $self->{user_h} = $bh + $y - $oy;
588 $self->update; 680 $self->check_size;
589 }; 681 };
590 682
591 } elsif ($x >= 0 && $x < $self->{w} 683 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) { 684 && $y >= 0 && $y < $border) {
593 685
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 686 my ($ox, $oy) = ($ev->{x}, $ev->{y});
595 my ($bx, $by) = ($self->{x}, $self->{y}); 687 my ($bx, $by) = ($self->{x}, $self->{y});
596 688
597 $self->{motion} = sub { 689 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_; 690 my ($ev, $x, $y) = @_;
599 691
600 ($x, $y) = ($ev->motion_x, $ev->motion_y); 692 ($x, $y) = ($ev->{x}, $ev->{y});
601 693
602 $self->move ($bx + $x - $ox, $by + $y - $oy); 694 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update; 695 $self->update;
604 }; 696 };
605 } 697 }
… …
626 glEnable GL_BLEND; 718 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 719 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
628 glEnable GL_TEXTURE_2D; 720 glEnable GL_TEXTURE_2D;
629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
630 722
723 my $border = $self->border;
724
631 glColor @{ $self->{border_bg} }; 725 glColor @{ $self->{border_bg} };
632 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 726 $tex[1]->draw_quad (0, 0, $w, $border);
633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 727 $tex[3]->draw_quad (0, $border, $border, $ch);
634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 728 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 729 $tex[4]->draw_quad (0, $h - $border, $w, $border);
636 730
637 my $bg = $tex[0]; 731 my $bg = $tex[0];
638 732
639 # TODO: repeat texture not scale 733 # TODO: repeat texture not scale
640 my $rep_x = $cw / $bg->{w}; 734 my $rep_x = $cw / $bg->{w};
641 my $rep_y = $ch / $bg->{h}; 735 my $rep_y = $ch / $bg->{h};
642 736
643 glColor @{ $self->{bg} }; 737 glColor @{ $self->{bg} };
738
739 $bg->{s} = $rep_x;
740 $bg->{t} = $rep_y;
741 $bg->{wrap_mode} = 1;
644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 742 $bg->draw_quad ($border, $border, $cw, $ch);
645 743
646 glDisable GL_TEXTURE_2D; 744 glDisable GL_TEXTURE_2D;
647 glDisable GL_BLEND; 745 glDisable GL_BLEND;
648 746
649 $self->child->draw; 747 $self->child->draw;
… …
655 753
656our @ISA = CFClient::UI::Base::; 754our @ISA = CFClient::UI::Base::;
657 755
658use List::Util qw(max sum); 756use List::Util qw(max sum);
659 757
660use SDL::OpenGL; 758use CFClient::OpenGL;
661 759
662sub new { 760sub new {
663 my $class = shift; 761 my $class = shift;
664 762
665 $class->SUPER::new ( 763 $class->SUPER::new (
… …
667 @_ 765 @_
668 ) 766 )
669} 767}
670 768
671sub add { 769sub add {
672 my ($self, $x, $y, $chld) = @_; 770 my ($self, $x, $y, $child) = @_;
673 771
772 $child->set_parent ($self);
674 $self->{children}[$y][$x] = $chld; 773 $self->{children}[$y][$x] = $child;
675 $chld->set_parent ($self);
676 774
677 $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};
678 $self->update; 783 $self->update;
679} 784}
680 785
681sub get_wh { 786sub get_wh {
682 my ($self) = @_; 787 my ($self) = @_;
… …
710 (sum @$hs), 815 (sum @$hs),
711 ) 816 )
712} 817}
713 818
714sub size_allocate { 819sub size_allocate {
715 my ($self, $x, $y, $w, $h) = @_; 820 my ($self, $w, $h) = @_;
716
717 $self->_size_allocate ($x, $y, $w, $h) or return;
718 821
719 my ($ws, $hs) = $self->get_wh; 822 my ($ws, $hs) = $self->get_wh;
720 823
721 my $req_w = sum @$ws; 824 my $req_w = sum @$ws;
722 my $req_h = sum @$hs; 825 my $req_h = sum @$hs;
… …
727 my $col_expand = (sum @col_expand) || 1; 830 my $col_expand = (sum @col_expand) || 1;
728 831
729 # linearly scale sizes 832 # linearly scale sizes
730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 833 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731 $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;
732 838
733 my $y; 839 my $y;
734 840
735 for my $r (0 .. $#{$self->{children}}) { 841 for my $r (0 .. $#{$self->{children}}) {
736 my $row = $self->{children}[$r] 842 my $row = $self->{children}[$r]
… …
741 847
742 for my $c (0 .. $#$row) { 848 for my $c (0 .. $#$row) {
743 my $col_w = $ws->[$c]; 849 my $col_w = $ws->[$c];
744 850
745 if (my $widget = $row->[$c]) { 851 if (my $widget = $row->[$c]) {
746 $widget->size_allocate ($x, $y, $col_w, $row_h); 852 $widget->configure ($x, $y, $col_w, $row_h);
747 } 853 }
748 854
749 $x += $col_w; 855 $x += $col_w;
750 } 856 }
751 857
… …
796 (List::Util::max map $_->[1], @alloc), 902 (List::Util::max map $_->[1], @alloc),
797 ) 903 )
798} 904}
799 905
800sub size_allocate { 906sub size_allocate {
801 my ($self, $x, $y, $w, $h) = @_; 907 my ($self, $w, $h) = @_;
802
803 $self->_size_allocate ($x, $y, $w, $h);
804 908
805 ($h, $w) = ($w, $h); 909 ($h, $w) = ($w, $h);
806 910
807 my $children = $self->{children}; 911 my $children = $self->{children};
808 912
… …
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 928 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h; 929 $h[$_] = $alloc_h;
826 } 930 }
827 } 931 }
828 932
933 CFClient::UI::harmonize \@h;
934
829 my $y = 0; 935 my $y = 0;
830 for (0 .. $#$children) { 936 for (0 .. $#$children) {
831 my $child = $children->[$_]; 937 my $child = $children->[$_];
832 my $h = $h[$_]; 938 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 939 $child->configure ($y, 0, $h, $w);
834 940
835 $y += $h; 941 $y += $h;
836 } 942 }
943
944 1
837} 945}
838 946
839############################################################################# 947#############################################################################
840 948
841package CFClient::UI::VBox; 949package CFClient::UI::VBox;
… …
854 (List::Util::sum map $_->[1], @alloc), 962 (List::Util::sum map $_->[1], @alloc),
855 ) 963 )
856} 964}
857 965
858sub size_allocate { 966sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 967 my ($self, $w, $h) = @_;
860
861 $self->_size_allocate ($x, $y, $w, $h);
862 968
863 my $children = $self->{children}; 969 my $children = $self->{children};
864 970
865 my @h = map +($_->size_request)[1], @$children; 971 my @h = map +($_->size_request)[1], @$children;
866 972
… …
878 984
879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 985 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
880 } 986 }
881 } 987 }
882 988
989 CFClient::UI::harmonize \@h;
990
883 my $y = 0; 991 my $y = 0;
884 for (0 .. $#$children) { 992 for (0 .. $#$children) {
885 my $child = $children->[$_]; 993 my $child = $children->[$_];
886 my $h = $h[$_]; 994 my $h = $h[$_];
887 $child->size_allocate (0, $y, $w, $h); 995 $child->configure (0, $y, $w, $h);
888 996
889 $y += $h; 997 $y += $h;
890 } 998 }
999
1000 1
891} 1001}
892 1002
893############################################################################# 1003#############################################################################
894 1004
895package CFClient::UI::Label; 1005package CFClient::UI::Label;
896 1006
897our @ISA = CFClient::UI::Base::; 1007our @ISA = CFClient::UI::Base::;
898 1008
899use SDL::OpenGL; 1009use CFClient::OpenGL;
900 1010
901sub new { 1011sub new {
902 my ($class, %arg) = @_; 1012 my ($class, %arg) = @_;
903 1013
904 my $self = $class->SUPER::new ( 1014 my $self = $class->SUPER::new (
905 fg => [1, 1, 1], 1015 fg => [1, 1, 1],
906 height => $::FONTSIZE, 1016 fontsize => 1,
907 text => "", 1017 text => "",
908 align => -1, 1018 align => -1,
1019 valign => -1,
909 padding => 2, 1020 padding => 2,
910 layout => new CFClient::Layout, 1021 layout => new CFClient::Layout,
911 %arg 1022 %arg
912 ); 1023 );
913 1024
914 $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};
915 1029
916 $self 1030 $self
917} 1031}
918 1032
919sub escape_text { 1033sub escape_text {
… …
927} 1041}
928 1042
929sub set_text { 1043sub set_text {
930 my ($self, $text) = @_; 1044 my ($self, $text) = @_;
931 1045
932 $self->{text} = $text;
933 $self->{layout}->set_markup ($text); 1046 $self->{layout}->set_text ($text);
934 1047
935 delete $self->{texture}; 1048 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
937 $self->update; 1049 $self->update;
938} 1050}
939 1051
940sub get_text { 1052sub set_markup {
941 my ($self, $text) = @_; 1053 my ($self, $markup) = @_;
942 1054
943 $self->{text} 1055 $self->{layout}->set_markup ($markup);
1056
1057 delete $self->{texture};
1058 $self->update;
944} 1059}
945 1060
946sub size_request { 1061sub size_request {
947 my ($self) = @_; 1062 my ($self) = @_;
948 1063
949 $self->{layout}->set_width; 1064 $self->{layout}->set_width;
950 $self->{layout}->set_height ($self->{height}); 1065 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1066
951 my ($w, $h) = $self->{layout}->size; 1067 my ($w, $h) = $self->{layout}->size;
952 1068
953 ( 1069 (
954 $w + $self->{padding} * 2, 1070 $w + $self->{padding} * 2,
955 $h + $self->{padding} * 2, 1071 $h + $self->{padding} * 2,
956 ) 1072 )
957} 1073}
958 1074
959sub size_allocate { 1075sub size_allocate {
960 my ($self, $x, $y, $w, $h) = @_; 1076 my ($self, $w, $h) = @_;
961
962 $self->_size_allocate ($x, $y, $w, $h) or return;
963 1077
964 delete $self->{texture}; 1078 delete $self->{texture};
965}
966
967sub update {
968 my ($self) = @_;
969
970 delete $self->{texture};
971 $self->SUPER::update;
972} 1079}
973 1080
974sub _draw { 1081sub _draw {
975 my ($self) = @_; 1082 my ($self) = @_;
976 1083
977 my $tex = $self->{texture} ||= do { 1084 my $tex = $self->{texture} ||= do {
978 $self->{layout}->set_width ($self->{w}); 1085 $self->{layout}->set_width ($self->{w});
979 $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);
980 new_from_layout CFClient::Texture $self->{layout} 1087 new_from_layout CFClient::Texture $self->{layout}
981 }; 1088 };
982 1089
983 glEnable GL_BLEND; 1090 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1091 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D; 1092 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1093 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987 1094
988 glColor @{$self->{fg}}; 1095 glColor @{$self->{fg}};
989 1096
990 my $x = 1097 $self->{ox} = int (
991 $self->{align} < 0 ? $self->{padding} 1098 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1099 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5; 1100 : ($self->{w} - $tex->{w}) * 0.5
1101 );
994 1102
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1103 $self->{oy} = int (
996 $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});
997 1110
998 glDisable GL_TEXTURE_2D; 1111 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND; 1112 glDisable GL_BLEND;
1000} 1113}
1001 1114
1002############################################################################# 1115#############################################################################
1003 1116
1004package CFClient::UI::Entry; 1117package CFClient::UI::EntryBase;
1005 1118
1006our @ISA = CFClient::UI::Label::; 1119our @ISA = CFClient::UI::Label::;
1007 1120
1008use SDL; 1121use CFClient::OpenGL;
1009use SDL::OpenGL;
1010 1122
1011sub new { 1123sub new {
1012 my $class = shift; 1124 my $class = shift;
1013 1125
1014 $class->SUPER::new ( 1126 $class->SUPER::new (
… …
1016 bg => [0, 0, 0, 0.2], 1128 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1, 0.5], 1129 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0], 1130 active_fg => [0, 0, 0],
1019 can_hover => 1, 1131 can_hover => 1,
1020 can_focus => 1, 1132 can_focus => 1,
1133 valign => 0,
1021 @_ 1134 @_
1022 ) 1135 )
1023} 1136}
1024 1137
1025sub _set_text { 1138sub _set_text {
1026 my ($self, $text) = @_; 1139 my ($self, $text) = @_;
1027 1140
1141 delete $self->{cur_h};
1142
1143 return if $self->{text} eq $text;
1144
1145 delete $self->{texture};
1146
1028 $self->{last_activity} = $::NOW; 1147 $self->{last_activity} = $::NOW;
1029
1030 $self->{text} = $text; 1148 $self->{text} = $text;
1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1033 1149
1034 $text =~ s/./*/g if $self->{hidden}; 1150 $text =~ s/./*/g if $self->{hidden};
1151 $self->{layout}->set_text ("$text ");
1035 1152
1036 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1153 $self->emit (changed => $self->{text});
1154}
1037 1155
1038 $text = substr $text, 0, $self->{cursor}; 1156sub get_text {
1039 utf8::encode $text; 1157 $_[0]{text}
1040
1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1042} 1158}
1043 1159
1044sub size_request { 1160sub size_request {
1045 my ($self) = @_; 1161 my ($self) = @_;
1046 1162
… …
1048 1164
1049 ($w + 1, $h) # add 1 for cursor 1165 ($w + 1, $h) # add 1 for cursor
1050} 1166}
1051 1167
1052sub size_allocate { 1168sub size_allocate {
1053 my ($self, $x, $y, $w, $h) = @_; 1169 my ($self, $w, $h) = @_;
1054
1055 $self->SUPER::size_allocate ($x, $y, $w, $h);
1056 1170
1057 $self->_set_text ($self->{text}); 1171 $self->_set_text ($self->{text});
1058} 1172}
1059 1173
1060sub set_text { 1174sub set_text {
… …
1066} 1180}
1067 1181
1068sub key_down { 1182sub key_down {
1069 my ($self, $ev) = @_; 1183 my ($self, $ev) = @_;
1070 1184
1071 my $mod = $ev->key_mod; 1185 my $mod = $ev->{mod};
1072 my $sym = $ev->key_sym; 1186 my $sym = $ev->{sym};
1073
1074 my $uni = $ev->key_unicode; 1187 my $uni = $ev->{unicode};
1075 1188
1076 my $text = $self->get_text; 1189 my $text = $self->get_text;
1077 1190
1078 if ($sym == SDLK_BACKSPACE) { 1191 if ($sym == 8) {
1079 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1192 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1080 } elsif ($sym == SDLK_DELETE) { 1193 } elsif ($sym == 127) {
1081 substr $text, $self->{cursor}, 1, ""; 1194 substr $text, $self->{cursor}, 1, "";
1082 } elsif ($sym == SDLK_LEFT) { 1195 } elsif ($sym == CFClient::SDLK_LEFT) {
1083 --$self->{cursor} if $self->{cursor}; 1196 --$self->{cursor} if $self->{cursor};
1084 } elsif ($sym == SDLK_RIGHT) { 1197 } elsif ($sym == CFClient::SDLK_RIGHT) {
1085 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1198 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) { 1199 } elsif ($sym == CFClient::SDLK_HOME) {
1087 $self->{cursor} = 0; 1200 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) { 1201 } elsif ($sym == CFClient::SDLK_END) {
1089 $self->{cursor} = length $text; 1202 $self->{cursor} = length $text;
1203 } elsif ($sym == 27) {
1204 $self->emit ('escape');
1090 } elsif ($uni) { 1205 } elsif ($uni) {
1091 substr $text, $self->{cursor}++, 0, chr $uni; 1206 substr $text, $self->{cursor}++, 0, chr $uni;
1092 } 1207 }
1093 1208
1094 $self->_set_text ($text); 1209 $self->_set_text ($text);
… …
1148 1263
1149 $self->SUPER::_draw; 1264 $self->SUPER::_draw;
1150 1265
1151 #TODO: force update every cursor change :( 1266 #TODO: force update every cursor change :(
1152 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
1153 glColor @{$self->{fg}}; 1276 glColor @{$self->{fg}};
1154 glBegin GL_LINES; 1277 glBegin GL_LINES;
1155 glVertex $self->{cur_x}, $self->{cur_y};
1156 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};
1157 glEnd; 1280 glEnd;
1158 } 1281 }
1159} 1282}
1160 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
1161############################################################################# 1305#############################################################################
1162 1306
1163package CFClient::UI::Button; 1307package CFClient::UI::Button;
1164 1308
1165our @ISA = CFClient::UI::Label::; 1309our @ISA = CFClient::UI::Label::;
1166 1310
1167use SDL; 1311use CFClient::OpenGL;
1168use SDL::OpenGL;
1169 1312
1170my @tex = 1313my @tex =
1171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1314 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1172 qw(b1_button_active.png); 1315 qw(b1_button_active.png);
1173 1316
… …
1176 1319
1177 $class->SUPER::new ( 1320 $class->SUPER::new (
1178 padding => 4, 1321 padding => 4,
1179 fg => [1, 1, 1], 1322 fg => [1, 1, 1],
1180 bg => [1, 1, 1, 0.2], 1323 bg => [1, 1, 1, 0.2],
1181 active_fg => [1, 1, 0], 1324 active_fg => [0, 0, 1],
1182 can_hover => 1, 1325 can_hover => 1,
1326 align => 0,
1327 valign => 0,
1183 @_ 1328 @_
1184 ) 1329 )
1185} 1330}
1186 1331
1187sub button_up { 1332sub button_up {
… …
1195 1340
1196sub _draw { 1341sub _draw {
1197 my ($self) = @_; 1342 my ($self) = @_;
1198 1343
1199 local $self->{fg} = $self->{fg}; 1344 local $self->{fg} = $self->{fg};
1200 my $tex = $tex[0];
1201
1202 glEnable GL_BLEND;
1203 glEnable GL_TEXTURE_2D;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 1345
1206 if ($GRAB == $self) { 1346 if ($GRAB == $self) {
1207 $self->{fg} = $self->{active_fg}; 1347 $self->{fg} = $self->{active_fg};
1208 } 1348 }
1209 1349
1210 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;
1211 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;
1212 1355
1213 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1356 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1214 1357
1215 glDisable GL_TEXTURE_2D; 1358 glDisable GL_TEXTURE_2D;
1216 glDisable GL_BLEND; 1359 glDisable GL_BLEND;
1217 1360
1218 $self->SUPER::_draw; 1361 $self->SUPER::_draw;
… …
1222 1365
1223package CFClient::UI::CheckBox; 1366package CFClient::UI::CheckBox;
1224 1367
1225our @ISA = CFClient::UI::DrawBG::; 1368our @ISA = CFClient::UI::DrawBG::;
1226 1369
1227use SDL; 1370my @tex =
1228use 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;
1229 1375
1230sub new { 1376sub new {
1231 my $class = shift; 1377 my $class = shift;
1232 1378
1233 $class->SUPER::new ( 1379 $class->SUPER::new (
… …
1244 my ($self) = @_; 1390 my ($self) = @_;
1245 1391
1246 ($self->{padding} * 2 + 6) x 2 1392 ($self->{padding} * 2 + 6) x 2
1247} 1393}
1248 1394
1249sub size_allocate {
1250 my ($self, $x, $y, $w, $h) = @_;
1251
1252 $self->_size_allocate ($x, $y, $w, $h);
1253}
1254
1255sub button_down { 1395sub button_down {
1256 my ($self, $ev, $x, $y) = @_; 1396 my ($self, $ev, $x, $y) = @_;
1257 1397
1258 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1398 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1259 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1399 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1268 $self->SUPER::_draw; 1408 $self->SUPER::_draw;
1269 1409
1270 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1410 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1271 1411
1272 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;
1413
1414 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1415
1416 glEnable GL_BLEND;
1417 glEnable GL_TEXTURE_2D;
1418 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1419
1420 my $tex = $self->{state} ? $tex[1] : $tex[0];
1421
1422 $tex->draw_quad (0, 0, $s, $s);
1423
1424 glDisable GL_TEXTURE_2D;
1425 glDisable GL_BLEND;
1426}
1427
1428#############################################################################
1429
1430package CFClient::UI::VGauge;
1431
1432our @ISA = CFClient::UI::Base::;
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
1456sub new {
1457 my $class = shift;
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];
1273 1473
1274 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1474 @$tex{qw(w h)}
1475}
1275 1476
1276 glBegin GL_LINE_LOOP; 1477sub set_max {
1277 glVertex 0 , 0; 1478 my ($self, $max) = @_;
1278 glVertex 0 , $s; 1479
1279 glVertex $s, $s; 1480 $self->{max_val} = $max;
1280 glVertex $s, 0; 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;
1281 glEnd; 1524 glEnd;
1282 1525
1283 if ($self->{state}) { 1526 $yp += $h1;
1284 glBegin GL_LINES; 1527
1285 glVertex 0 , 0; 1528 glBindTexture GL_TEXTURE_2D, $t2->{name};
1286 glVertex $s, $s; 1529 glBegin GL_QUADS;
1287 glVertex $s, 0; 1530 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
1288 glVertex 0 , $s; 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;
1289 glEnd; 1534 glEnd;
1290 } 1535
1536 glDisable GL_BLEND;
1537 glDisable GL_TEXTURE_2D;
1291} 1538}
1292 1539
1293############################################################################# 1540#############################################################################
1294 1541
1295package CFClient::UI::Slider; 1542package CFClient::UI::Slider;
1296 1543
1297use strict; 1544use strict;
1298 1545
1299use SDL::OpenGL; 1546use CFClient::OpenGL;
1300 1547
1301our @ISA = CFClient::UI::DrawBG::; 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);
1302 1553
1303sub new { 1554sub new {
1304 my $class = shift; 1555 my $class = shift;
1305 1556
1306 # range [value, low, high, page] 1557 # range [value, low, high, page]
… …
1310 # TODO: calculations are off 1561 # TODO: calculations are off
1311 my $self = $class->SUPER::new ( 1562 my $self = $class->SUPER::new (
1312 fg => [1, 1, 1], 1563 fg => [1, 1, 1],
1313 active_fg => [0, 0, 0], 1564 active_fg => [0, 0, 0],
1314 range => [0, 0, 100, 10], 1565 range => [0, 0, 100, 10],
1315 req_w => 40, 1566 req_w => 20,
1316 req_h => 13, 1567 req_h => 20,
1317 vertical => 0, 1568 vertical => 0,
1318 can_hover => 1, 1569 can_hover => 1,
1570 inner_pad => 5,
1319 @_ 1571 @_
1320 ); 1572 );
1321 1573
1322 $self 1574 $self
1323} 1575}
… …
1344 if ($GRAB == $self) { 1596 if ($GRAB == $self) {
1345 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1597 my ($value, $lo, $hi, $page) = @{$self->{range}};
1346 1598
1347 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1599 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1348 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
1349 $x = $x * ($hi - $lo) / $w + $lo; 1605 $x = $x * ($hi - $lo) / $inner_w + $lo;
1350 $x = $lo if $x < $lo; 1606 $x = $lo if $x < $lo;
1351 $x = $hi - $page if $x > $hi - $page; 1607 $x = $hi - $page if $x > $hi - $page;
1352 $self->{range}[0] = $x; 1608 $self->{range}[0] = $x;
1353 1609
1354 $self->emit (changed => $x); 1610 $self->emit (changed => $x);
1355 $self->update; 1611 $self->update;
1356 } 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
1357} 1621}
1358 1622
1359sub _draw { 1623sub _draw {
1360 my ($self) = @_; 1624 my ($self) = @_;
1361 1625
… …
1375 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1639 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1376 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1640 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1377 1641
1378 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1642 my ($value, $lo, $hi, $page) = @{$self->{range}};
1379 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
1380 $page = int $page * $w / ($hi - $lo); 1649 $page = int $page * $inner_w / ($hi - $lo);
1381 $value = int +($value - $lo) * $w / ($hi - $lo); 1650 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1382 1651
1383 $w -= $page; 1652 $w -= $page;
1384 $page &= ~1; 1653 $page &= ~1;
1385 glTranslate $page * 0.5, 0, 0; 1654 glTranslate $page * 0.5, 0, 0;
1386 $page ||= 2; 1655 $page ||= 2;
1387 1656
1388 glColor @$fg;
1389 glBegin GL_LINES;
1390 glVertex 0, 0; glVertex 0, $h;
1391 glVertex $w - 1, 0; glVertex $w - 1, $h;
1392 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1393 glEnd;
1394
1395 my $knob_a = $value - $page * 0.5; 1657 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1396 my $knob_b = $value + $page * 0.5; 1658 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1397 1659
1398 glBegin GL_QUADS; 1660 glEnable GL_BLEND;
1399 glColor @$fg; 1661 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1400 glVertex $knob_a, 0; 1662 glEnable GL_TEXTURE_2D;
1401 glVertex $knob_a, $h; 1663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1402 glVertex $knob_b, $h;
1403 glVertex $knob_b, 0;
1404 1664
1405 if ($knob_a < $knob_b - 2) { 1665 # draw background
1406 glColor @$bg; 1666 $tex[1]->draw_quad (0, 0, $w, $h);
1407 glVertex $knob_a + 1, 1; 1667
1408 glVertex $knob_a + 1, $h - 1; 1668 # draw handle
1409 glVertex $knob_b - 1, $h - 1; 1669 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1410 glVertex $knob_b - 1, 1; 1670
1411 } 1671 glDisable GL_BLEND;
1412 glEnd; 1672 glDisable GL_TEXTURE_2D;
1413} 1673}
1414 1674
1415############################################################################# 1675#############################################################################
1416 1676
1417package CFClient::UI::TextView; 1677package CFClient::UI::TextView;
1418 1678
1419our @ISA = CFClient::UI::HBox::; 1679our @ISA = CFClient::UI::HBox::;
1420 1680
1421use SDL::OpenGL; 1681use CFClient::OpenGL;
1422 1682
1423sub new { 1683sub new {
1424 my $class = shift; 1684 my $class = shift;
1425 1685
1426 my $self = $class->SUPER::new ( 1686 my $self = $class->SUPER::new (
1687 fontsize => 1,
1688 @_,
1689
1690 layout => (new CFClient::Layout),
1427 par => [], 1691 par => [],
1428 @_, 1692 height => 0,
1429 children => [ 1693 children => [
1430 (new CFClient::UI::Empty expand => 1), 1694 (new CFClient::UI::Empty expand => 1),
1431 (new CFClient::UI::Slider vertical => 1), 1695 (new CFClient::UI::Slider vertical => 1),
1432 ], 1696 ],
1433 ); 1697 );
1434 1698
1699 $self->{children}[1]->connect (changed => sub {
1700 $self->update;
1701 });
1702
1435 $self 1703 $self
1704}
1705
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);
1721
1722 ($layout->size)[1]
1723}
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;
1436} 1741}
1437 1742
1438sub add_paragraph { 1743sub add_paragraph {
1439 my ($self, $color, $text) = @_; 1744 my ($self, $color, $text) = @_;
1440 1745
1746 #TODO: intelligently "reformat" paragraph
1747
1748 my $height = $self->text_height ($text);
1749
1750 $self->{height} += $height;
1751
1441 push @{$self->{par}}, [$color, $text]; 1752 push @{$self->{par}}, [$height, $color, $text];
1442 my $count = scalar @{$self->{par}}; 1753
1443 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 1754 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1444 $self->{children}[1]->update; 1755 $self->{children}[1]->update;
1445} 1756}
1446 1757
1758sub update {
1759 my ($self) = @_;
1760
1761 $self->SUPER::update;
1762
1763 return unless $self->{h} > 0;
1764
1765 delete $self->{texture};
1766
1767 $ROOT->on_refresh ($self, sub {
1768 if (delete $self->{need_reflow}) {
1769 my $height = 0;
1770
1771 $height += $_->[0] = $self->text_height ($_->[2])
1772 for @{$self->{par}};
1773
1774 $self->{height} = $height;
1775
1776 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1777
1778 delete $self->{texture};
1779 }
1780
1781 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1782 glClearColor 0, 0, 0, 1;
1783 glClear GL_COLOR_BUFFER_BIT;
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;
1815 };
1816 });
1817}
1818
1447sub _draw { 1819sub _draw {
1448 my ($self) = @_; 1820 my ($self) = @_;
1449 1821
1450 my $par = $self->{par}; 1822 if ($self->{texture}) {
1451
1452 my $bottom = (scalar @$par) - 1;
1453
1454 my $w = $self->{children}[0]{w};
1455 my $y = $self->{h};
1456
1457 glEnable GL_BLEND;
1458 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1459 glEnable GL_TEXTURE_2D; 1823 glEnable GL_TEXTURE_2D;
1460 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1461 1825 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1462 # TODO: everything!
1463 while ($y > 0 && $bottom >= 0) {
1464 my $par = $par->[$bottom--];
1465
1466 my $layout = new CFClient::Layout;
1467
1468 $layout->set_height ($::FONTSIZE);
1469 $layout->set_width ($w);
1470 $layout->set_text ($par->[1]);
1471 my $tex = new_from_layout CFClient::Texture $layout;
1472 $y -= $tex->{h};
1473
1474 glColor @{ $par->[0] };
1475 $tex->draw_quad (0, $y);
1476 }
1477
1478 glDisable GL_TEXTURE_2D; 1826 glDisable GL_TEXTURE_2D;
1479 glDisable GL_BLEND;
1480}
1481
1482#############################################################################
1483
1484package CFClient::UI::MapWidget;
1485
1486use strict;
1487
1488use List::Util qw(min max);
1489
1490use SDL;
1491use SDL::OpenGL;
1492
1493our @ISA = CFClient::UI::Base::;
1494
1495sub new {
1496 my $class = shift;
1497
1498 $class->SUPER::new (
1499 z => -1,
1500 can_focus => 1,
1501 list => (glGenLists 1),
1502 @_
1503 ) 1827 }
1504}
1505 1828
1506sub key_down { 1829 $self->{children}[1]->draw;
1507 print "MAPKEYDOWN\n";
1508}
1509 1830
1510sub key_up {
1511}
1512
1513sub size_request {
1514 (
1515 1 + 32 * int $::WIDTH / 32,
1516 1 + 32 * int $::HEIGHT / 32,
1517 )
1518}
1519
1520sub update {
1521 my ($self) = @_;
1522
1523 $self->{need_update} = 1;
1524 $self->SUPER::update;
1525}
1526
1527sub draw {
1528 my ($self) = @_;
1529
1530 $self->{need_update}++;#d#
1531 if (delete $self->{need_update}) {
1532 glNewList $self->{list}, GL_COMPILE;
1533
1534 my $sw = int $::WIDTH / 32;
1535 my $sh = int $::HEIGHT / 32;
1536
1537 if ($::MAP) {
1538 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1539
1540 if ($::CFG->{fow_enable}) {
1541 if ($::CFG->{fow_smooth}) { # smooth fog of war
1542 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1543 glConvolutionFilter2D
1544 GL_CONVOLUTION_2D,
1545 GL_ALPHA,
1546 3, 3,
1547 GL_ALPHA, GL_FLOAT,
1548 pack "f*",
1549 0.1, 0.1, 0.1,
1550 0.1, 0.2, 0.1,
1551 0.1, 0.1, 0.1,
1552 ;
1553 glEnable GL_CONVOLUTION_2D;
1554 }
1555
1556 my $tex = new CFClient::Texture
1557 w => $w,
1558 h => $h,
1559 data => $data,
1560 internalformat => GL_ALPHA,
1561 format => GL_ALPHA;
1562
1563 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1564
1565 glEnable GL_BLEND;
1566 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1568
1569 glColor +($::CFG->{fow_intensity}) x 3, 1;
1570 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1571
1572 glDisable GL_TEXTURE_2D;
1573 glDisable GL_BLEND;
1574 }
1575 }
1576
1577 glEndList;
1578 }
1579
1580 glCallList $self->{list};
1581
1582 if ($FOCUS != $self) {
1583 glColor 64/255, 64/255, 64/255;
1584 glLogicOp GL_AND;
1585 glEnable GL_COLOR_LOGIC_OP;
1586 glBegin GL_QUADS;
1587 glVertex 0, 0;
1588 glVertex 0, $::HEIGHT;
1589 glVertex $::WIDTH, $::HEIGHT;
1590 glVertex $::WIDTH, 0;
1591 glEnd;
1592 glDisable GL_COLOR_LOGIC_OP;
1593 }
1594}
1595
1596my %DIR = (
1597 SDLK_KP8, [1, "north"],
1598 SDLK_KP9, [2, "northeast"],
1599 SDLK_KP6, [3, "east"],
1600 SDLK_KP3, [4, "southeast"],
1601 SDLK_KP2, [5, "south"],
1602 SDLK_KP1, [6, "southwest"],
1603 SDLK_KP4, [7, "west"],
1604 SDLK_KP7, [8, "northwest"],
1605
1606 SDLK_UP, [1, "north"],
1607 SDLK_RIGHT, [3, "east"],
1608 SDLK_DOWN, [5, "south"],
1609 SDLK_LEFT, [7, "west"],
1610);
1611
1612sub key_down {
1613 my ($self, $ev) = @_;
1614
1615 my $mod = $ev->key_mod;
1616 my $sym = $ev->key_sym;
1617
1618 if ($sym == SDLK_KP5) {
1619 $::CONN->user_send ("command stay fire");
1620 } elsif ($sym == SDLK_a) {
1621 $::CONN->user_send ("command apply");
1622 } elsif (exists $DIR{$sym}) {
1623 if ($mod & KMOD_SHIFT) {
1624 $self->{shft}++;
1625 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1626 } elsif ($mod & KMOD_CTRL) {
1627 $self->{ctrl}++;
1628 $::CONN->user_send ("command run $DIR{$sym}[0]");
1629 } else {
1630 $::CONN->user_send ("command $DIR{$sym}[1]");
1631 }
1632 }
1633}
1634
1635sub key_up {
1636 my ($self, $ev) = @_;
1637
1638 my $mod = $ev->key_mod;
1639 my $sym = $ev->key_sym;
1640
1641 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1642 $::CONN->user_send ("command fire_stop");
1643 }
1644 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1645 $::CONN->user_send ("command run_stop");
1646 }
1647} 1831}
1648 1832
1649############################################################################# 1833#############################################################################
1650 1834
1651package CFClient::UI::Animator; 1835package CFClient::UI::Animator;
1652 1836
1653use SDL::OpenGL; 1837use CFClient::OpenGL;
1654 1838
1655our @ISA = CFClient::UI::Bin::; 1839our @ISA = CFClient::UI::Bin::;
1656 1840
1657sub moveto { 1841sub moveto {
1658 my ($self, $x, $y) = @_; 1842 my ($self, $x, $y) = @_;
… …
1714sub toggle_flopper { 1898sub toggle_flopper {
1715 my ($self) = @_; 1899 my ($self) = @_;
1716 1900
1717 # TODO: use animation 1901 # TODO: use animation
1718 if ($self->{state} = !$self->{state}) { 1902 if ($self->{state} = !$self->{state}) {
1719 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1903 $CFClient::UI::ROOT->add ($self->{other});
1720 $self->{other}->move ( 1904 $self->{other}->move ($self->coord2global (0, $self->{h}));
1721 ($::WIDTH - $self->{other}{w}) * 0.5, 1905 $self->emit ("open");
1722 ($::HEIGHT - $self->{other}{h}) * 0.5,
1723 );
1724 } else { 1906 } else {
1725 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1907 $CFClient::UI::ROOT->remove ($self->{other});
1908 $self->emit ("close");
1726 } 1909 }
1727}
1728 1910
1729############################################################################# 1911 $self->emit (changed => $self->{state});
1912}
1730 1913
1914#############################################################################
1915
1731package CFClient::UI::Toplevel; 1916package CFClient::UI::Root;
1732 1917
1733our @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}
1734 1927
1735sub size_request { 1928sub size_request {
1736 ($::WIDTH, $::HEIGHT) 1929 ($::WIDTH, $::HEIGHT)
1737} 1930}
1738 1931
1739sub size_allocate { 1932sub configure {
1740 my ($self, $x, $y, $w, $h) = @_; 1933 my ($self, $x, $y, $w, $h) = @_;
1741 1934
1742 $self->_size_allocate ($x, $y, $w, $h); 1935 $self->SUPER::configure ($x, $y, $w, $h);
1743 1936
1744 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 1937 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1745 for @{$self->{children}}; 1938 for @{$self->{children}};
1746} 1939}
1747 1940
1748sub translate { 1941sub _topleft {
1749 my ($self, $x, $y) = @_; 1942 my ($self, $x, $y) = @_;
1750 1943
1751 ($x, $y) 1944 ($x, $y)
1752} 1945}
1753 1946
1754sub update { 1947sub update {
1755 my ($self) = @_; 1948 my ($self) = @_;
1756 1949
1757 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 1950 $self->check_size;
1758 ::refresh (); 1951 ::refresh ();
1759} 1952}
1760 1953
1761sub add { 1954sub add {
1762 my ($self, $widget) = @_; 1955 my ($self, $child) = @_;
1763 1956
1764 $self->SUPER::add ($widget); 1957 $self->SUPER::add ($child);
1958}
1765 1959
1766 $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;
1767} 1964}
1768 1965
1769sub draw { 1966sub draw {
1770 my ($self) = @_; 1967 my ($self) = @_;
1771 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
1772 $self->_draw; 1983 $self->_draw;
1773} 1984}
1774 1985
1775############################################################################# 1986#############################################################################
1776 1987
1777package CFClient::UI; 1988package CFClient::UI;
1778 1989
1779$TOPLEVEL = new CFClient::UI::Toplevel; 1990$ROOT = new CFClient::UI::Root;
1780 1991
17811 19921
1782 1993

Diff Legend

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