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.99 by elmex, Fri Apr 14 10:57:35 2006 UTC vs.
Revision 1.147 by root, Sat Apr 22 03:50:25 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}
112 142
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 abstract";
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
151 if ($self->{aspect}) {
152 my $w2 = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect};
154
155 # use alignment to adjust x, y
156
157 $x += int +($w - $w2) * 0.5;
158 $y += int +($h - $h2) * 0.5;
159
160 ($w, $h) = ($w2, $h2);
161 }
162
163 if ($self->{x} != $x || $self->{y} != $y) {
121 $self->{x} = $x; 164 $self->{x} = $x;
122 $self->{y} = $y; 165 $self->{y} = $y;
166 $self->update;
167 }
123 168
124 return unless $self->{w} != $w || $self->{h} != $h; 169 if ($self->{w} != $w || $self->{h} != $h) {
125
126 $self->{w} = $w; 170 $self->{w} = $w;
127 $self->{h} = $h; 171 $self->{h} = $h;
128 172
173 $self->size_allocate ($w, $h);
174 $self->update;
129 1 175 }
130} 176}
131 177
132sub size_allocate { 178sub size_allocate {
179 # nothing to be done
180}
181
182# return top left coordinates
183sub _topleft {
133 my ($self, $x, $y, $w, $h) = @_; 184 my ($self, $x, $y) = @_;
134 185
135 $self->_size_allocate ($x, $y, $w, $h); 186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
136} 187}
137 188
138# translate global coordinates to local coordinate system 189# translate global coordinates to local coordinate system
139sub translate { 190sub coord2local {
140 my ($self, $x, $y) = @_; 191 my ($self, $x, $y) = @_;
141 192
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 193 my ($X, $Y) = $self->_topleft;
194 ($x - $X, $y - $Y)
195}
196
197# translate local coordinates to global coordinate system
198sub coord2global {
199 my ($self, $x, $y) = @_;
200
201 my ($X, $Y) = $self->_topleft;
202 ($x + $X, $y + $Y)
143} 203}
144 204
145sub focus_in { 205sub focus_in {
146 my ($self) = @_; 206 my ($self) = @_;
147 207
148 return if $FOCUS == $self; 208 return if $FOCUS == $self;
149 return unless $self->{can_focus}; 209 return unless $self->{can_focus};
150 210
151 my $focus = $FOCUS; $FOCUS = $self; 211 my $focus = $FOCUS; $FOCUS = $self;
212
213 $self->emit (focus_in => $focus);
214
152 $focus->update if $focus; 215 $focus->update if $focus;
153 $FOCUS->update; 216 $FOCUS->update;
154} 217}
155 218
156sub focus_out { 219sub focus_out {
157 my ($self) = @_; 220 my ($self) = @_;
158 221
159 return unless $FOCUS == $self; 222 return unless $FOCUS == $self;
160 223
161 my $focus = $FOCUS; undef $FOCUS; 224 my $focus = $FOCUS; undef $FOCUS;
225
226 $self->emit (focus_out => $focus);
227
162 $focus->update if $focus; #? 228 $focus->update if $focus; #?
163} 229}
164 230
165sub mouse_motion { } 231sub mouse_motion { }
166sub button_up { } 232sub button_up { }
190 glPopMatrix; 256 glPopMatrix;
191 257
192 if ($self == $HOVER && $self->{can_hover}) { 258 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)}; 259 my ($x, $y) = @$self{qw(x y)};
194 260
195 glColor 0, 0, 1, 0.2; 261 glColor 1, 0.8, 0.5, 0.2;
196 glEnable GL_BLEND; 262 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 263 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198 glBegin GL_QUADS; 264 glBegin GL_QUADS;
199 glVertex $x , $y; 265 glVertex $x , $y;
200 glVertex $x + $self->{w}, $y; 266 glVertex $x + $self->{w}, $y;
220 286
221 () 287 ()
222} 288}
223 289
224sub set_parent { 290sub set_parent {
225 my ($self, $par) = @_; 291 my ($self, $parent) = @_;
226 292
227 $self->{parent} = $par;
228 Scalar::Util::weaken $self->{parent}; 293 Scalar::Util::weaken ($self->{parent} = $parent);
229} 294}
230 295
231sub get_parent { 296sub check_size {
232 $_[0]->{parent} 297 my ($self) = @_;
298
299 my ($w, $h) = $self->size_request;
300
301 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w;
303 $self->{req_h} = $h;
304
305 $self->{parent}->check_size
306 if $self->{parent};
307 }
233} 308}
234 309
235sub update { 310sub update {
236 my ($self) = @_; 311 my ($self) = @_;
237 312
240} 315}
241 316
242sub connect { 317sub connect {
243 my ($self, $signal, $cb) = @_; 318 my ($self, $signal, $cb) = @_;
244 319
245 push @{ $self->{cb}{$signal} }, $cb; 320 push @{ $self->{signal_cb}{$signal} }, $cb;
246} 321}
247 322
248sub emit { 323sub emit {
249 my ($self, $signal, @args) = @_; 324 my ($self, $signal, @args) = @_;
250 325
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
251 $_->($self, @args) 327 $cb->($self, @args);
252 for @{$self->{cb}{$signal} || []}; 328 }
253} 329}
254 330
255sub DESTROY { 331sub DESTROY {
256 my ($self) = @_; 332 my ($self) = @_;
257 333
263package CFClient::UI::DrawBG; 339package CFClient::UI::DrawBG;
264 340
265our @ISA = CFClient::UI::Base::; 341our @ISA = CFClient::UI::Base::;
266 342
267use strict; 343use strict;
268use SDL::OpenGL; 344use CFClient::OpenGL;
269 345
270sub new { 346sub new {
271 my $class = shift; 347 my $class = shift;
272 348
273 # range [value, low, high, page] 349 # range [value, low, high, page]
326 402
327 $self 403 $self
328} 404}
329 405
330sub add { 406sub add {
331 my ($self, $chld) = @_; 407 my ($self, $child) = @_;
332 408
333 $chld->set_parent ($self); 409 $child->set_parent ($self);
410
411 use sort 'stable';
334 412
335 $self->{children} = [ 413 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 414 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 415 @{$self->{children}}, $child
338 ]; 416 ];
339 417
340 $self->{w} = $self->{h} = -1; 418 $child->check_size;
341 $self->update;
342} 419}
343 420
344sub remove { 421sub remove {
345 my ($self, $widget) = @_; 422 my ($self, $child) = @_;
346 423
424 delete $child->{parent};
425
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
348 427
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 428 $self->check_size;
350} 429}
351 430
352sub find_widget { 431sub find_widget {
353 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
354 433
384 463
385 $class->SUPER::new (children => [$child], %arg) 464 $class->SUPER::new (children => [$child], %arg)
386} 465}
387 466
388sub add { 467sub add {
389 my ($self, $widget) = @_; 468 my ($self, $child) = @_;
390 469
391 $self->{children} = []; 470 $self->{children} = [];
392 471
393 $self->SUPER::add ($widget); 472 $self->SUPER::add ($child);
394} 473}
395 474
396sub remove { 475sub remove {
397 my ($self, $widget) = @_; 476 my ($self, $widget) = @_;
398 477
407sub size_request { 486sub size_request {
408 $_[0]{children}[0]->size_request 487 $_[0]{children}[0]->size_request
409} 488}
410 489
411sub size_allocate { 490sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_; 491 my ($self, $w, $h) = @_;
413 492
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h); 493 $self->{children}[0]->configure (0, 0, $w, $h);
417} 494}
418 495
419############################################################################# 496#############################################################################
420 497
421package CFClient::UI::Window; 498package CFClient::UI::Window;
422 499
423our @ISA = CFClient::UI::Bin::; 500our @ISA = CFClient::UI::Bin::;
424 501
425use SDL::OpenGL; 502use CFClient::OpenGL;
426 503
427sub new { 504sub new {
428 my ($class, %arg) = @_; 505 my ($class, %arg) = @_;
429 506
430 my $self = $class->SUPER::new (%arg); 507 my $self = $class->SUPER::new (%arg);
439} 516}
440 517
441sub render_chld { 518sub render_chld {
442 my ($self) = @_; 519 my ($self) = @_;
443 520
444 $self->{texture} = 521 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 522 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 523 glClear GL_COLOR_BUFFER_BIT;
447 ); 524 $self->child->draw;
525 };
448} 526}
449 527
450sub size_allocate { 528sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 529 my ($self, $w, $h) = @_;
452 530
453 $self->_size_allocate ($x, $y, $w, $h) or return;
454
455 $self->child->size_allocate (0, 0, $w, $h); 531 $self->child->configure (0, 0, $w, $h);
456 532
457 $self->render_chld; 533 $self->render_chld;
458} 534}
459 535
460sub _draw { 536sub _draw {
476 glDisable GL_TEXTURE_2D; 552 glDisable GL_TEXTURE_2D;
477} 553}
478 554
479############################################################################# 555#############################################################################
480 556
557package CFClient::UI::ViewPort;
558
559our @ISA = CFClient::UI::Window::;
560
561sub new { die }
562
563sub size_request {
564 my ($self) = @_;
565
566 @$self{qw(child_w child_h)} = $self->child->size_request;
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568
569 @$self{qw(child_w child_h)}
570}
571
572sub _draw {
573 my ($self) = @_;
574
575 $self->{children}[1]->draw;
576}
577
578
579#############################################################################
580
481package CFClient::UI::Frame; 581package CFClient::UI::Frame;
482 582
483our @ISA = CFClient::UI::Bin::; 583our @ISA = CFClient::UI::Bin::;
484 584
485use SDL::OpenGL; 585use CFClient::OpenGL;
486 586
487sub size_request { 587sub size_request {
488 my ($self) = @_; 588 my ($self) = @_;
489 my $chld = $self->child 589 my $chld = $self->child
490 or return (0, 0); 590 or return (0, 0);
495} 595}
496 596
497sub size_allocate { 597sub size_allocate {
498 my ($self, $x, $y, $w, $h) = @_; 598 my ($self, $x, $y, $w, $h) = @_;
499 599
500 $self->_size_allocate ($x, $y, $w, $h) or return;
501
502 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 600 $self->child->configure (2, 2, $w - 4, $h - 4);
503} 601}
504 602
505sub _draw { 603sub _draw {
506 my ($self) = @_; 604 my ($self) = @_;
507 605
524 622
525package CFClient::UI::FancyFrame; 623package CFClient::UI::FancyFrame;
526 624
527our @ISA = CFClient::UI::Bin::; 625our @ISA = CFClient::UI::Bin::;
528 626
529use SDL::OpenGL; 627use CFClient::OpenGL;
530 628
531my @tex = 629my @tex =
532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 631 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
534 632
535sub new { 633sub new {
536 my $class = shift; 634 my $class = shift;
537 635
538 # TODO: user_x, user_y, overwrite moveto? 636 # TODO: user_x, user_y, overwrite moveto?
539 637
540 $class->SUPER::new ( 638 my $self = $class->SUPER::new (
541 bg => [1, 1, 1, 1], 639 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1], 640 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8, 641 border => 0.8,
544 @_ 642 @_
643 );
644
645 $self->{title} &&= new CFClient::UI::Label
646 align => 0,
647 valign => 1,
648 text => $self->{title},
649 fontsize => 1;
650
651 $self
652}
653
654sub border {
655 int $_[0]{border} * $::FONTSIZE
656}
657
658sub size_request {
659 my ($self) = @_;
660
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662
663 my ($w, $h) = $self->SUPER::size_request;
664
665 (
666 $w + $self->border * 2,
667 $h + $self->border * 2,
545 ) 668 )
546} 669}
547 670
548sub size_request {
549 my ($self) = @_;
550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
553 my ($w, $h) = $self->SUPER::size_request;
554
555 (
556 $w + $self->{border} * 2,
557 $h + $self->{border} * 2,
558 )
559}
560
561sub size_allocate { 671sub size_allocate {
562 my ($self, $x, $y, $w, $h) = @_; 672 my ($self, $w, $h) = @_;
563 673
564 $self->_size_allocate ($x, $y, $w, $h) or return;
565
566 $h -= List::Util::max 0, $self->{border} * 2; 674 $h -= List::Util::max 0, $self->border * 2;
567 $w -= List::Util::max 0, $self->{border} * 2; 675 $w -= List::Util::max 0, $self->border * 2;
568 676
677 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
678 if $self->{title};
679
569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 680 $self->child->configure ($self->border, $self->border, $w, $h);
570} 681}
571 682
572sub button_down { 683sub button_down {
573 my ($self, $ev, $x, $y) = @_; 684 my ($self, $ev, $x, $y) = @_;
574 685
686 my $border = $self->border;
687
575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 688 if ($x < $self->{w} && $x >= $self->{w} - $border
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 689 && $y < $self->{h} && $y >= $self->{h} - $border) {
577 690
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 691 my ($ox, $oy) = ($ev->{x}, $ev->{y});
579 my ($bw, $bh) = ($self->{w}, $self->{h}); 692 my ($bw, $bh) = ($self->{w}, $self->{h});
580 693
581 $self->{motion} = sub { 694 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_; 695 my ($ev, $x, $y) = @_;
583 696
584 ($x, $y) = ($ev->motion_x, $ev->motion_y); 697 ($x, $y) = ($ev->{x}, $ev->{y});
585 698
586 $self->{user_w} = $bw + $x - $ox; 699 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy; 700 $self->{user_h} = $bh + $y - $oy;
588 $self->update; 701 $self->check_size;
589 }; 702 };
590 703
591 } elsif ($x >= 0 && $x < $self->{w} 704 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) { 705 && $y >= 0 && $y < $border) {
593 706
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 707 my ($ox, $oy) = ($ev->{x}, $ev->{y});
595 my ($bx, $by) = ($self->{x}, $self->{y}); 708 my ($bx, $by) = ($self->{x}, $self->{y});
596 709
597 $self->{motion} = sub { 710 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_; 711 my ($ev, $x, $y) = @_;
599 712
600 ($x, $y) = ($ev->motion_x, $ev->motion_y); 713 ($x, $y) = ($ev->{x}, $ev->{y});
601 714
602 $self->move ($bx + $x - $ox, $by + $y - $oy); 715 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update; 716 $self->update;
604 }; 717 };
605 } 718 }
626 glEnable GL_BLEND; 739 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
628 glEnable GL_TEXTURE_2D; 741 glEnable GL_TEXTURE_2D;
629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
630 743
744 my $border = $self->border;
745
631 glColor @{ $self->{border_bg} }; 746 glColor @{ $self->{border_bg} };
632 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 747 $tex[1]->draw_quad (0, 0, $w, $border);
633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 748 $tex[3]->draw_quad (0, $border, $border, $ch);
634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 750 $tex[4]->draw_quad (0, $h - $border, $w, $border);
636 751
637 my $bg = $tex[0]; 752 my $bg = $tex[0];
638 753
639 # TODO: repeat texture not scale 754 # TODO: repeat texture not scale
640 my $rep_x = $cw / $bg->{w}; 755 my $rep_x = $cw / $bg->{w};
641 my $rep_y = $ch / $bg->{h}; 756 my $rep_y = $ch / $bg->{h};
642 757
643 glColor @{ $self->{bg} }; 758 glColor @{ $self->{bg} };
759
760 $bg->{s} = $rep_x;
761 $bg->{t} = $rep_y;
762 $bg->{wrap_mode} = 1;
644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 763 $bg->draw_quad ($border, $border, $cw, $ch);
645 764
646 glDisable GL_TEXTURE_2D; 765 glDisable GL_TEXTURE_2D;
647 glDisable GL_BLEND; 766 glDisable GL_BLEND;
648 767
768 $self->{title}->draw if $self->{title};
649 $self->child->draw; 769 $self->child->draw;
650} 770}
651 771
652############################################################################# 772#############################################################################
653 773
655 775
656our @ISA = CFClient::UI::Base::; 776our @ISA = CFClient::UI::Base::;
657 777
658use List::Util qw(max sum); 778use List::Util qw(max sum);
659 779
660use SDL::OpenGL; 780use CFClient::OpenGL;
661 781
662sub new { 782sub new {
663 my $class = shift; 783 my $class = shift;
664 784
665 $class->SUPER::new ( 785 $class->SUPER::new (
667 @_ 787 @_
668 ) 788 )
669} 789}
670 790
671sub add { 791sub add {
672 my ($self, $x, $y, $chld) = @_; 792 my ($self, $x, $y, $child) = @_;
673 793
794 $child->set_parent ($self);
674 $self->{children}[$y][$x] = $chld; 795 $self->{children}[$y][$x] = $child;
675 $chld->set_parent ($self);
676 796
677 $self->{w} = $self->{h} = -1; 797 $child->check_size;
798}
799
800# TODO: move to container class maybe? send childs a signal on removal?
801sub clear {
802 my ($self) = @_;
803
804 delete $self->{children};
678 $self->update; 805 $self->update;
679} 806}
680 807
681sub get_wh { 808sub get_wh {
682 my ($self) = @_; 809 my ($self) = @_;
710 (sum @$hs), 837 (sum @$hs),
711 ) 838 )
712} 839}
713 840
714sub size_allocate { 841sub size_allocate {
715 my ($self, $x, $y, $w, $h) = @_; 842 my ($self, $w, $h) = @_;
716
717 $self->_size_allocate ($x, $y, $w, $h) or return;
718 843
719 my ($ws, $hs) = $self->get_wh; 844 my ($ws, $hs) = $self->get_wh;
720 845
721 my $req_w = sum @$ws; 846 my $req_w = sum @$ws;
722 my $req_h = sum @$hs; 847 my $req_h = sum @$hs;
727 my $col_expand = (sum @col_expand) || 1; 852 my $col_expand = (sum @col_expand) || 1;
728 853
729 # linearly scale sizes 854 # linearly scale sizes
730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 855 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 856 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
857
858 CFClient::UI::harmonize $ws;
859 CFClient::UI::harmonize $hs;
732 860
733 my $y; 861 my $y;
734 862
735 for my $r (0 .. $#{$self->{children}}) { 863 for my $r (0 .. $#{$self->{children}}) {
736 my $row = $self->{children}[$r] 864 my $row = $self->{children}[$r]
741 869
742 for my $c (0 .. $#$row) { 870 for my $c (0 .. $#$row) {
743 my $col_w = $ws->[$c]; 871 my $col_w = $ws->[$c];
744 872
745 if (my $widget = $row->[$c]) { 873 if (my $widget = $row->[$c]) {
746 $widget->size_allocate ($x, $y, $col_w, $row_h); 874 $widget->configure ($x, $y, $col_w, $row_h);
747 } 875 }
748 876
749 $x += $col_w; 877 $x += $col_w;
750 } 878 }
751 879
796 (List::Util::max map $_->[1], @alloc), 924 (List::Util::max map $_->[1], @alloc),
797 ) 925 )
798} 926}
799 927
800sub size_allocate { 928sub size_allocate {
801 my ($self, $x, $y, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
802
803 $self->_size_allocate ($x, $y, $w, $h);
804 930
805 ($h, $w) = ($w, $h); 931 ($h, $w) = ($w, $h);
806 932
807 my $children = $self->{children}; 933 my $children = $self->{children};
808 934
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 950 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h; 951 $h[$_] = $alloc_h;
826 } 952 }
827 } 953 }
828 954
955 CFClient::UI::harmonize \@h;
956
829 my $y = 0; 957 my $y = 0;
830 for (0 .. $#$children) { 958 for (0 .. $#$children) {
831 my $child = $children->[$_]; 959 my $child = $children->[$_];
832 my $h = $h[$_]; 960 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 961 $child->configure ($y, 0, $h, $w);
834 962
835 $y += $h; 963 $y += $h;
836 } 964 }
965
966 1
837} 967}
838 968
839############################################################################# 969#############################################################################
840 970
841package CFClient::UI::VBox; 971package CFClient::UI::VBox;
854 (List::Util::sum map $_->[1], @alloc), 984 (List::Util::sum map $_->[1], @alloc),
855 ) 985 )
856} 986}
857 987
858sub size_allocate { 988sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 989 my ($self, $w, $h) = @_;
860
861 $self->_size_allocate ($x, $y, $w, $h);
862 990
863 my $children = $self->{children}; 991 my $children = $self->{children};
864 992
865 my @h = map +($_->size_request)[1], @$children; 993 my @h = map +($_->size_request)[1], @$children;
866 994
878 1006
879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1007 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
880 } 1008 }
881 } 1009 }
882 1010
1011 CFClient::UI::harmonize \@h;
1012
883 my $y = 0; 1013 my $y = 0;
884 for (0 .. $#$children) { 1014 for (0 .. $#$children) {
885 my $child = $children->[$_]; 1015 my $child = $children->[$_];
886 my $h = $h[$_]; 1016 my $h = $h[$_];
887 $child->size_allocate (0, $y, $w, $h); 1017 $child->configure (0, $y, $w, $h);
888 1018
889 $y += $h; 1019 $y += $h;
890 } 1020 }
1021
1022 1
891} 1023}
892 1024
893############################################################################# 1025#############################################################################
894 1026
895package CFClient::UI::Label; 1027package CFClient::UI::Label;
896 1028
897our @ISA = CFClient::UI::Base::; 1029our @ISA = CFClient::UI::Base::;
898 1030
899use SDL::OpenGL; 1031use CFClient::OpenGL;
900 1032
901sub new { 1033sub new {
902 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
903 1035
904 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
905 fg => [1, 1, 1], 1037 fg => [1, 1, 1],
906 height => $::FONTSIZE, 1038 fontsize => 1,
907 text => "", 1039 text => "",
908 align => -1, 1040 align => -1,
1041 valign => -1,
909 padding => 2, 1042 padding => 2,
910 layout => new CFClient::Layout, 1043 layout => new CFClient::Layout,
911 %arg 1044 %arg
912 ); 1045 );
913 1046
914 $self->set_text ($self->{text}); 1047 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout;
1049 $layout->set_text (delete $self->{template});
1050 $self->{template} = $layout;
1051 }
1052
1053 $self->set_text (delete $self->{text}) if exists $self->{text};
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
915 1055
916 $self 1056 $self
917} 1057}
918 1058
919sub escape_text { 1059sub escape_text {
927} 1067}
928 1068
929sub set_text { 1069sub set_text {
930 my ($self, $text) = @_; 1070 my ($self, $text) = @_;
931 1071
932 $self->{text} = $text;
933 $self->{layout}->set_markup ($text); 1072 $self->{layout}->set_text ($text);
934 1073
935 delete $self->{texture}; 1074 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
937 $self->update; 1075 $self->update;
938} 1076}
939 1077
940sub get_text { 1078sub set_markup {
941 my ($self, $text) = @_; 1079 my ($self, $markup) = @_;
942 1080
943 $self->{text} 1081 $self->{layout}->set_markup ($markup);
1082
1083 delete $self->{texture};
1084 $self->update;
944} 1085}
945 1086
946sub size_request { 1087sub size_request {
947 my ($self) = @_; 1088 my ($self) = @_;
948 1089
949 $self->{layout}->set_width; 1090 $self->{layout}->set_width;
950 $self->{layout}->set_height ($self->{height}); 1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092
951 my ($w, $h) = $self->{layout}->size; 1093 my ($w, $h) = $self->{layout}->size;
1094
1095 if (exists $self->{template}) {
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097
1098 my ($w2, $h2) = $self->{template}->size;
1099
1100 $w = List::Util::max $w, $w2;
1101 $h = List::Util::max $h, $h2;
1102 }
952 1103
953 ( 1104 (
954 $w + $self->{padding} * 2, 1105 $w + $self->{padding} * 2,
955 $h + $self->{padding} * 2, 1106 $h + $self->{padding} * 2,
956 ) 1107 )
957} 1108}
958 1109
959sub size_allocate { 1110sub size_allocate {
960 my ($self, $x, $y, $w, $h) = @_; 1111 my ($self, $w, $h) = @_;
961
962 $self->_size_allocate ($x, $y, $w, $h) or return;
963 1112
964 delete $self->{texture}; 1113 delete $self->{texture};
965} 1114}
966 1115
967sub update { 1116sub set_fontsize {
968 my ($self) = @_; 1117 my ($self, $fontsize) = @_;
969 1118
970 delete $self->{texture}; 1119 $self->{fontsize} = $fontsize;
971 $self->SUPER::update; 1120 $self->check_size;
972} 1121}
973 1122
974sub _draw { 1123sub _draw {
975 my ($self) = @_; 1124 my ($self) = @_;
976 1125
977 my $tex = $self->{texture} ||= do { 1126 my $tex = $self->{texture} ||= do {
978 $self->{layout}->set_width ($self->{w}); 1127 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1128 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
980 new_from_layout CFClient::Texture $self->{layout} 1129 new_from_layout CFClient::Texture $self->{layout}
981 }; 1130 };
982 1131
983 glEnable GL_BLEND; 1132 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1133 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D; 1134 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1135 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987 1136
988 glColor @{$self->{fg}}; 1137 glColor @{$self->{fg}};
989 1138
990 my $x = 1139 $self->{ox} = int (
991 $self->{align} < 0 ? $self->{padding} 1140 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1141 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5; 1142 : ($self->{w} - $tex->{w}) * 0.5
1143 );
994 1144
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1145 $self->{oy} = int (
996 $tex->draw_quad (0, 0); 1146 $self->{valign} < 0 ? $self->{padding}
1147 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1148 : ($self->{h} - $tex->{h}) * 0.5
1149 );
1150
1151 $tex->draw_quad ($self->{ox}, $self->{oy});
997 1152
998 glDisable GL_TEXTURE_2D; 1153 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND; 1154 glDisable GL_BLEND;
1000} 1155}
1001 1156
1002############################################################################# 1157#############################################################################
1003 1158
1004package CFClient::UI::Entry; 1159package CFClient::UI::EntryBase;
1005 1160
1006our @ISA = CFClient::UI::Label::; 1161our @ISA = CFClient::UI::Label::;
1007 1162
1008use SDL; 1163use CFClient::OpenGL;
1009use SDL::OpenGL;
1010 1164
1011sub new { 1165sub new {
1012 my $class = shift; 1166 my $class = shift;
1013 1167
1014 $class->SUPER::new ( 1168 $class->SUPER::new (
1016 bg => [0, 0, 0, 0.2], 1170 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1, 0.5], 1171 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0], 1172 active_fg => [0, 0, 0],
1019 can_hover => 1, 1173 can_hover => 1,
1020 can_focus => 1, 1174 can_focus => 1,
1175 valign => 0,
1021 @_ 1176 @_
1022 ) 1177 )
1023} 1178}
1024 1179
1025sub _set_text { 1180sub _set_text {
1026 my ($self, $text) = @_; 1181 my ($self, $text) = @_;
1027 1182
1183 delete $self->{cur_h};
1184
1185 return if $self->{text} eq $text;
1186
1187 delete $self->{texture};
1188
1028 $self->{last_activity} = $::NOW; 1189 $self->{last_activity} = $::NOW;
1029
1030 $self->{text} = $text; 1190 $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 1191
1034 $text =~ s/./*/g if $self->{hidden}; 1192 $text =~ s/./*/g if $self->{hidden};
1193 $self->{layout}->set_text ("$text ");
1035 1194
1036 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1195 $self->emit (changed => $self->{text});
1196}
1037 1197
1038 $text = substr $text, 0, $self->{cursor}; 1198sub get_text {
1039 utf8::encode $text; 1199 $_[0]{text}
1040
1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1042} 1200}
1043 1201
1044sub size_request { 1202sub size_request {
1045 my ($self) = @_; 1203 my ($self) = @_;
1046 1204
1048 1206
1049 ($w + 1, $h) # add 1 for cursor 1207 ($w + 1, $h) # add 1 for cursor
1050} 1208}
1051 1209
1052sub size_allocate { 1210sub size_allocate {
1053 my ($self, $x, $y, $w, $h) = @_; 1211 my ($self, $w, $h) = @_;
1054
1055 $self->SUPER::size_allocate ($x, $y, $w, $h);
1056 1212
1057 $self->_set_text ($self->{text}); 1213 $self->_set_text ($self->{text});
1058} 1214}
1059 1215
1060sub set_text { 1216sub set_text {
1066} 1222}
1067 1223
1068sub key_down { 1224sub key_down {
1069 my ($self, $ev) = @_; 1225 my ($self, $ev) = @_;
1070 1226
1071 my $mod = $ev->key_mod; 1227 my $mod = $ev->{mod};
1072 my $sym = $ev->key_sym; 1228 my $sym = $ev->{sym};
1073
1074 my $uni = $ev->key_unicode; 1229 my $uni = $ev->{unicode};
1075 1230
1076 my $text = $self->get_text; 1231 my $text = $self->get_text;
1077 1232
1078 if ($sym == SDLK_BACKSPACE) { 1233 if ($sym == 8) {
1079 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1234 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1080 } elsif ($sym == SDLK_DELETE) { 1235 } elsif ($sym == 127) {
1081 substr $text, $self->{cursor}, 1, ""; 1236 substr $text, $self->{cursor}, 1, "";
1082 } elsif ($sym == SDLK_LEFT) { 1237 } elsif ($sym == CFClient::SDLK_LEFT) {
1083 --$self->{cursor} if $self->{cursor}; 1238 --$self->{cursor} if $self->{cursor};
1084 } elsif ($sym == SDLK_RIGHT) { 1239 } elsif ($sym == CFClient::SDLK_RIGHT) {
1085 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1240 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) { 1241 } elsif ($sym == CFClient::SDLK_HOME) {
1087 $self->{cursor} = 0; 1242 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) { 1243 } elsif ($sym == CFClient::SDLK_END) {
1089 $self->{cursor} = length $text; 1244 $self->{cursor} = length $text;
1245 } elsif ($sym == 27) {
1246 $self->emit ('escape');
1090 } elsif ($uni) { 1247 } elsif ($uni) {
1091 substr $text, $self->{cursor}++, 0, chr $uni; 1248 substr $text, $self->{cursor}++, 0, chr $uni;
1092 } 1249 }
1093 1250
1094 $self->_set_text ($text); 1251 $self->_set_text ($text);
1148 1305
1149 $self->SUPER::_draw; 1306 $self->SUPER::_draw;
1150 1307
1151 #TODO: force update every cursor change :( 1308 #TODO: force update every cursor change :(
1152 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1309 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1310
1311 unless (exists $self->{cur_h}) {
1312 my $text = substr $self->{text}, 0, $self->{cursor};
1313 utf8::encode $text;
1314
1315 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1316 }
1317
1153 glColor @{$self->{fg}}; 1318 glColor @{$self->{fg}};
1154 glBegin GL_LINES; 1319 glBegin GL_LINES;
1155 glVertex $self->{cur_x}, $self->{cur_y};
1156 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1320 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1321 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1157 glEnd; 1322 glEnd;
1158 } 1323 }
1159} 1324}
1160 1325
1161package CFClient::UI::LineEntry; 1326package CFClient::UI::Entry;
1162 1327
1163our @ISA = CFClient::UI::Entry::; 1328our @ISA = CFClient::UI::EntryBase::;
1164 1329
1165use SDL; 1330use CFClient::OpenGL;
1166use SDL::OpenGL;
1167 1331
1168sub key_down { 1332sub key_down {
1169 my ($self, $ev) = @_; 1333 my ($self, $ev) = @_;
1170 1334
1171 my $sym = $ev->key_sym; 1335 my $sym = $ev->{sym};
1172 1336
1173 if ($sym == SDLK_RETURN) { 1337 if ($sym == 13) {
1174 $self->emit (activate => $self->get_text); 1338 $self->emit (activate => $self->get_text);
1175 $self->update; 1339 $self->update;
1176 1340
1177 } else { 1341 } else {
1178 $self->SUPER::key_down ($ev); 1342 $self->SUPER::key_down ($ev);
1184 1348
1185package CFClient::UI::Button; 1349package CFClient::UI::Button;
1186 1350
1187our @ISA = CFClient::UI::Label::; 1351our @ISA = CFClient::UI::Label::;
1188 1352
1189use SDL; 1353use CFClient::OpenGL;
1190use SDL::OpenGL;
1191 1354
1192my @tex = 1355my @tex =
1193 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1194 qw(b1_button_active.png); 1357 qw(b1_button_active.png);
1195 1358
1196sub new { 1359sub new {
1197 my $class = shift; 1360 my $class = shift;
1198 1361
1199 $class->SUPER::new ( 1362 $class->SUPER::new (
1200 padding => 4, 1363 padding => 4,
1201 fg => [1, 1, 1], 1364 fg => [1, 1, 1],
1202 bg => [1, 1, 1, 0.2], 1365 bg => [1, 1, 1, 0.2],
1203 active_fg => [1, 1, 0], 1366 active_fg => [0, 0, 1],
1204 can_hover => 1, 1367 can_hover => 1,
1368 align => 0,
1369 valign => 0,
1205 @_ 1370 @_
1206 ) 1371 )
1207} 1372}
1208 1373
1209sub button_up { 1374sub button_up {
1217 1382
1218sub _draw { 1383sub _draw {
1219 my ($self) = @_; 1384 my ($self) = @_;
1220 1385
1221 local $self->{fg} = $self->{fg}; 1386 local $self->{fg} = $self->{fg};
1222 my $tex = $tex[0];
1223
1224 glEnable GL_BLEND;
1225 glEnable GL_TEXTURE_2D;
1226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1227 1387
1228 if ($GRAB == $self) { 1388 if ($GRAB == $self) {
1229 $self->{fg} = $self->{active_fg}; 1389 $self->{fg} = $self->{active_fg};
1230 } 1390 }
1231 1391
1232 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1392 glEnable GL_BLEND;
1393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1394 glEnable GL_TEXTURE_2D;
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1396 glColor 0, 0, 0, 1;
1234 1397
1235 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1398 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1236 1399
1237 glDisable GL_TEXTURE_2D; 1400 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND; 1401 glDisable GL_BLEND;
1239 1402
1240 $self->SUPER::_draw; 1403 $self->SUPER::_draw;
1244 1407
1245package CFClient::UI::CheckBox; 1408package CFClient::UI::CheckBox;
1246 1409
1247our @ISA = CFClient::UI::DrawBG::; 1410our @ISA = CFClient::UI::DrawBG::;
1248 1411
1249use SDL; 1412my @tex =
1250use SDL::OpenGL; 1413 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1414 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1415
1416use CFClient::OpenGL;
1251 1417
1252sub new { 1418sub new {
1253 my $class = shift; 1419 my $class = shift;
1254 1420
1255 $class->SUPER::new ( 1421 $class->SUPER::new (
1266 my ($self) = @_; 1432 my ($self) = @_;
1267 1433
1268 ($self->{padding} * 2 + 6) x 2 1434 ($self->{padding} * 2 + 6) x 2
1269} 1435}
1270 1436
1271sub size_allocate {
1272 my ($self, $x, $y, $w, $h) = @_;
1273
1274 $self->_size_allocate ($x, $y, $w, $h);
1275}
1276
1277sub button_down { 1437sub button_down {
1278 my ($self, $ev, $x, $y) = @_; 1438 my ($self, $ev, $x, $y) = @_;
1279 1439
1280 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1440 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1281 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1441 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1290 $self->SUPER::_draw; 1450 $self->SUPER::_draw;
1291 1451
1292 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1452 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1293 1453
1294 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1454 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1295 1455
1296 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1456 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1297 1457
1298 glBegin GL_LINE_LOOP; 1458 glEnable GL_BLEND;
1299 glVertex 0 , 0; 1459 glEnable GL_TEXTURE_2D;
1300 glVertex 0 , $s; 1460 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1301 glVertex $s, $s; 1461
1302 glVertex $s, 0; 1462 my $tex = $self->{state} ? $tex[1] : $tex[0];
1463
1464 $tex->draw_quad (0, 0, $s, $s);
1465
1466 glDisable GL_TEXTURE_2D;
1467 glDisable GL_BLEND;
1468}
1469
1470#############################################################################
1471
1472package CFClient::UI::Image;
1473
1474our @ISA = CFClient::UI::Base::;
1475
1476use CFClient::OpenGL;
1477use Carp qw/confess/;
1478
1479our %loaded_images;
1480
1481sub new {
1482 my $class = shift;
1483
1484 my $self = $class->SUPER::new (@_);
1485
1486 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1487
1488 $loaded_images{$self->{image}} ||=
1489 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1490
1491 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1492
1493 Scalar::Util::weaken $loaded_images{$self->{image}};
1494
1495 $self->{aspect} = $tex->{w} / $tex->{h};
1496
1497 $self
1498}
1499
1500sub size_request {
1501 my ($self) = @_;
1502
1503 ($self->{tex}->{w}, $self->{tex}->{h})
1504}
1505
1506sub _draw {
1507 my ($self) = @_;
1508
1509 my $tex = $self->{tex};
1510
1511 my ($w, $h) = ($self->{w}, $self->{h});
1512
1513 if ($self->{rot90}) {
1514 glRotate 90, 0, 0, 1;
1515 glTranslate 0, -$self->{w}, 0;
1516
1517 ($w, $h) = ($h, $w);
1518 }
1519
1520 glEnable GL_BLEND;
1521 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1522 glEnable GL_TEXTURE_2D;
1523 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1524
1525 $tex->draw_quad (0, 0, $w, $h);
1526
1527 glDisable GL_BLEND;
1528 glDisable GL_TEXTURE_2D;
1529}
1530
1531#############################################################################
1532
1533package CFClient::UI::VGauge;
1534
1535our @ISA = CFClient::UI::Base::;
1536
1537use CFClient::OpenGL;
1538
1539my %tex = (
1540 food => [
1541 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1542 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1543 ],
1544 grace => [
1545 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1546 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1547 ],
1548 hp => [
1549 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1550 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1551 ],
1552 mana => [
1553 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1554 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1555 ],
1556);
1557
1558# eg. VGauge->new (gauge => 'food'), default gauge: food
1559sub new {
1560 my $class = shift;
1561
1562 my $self = $class->SUPER::new (
1563 type => 'food',
1564 @_
1565 );
1566
1567 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1568
1569 $self
1570}
1571
1572sub size_request {
1573 my ($self) = @_;
1574
1575 #my $tex = $tex{$self->{type}}[0];
1576 #@$tex{qw(w h)}
1577 (0, 0)
1578}
1579
1580sub set_max {
1581 my ($self, $max) = @_;
1582
1583 $self->{max_val} = $max;
1584}
1585
1586sub set_value {
1587 my ($self, $val, $max) = @_;
1588
1589 $self->set_max ($max)
1590 if defined $max;
1591
1592 $max = $self->{max_val};
1593 $self->{val} = $val;
1594
1595 $self->update;
1596}
1597
1598sub _draw {
1599 my ($self) = @_;
1600
1601 my $tex = $tex{$self->{type}};
1602
1603 my ($w, $h) = ($self->{w}, $self->{h});
1604
1605 if ($self->{vertical}) {
1606 glRotate 90, 0, 0, 1;
1607 glTranslate 0, -$self->{w}, 0;
1608
1609 ($w, $h) = ($h, $w);
1610 }
1611
1612 my $ycut = $self->{val} / ($self->{max_val} || 1);
1613 $ycut = 1 if $self->{val} > $self->{max_val};
1614
1615 my $t1 = $tex->[0];
1616 my $t2 = $tex->[1];
1617
1618 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1620 glEnable GL_TEXTURE_2D;
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1622
1623 my $h1 = $self->{h} - $ycut * $self->{h};
1624 my $h2 = $ycut * $self->{h};
1625
1626 glBindTexture GL_TEXTURE_2D, $t1->{name};
1627 glBegin GL_QUADS;
1628 glTexCoord 0 , 0; glVertex 0 , 0;
1629 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1630 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1631 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1303 glEnd; 1632 glEnd;
1304 1633
1305 if ($self->{state}) { 1634 glBindTexture GL_TEXTURE_2D, $t2->{name};
1306 glBegin GL_LINES; 1635 glBegin GL_QUADS;
1307 glVertex 0 , 0; 1636 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1308 glVertex $s, $s; 1637 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1309 glVertex $s, 0; 1638 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1310 glVertex 0 , $s; 1639 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1311 glEnd; 1640 glEnd;
1312 } 1641
1642 glDisable GL_BLEND;
1643 glDisable GL_TEXTURE_2D;
1644}
1645
1646#############################################################################
1647
1648package CFClient::UI::Gauge;
1649
1650our @ISA = CFClient::UI::VBox::;
1651
1652sub new {
1653 my ($class, %arg) = shift;
1654
1655 my $self = $class->SUPER::new (
1656 @_,
1657 );
1658
1659 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
1660 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1661 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
1662
1663 $self
1664}
1665
1666sub set_fontsize {
1667 my ($self, $fsize) = @_;
1668
1669 $self->{value}->set_fontsize ($fsize);
1670 $self->{max} ->set_fontsize ($fsize);
1671}
1672
1673sub set_value {
1674 my ($self, $val, $max) = @_;
1675
1676 $self->set_max ($max)
1677 if defined $max;
1678
1679 $self->{gauge}->set_value ($val, $max);
1680 $self->{value}->set_text ($val);
1681}
1682
1683sub set_max {
1684 my ($self, $max) = @_;
1685
1686 $self->{gauge}->set_max ($max);
1687 $self->{max}->set_text ($max);
1313} 1688}
1314 1689
1315############################################################################# 1690#############################################################################
1316 1691
1317package CFClient::UI::Slider; 1692package CFClient::UI::Slider;
1318 1693
1319use strict; 1694use strict;
1320 1695
1321use SDL::OpenGL; 1696use CFClient::OpenGL;
1322 1697
1323our @ISA = CFClient::UI::DrawBG::; 1698our @ISA = CFClient::UI::DrawBG::;
1324 1699
1325my @tex = 1700my @tex =
1326 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1701 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1336 # TODO: calculations are off 1711 # TODO: calculations are off
1337 my $self = $class->SUPER::new ( 1712 my $self = $class->SUPER::new (
1338 fg => [1, 1, 1], 1713 fg => [1, 1, 1],
1339 active_fg => [0, 0, 0], 1714 active_fg => [0, 0, 0],
1340 range => [0, 0, 100, 10], 1715 range => [0, 0, 100, 10],
1341 req_w => 40, 1716 req_w => 20,
1342 req_h => 13, 1717 req_h => 20,
1343 vertical => 0, 1718 vertical => 0,
1344 can_hover => 1, 1719 can_hover => 1,
1720 inner_pad => 5,
1345 @_ 1721 @_
1346 ); 1722 );
1347 1723
1348 $self 1724 $self
1349} 1725}
1370 if ($GRAB == $self) { 1746 if ($GRAB == $self) {
1371 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1747 my ($value, $lo, $hi, $page) = @{$self->{range}};
1372 1748
1373 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1749 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1374 1750
1751 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1752 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1753
1754 $x -= $inner_pad_px; # substract the padding
1375 $x = $x * ($hi - $lo) / $w + $lo; 1755 $x = $x * ($hi - $lo) / $inner_w + $lo;
1376 $x = $lo if $x < $lo; 1756 $x = $lo if $x < $lo;
1377 $x = $hi - $page if $x > $hi - $page; 1757 $x = $hi - $page if $x > $hi - $page;
1378 $self->{range}[0] = $x; 1758 $self->{range}[0] = $x;
1379 1759
1380 $self->emit (changed => $x); 1760 $self->emit (changed => $x);
1381 $self->update; 1761 $self->update;
1382 } 1762 }
1763}
1764
1765# the inner_* stuff is for generating a padding for the slider handle,
1766# so that the handle doesn't leave the texture. This calculation isn't 100%
1767# correct propably, but it does the job for now
1768sub _calc_inner_pad_px {
1769 my ($self, $w) = @_;
1770 ($w / 100) * $self->{inner_pad} # % to pixels
1383} 1771}
1384 1772
1385sub _draw { 1773sub _draw {
1386 my ($self) = @_; 1774 my ($self) = @_;
1387 1775
1401 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1789 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1402 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1790 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1403 1791
1404 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1792 my ($value, $lo, $hi, $page) = @{$self->{range}};
1405 1793
1406 # the inner_* stuff is for generating a padding for the slider handle, 1794 $hi = $value + 1 if $lo == $hi;
1407 # so that the handle doesn't leave the texture. This calculation isn't 100% 1795
1408 # correct propably, but it does the job for now 1796 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1409 my $inner_pad = 5; # 5% of width for slider bg texture border
1410 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1411 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1797 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1412 1798
1413 $page = int $page * $inner_w / ($hi - $lo); 1799 $page = int $page * $inner_w / ($hi - $lo);
1414 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1800 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1415 1801
1416 $w -= $page; 1802 $w -= $page;
1440 1826
1441package CFClient::UI::TextView; 1827package CFClient::UI::TextView;
1442 1828
1443our @ISA = CFClient::UI::HBox::; 1829our @ISA = CFClient::UI::HBox::;
1444 1830
1445use SDL::OpenGL; 1831use CFClient::OpenGL;
1446 1832
1447sub new { 1833sub new {
1448 my $class = shift; 1834 my $class = shift;
1449 1835
1450 my $self = $class->SUPER::new ( 1836 my $self = $class->SUPER::new (
1837 fontsize => 1,
1838 @_,
1839
1840 layout => (new CFClient::Layout),
1451 par => [], 1841 par => [],
1452 @_, 1842 height => 0,
1453 children => [ 1843 children => [
1454 (new CFClient::UI::Empty expand => 1), 1844 (new CFClient::UI::Empty expand => 1),
1455 (new CFClient::UI::Slider vertical => 1), 1845 (new CFClient::UI::Slider vertical => 1),
1456 ], 1846 ],
1457 ); 1847 );
1458 1848
1849 $self->{children}[1]->connect (changed => sub {
1850 $self->update;
1851 });
1852
1459 $self 1853 $self
1854}
1855
1856sub set_fontsize {
1857 my ($self, $fontsize) = @_;
1858
1859 $self->{fontsize} = $fontsize;
1860 $self->reflow;
1861}
1862
1863sub text_height {
1864 my ($self, $text) = @_;
1865
1866 my $layout = $self->{layout};
1867
1868 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1869 $layout->set_width ($self->{w});
1870 $layout->set_text ($text);
1871
1872 ($layout->size)[1]
1873}
1874
1875sub reflow {
1876 my ($self) = @_;
1877
1878 $self->{need_reflow}++;
1879 $self->update;
1880}
1881
1882sub size_allocate {
1883 my ($self, $w, $h) = @_;
1884
1885 $self->SUPER::size_allocate ($w, $h);
1886
1887 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1888 $self->{layout}->set_width ($self->{children}[0]{w});
1889
1890 $self->reflow;
1460} 1891}
1461 1892
1462sub add_paragraph { 1893sub add_paragraph {
1463 my ($self, $color, $text) = @_; 1894 my ($self, $color, $text) = @_;
1464 1895
1896 #TODO: intelligently "reformat" paragraph
1897
1898 my $height = $self->text_height ($text);
1899
1900 $self->{height} += $height;
1901
1465 push @{$self->{par}}, [$color, $text]; 1902 push @{$self->{par}}, [$height, $color, $text];
1466 my $count = scalar @{$self->{par}}; 1903
1467 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 1904 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1468 $self->{children}[1]->update; 1905 $self->{children}[1]->update;
1469} 1906}
1470 1907
1908sub update {
1909 my ($self) = @_;
1910
1911 $self->SUPER::update;
1912
1913 return unless $self->{h} > 0;
1914
1915 delete $self->{texture};
1916
1917 $ROOT->on_refresh ($self, sub {
1918 if (delete $self->{need_reflow}) {
1919 my $height = 0;
1920
1921 $height += $_->[0] = $self->text_height ($_->[2])
1922 for @{$self->{par}};
1923
1924 $self->{height} = $height;
1925
1926 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1927
1928 delete $self->{texture};
1929 }
1930
1931 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1932 glClearColor 0, 0, 0, 1;
1933 glClear GL_COLOR_BUFFER_BIT;
1934
1935 glEnable GL_BLEND;
1936 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939
1940 my $top = int $self->{children}[1]{range}[0];
1941
1942 my $y0 = $top;
1943 my $y1 = $top + $self->{h};
1944
1945 my $y = 0;
1946
1947 my $layout = $self->{layout};
1948
1949 for my $par (@{$self->{par}}) {
1950 my $h = $par->[0];
1951
1952 if ($y0 < $y + $h && $y < $y1) {
1953 $layout->set_text ($par->[2]);
1954
1955 glColor @{ $par->[1] };
1956 my ($W, $H) = $layout->size;
1957 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1958 }
1959
1960 $y += $h;
1961 }
1962
1963 glDisable GL_TEXTURE_2D;
1964 glDisable GL_BLEND;
1965 };
1966 });
1967}
1968
1471sub _draw { 1969sub _draw {
1472 my ($self) = @_; 1970 my ($self) = @_;
1473 1971
1474 my $par = $self->{par}; 1972 if ($self->{texture}) {
1475
1476 my $bottom = (scalar @$par) - 1;
1477
1478 my $w = $self->{children}[0]{w};
1479 my $y = $self->{h};
1480
1481 glEnable GL_BLEND;
1482 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1483 glEnable GL_TEXTURE_2D; 1973 glEnable GL_TEXTURE_2D;
1484 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1974 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1485 1975 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1486 # TODO: everything!
1487 while ($y > 0 && $bottom >= 0) {
1488 my $par = $par->[$bottom--];
1489
1490 my $layout = new CFClient::Layout;
1491
1492 $layout->set_height ($::FONTSIZE);
1493 $layout->set_width ($w);
1494 $layout->set_text ($par->[1]);
1495 my $tex = new_from_layout CFClient::Texture $layout;
1496 $y -= $tex->{h};
1497
1498 glColor @{ $par->[0] };
1499 $tex->draw_quad (0, $y);
1500 }
1501
1502 glDisable GL_TEXTURE_2D; 1976 glDisable GL_TEXTURE_2D;
1503 glDisable GL_BLEND;
1504}
1505
1506#############################################################################
1507
1508package CFClient::UI::MapWidget;
1509
1510use strict;
1511
1512use List::Util qw(min max);
1513
1514use SDL;
1515use SDL::OpenGL;
1516
1517our @ISA = CFClient::UI::Base::;
1518
1519sub new {
1520 my $class = shift;
1521
1522 $class->SUPER::new (
1523 z => -1,
1524 can_focus => 1,
1525 list => (glGenLists 1),
1526 @_
1527 ) 1977 }
1528}
1529 1978
1530sub key_down { 1979 $self->{children}[1]->draw;
1531 print "MAPKEYDOWN\n";
1532}
1533 1980
1534sub key_up {
1535}
1536
1537sub size_request {
1538 (
1539 1 + 32 * int $::WIDTH / 32,
1540 1 + 32 * int $::HEIGHT / 32,
1541 )
1542}
1543
1544sub update {
1545 my ($self) = @_;
1546
1547 $self->{need_update} = 1;
1548 $self->SUPER::update;
1549}
1550
1551sub draw {
1552 my ($self) = @_;
1553
1554 $self->{need_update}++;#d#
1555 if (delete $self->{need_update}) {
1556 glNewList $self->{list}, GL_COMPILE;
1557
1558 my $sw = int $::WIDTH / 32;
1559 my $sh = int $::HEIGHT / 32;
1560
1561 if ($::MAP) {
1562 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1563
1564 if ($::CFG->{fow_enable}) {
1565 if ($::CFG->{fow_smooth}) { # smooth fog of war
1566 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1567 glConvolutionFilter2D
1568 GL_CONVOLUTION_2D,
1569 GL_ALPHA,
1570 3, 3,
1571 GL_ALPHA, GL_FLOAT,
1572 pack "f*",
1573 0.1, 0.1, 0.1,
1574 0.1, 0.2, 0.1,
1575 0.1, 0.1, 0.1,
1576 ;
1577 glEnable GL_CONVOLUTION_2D;
1578 }
1579
1580 my $tex = new CFClient::Texture
1581 w => $w,
1582 h => $h,
1583 data => $data,
1584 internalformat => GL_ALPHA,
1585 format => GL_ALPHA;
1586
1587 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1588
1589 glEnable GL_BLEND;
1590 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1592
1593 glColor +($::CFG->{fow_intensity}) x 3, 1;
1594 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1595
1596 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND;
1598 }
1599 }
1600
1601 glEndList;
1602 }
1603
1604 glCallList $self->{list};
1605
1606 if ($FOCUS != $self) {
1607 glColor 64/255, 64/255, 64/255;
1608 glLogicOp GL_AND;
1609 glEnable GL_COLOR_LOGIC_OP;
1610 glBegin GL_QUADS;
1611 glVertex 0, 0;
1612 glVertex 0, $::HEIGHT;
1613 glVertex $::WIDTH, $::HEIGHT;
1614 glVertex $::WIDTH, 0;
1615 glEnd;
1616 glDisable GL_COLOR_LOGIC_OP;
1617 }
1618}
1619
1620my %DIR = (
1621 SDLK_KP8, [1, "north"],
1622 SDLK_KP9, [2, "northeast"],
1623 SDLK_KP6, [3, "east"],
1624 SDLK_KP3, [4, "southeast"],
1625 SDLK_KP2, [5, "south"],
1626 SDLK_KP1, [6, "southwest"],
1627 SDLK_KP4, [7, "west"],
1628 SDLK_KP7, [8, "northwest"],
1629
1630 SDLK_UP, [1, "north"],
1631 SDLK_RIGHT, [3, "east"],
1632 SDLK_DOWN, [5, "south"],
1633 SDLK_LEFT, [7, "west"],
1634);
1635
1636sub key_down {
1637 my ($self, $ev) = @_;
1638
1639 my $mod = $ev->key_mod;
1640 my $sym = $ev->key_sym;
1641
1642 if ($sym == SDLK_KP5) {
1643 $::CONN->user_send ("command stay fire");
1644 } elsif ($sym == SDLK_a) {
1645 $::CONN->user_send ("command apply");
1646 } elsif (exists $DIR{$sym}) {
1647 if ($mod & KMOD_SHIFT) {
1648 $self->{shft}++;
1649 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1650 } elsif ($mod & KMOD_CTRL) {
1651 $self->{ctrl}++;
1652 $::CONN->user_send ("command run $DIR{$sym}[0]");
1653 } else {
1654 $::CONN->user_send ("command $DIR{$sym}[1]");
1655 }
1656 }
1657}
1658
1659sub key_up {
1660 my ($self, $ev) = @_;
1661
1662 my $mod = $ev->key_mod;
1663 my $sym = $ev->key_sym;
1664
1665 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1666 $::CONN->user_send ("command fire_stop");
1667 }
1668 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1669 $::CONN->user_send ("command run_stop");
1670 }
1671} 1981}
1672 1982
1673############################################################################# 1983#############################################################################
1674 1984
1675package CFClient::UI::Animator; 1985package CFClient::UI::Animator;
1676 1986
1677use SDL::OpenGL; 1987use CFClient::OpenGL;
1678 1988
1679our @ISA = CFClient::UI::Bin::; 1989our @ISA = CFClient::UI::Bin::;
1680 1990
1681sub moveto { 1991sub moveto {
1682 my ($self, $x, $y) = @_; 1992 my ($self, $x, $y) = @_;
1738sub toggle_flopper { 2048sub toggle_flopper {
1739 my ($self) = @_; 2049 my ($self) = @_;
1740 2050
1741 # TODO: use animation 2051 # TODO: use animation
1742 if ($self->{state} = !$self->{state}) { 2052 if ($self->{state} = !$self->{state}) {
1743 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2053 $CFClient::UI::ROOT->add ($self->{other});
1744 $self->{other}->move ( 2054 $self->{other}->move ($self->coord2global (0, $self->{h}));
1745 ($::WIDTH - $self->{other}{w}) * 0.5, 2055 $self->emit ("open");
1746 ($::HEIGHT - $self->{other}{h}) * 0.5,
1747 );
1748 } else { 2056 } else {
1749 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2057 $CFClient::UI::ROOT->remove ($self->{other});
2058 $self->emit ("close");
1750 } 2059 }
1751}
1752 2060
1753############################################################################# 2061 $self->emit (changed => $self->{state});
2062}
1754 2063
2064#############################################################################
2065
1755package CFClient::UI::Toplevel; 2066package CFClient::UI::Root;
1756 2067
1757our @ISA = CFClient::UI::Container::; 2068our @ISA = CFClient::UI::Container::;
2069
2070use CFClient::OpenGL;
2071
2072sub check_size {
2073 my ($self) = @_;
2074
2075 $self->configure (0, 0, $::WITH, $::HEIGHT);
2076}
1758 2077
1759sub size_request { 2078sub size_request {
1760 ($::WIDTH, $::HEIGHT) 2079 ($::WIDTH, $::HEIGHT)
1761} 2080}
1762 2081
1763sub size_allocate { 2082sub configure {
1764 my ($self, $x, $y, $w, $h) = @_; 2083 my ($self, $x, $y, $w, $h) = @_;
1765 2084
1766 $self->_size_allocate ($x, $y, $w, $h); 2085 $self->SUPER::configure ($x, $y, $w, $h);
1767 2086
1768 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2087 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1769 for @{$self->{children}}; 2088 for @{$self->{children}};
1770} 2089}
1771 2090
1772sub translate { 2091sub _topleft {
1773 my ($self, $x, $y) = @_; 2092 my ($self, $x, $y) = @_;
1774 2093
1775 ($x, $y) 2094 ($x, $y)
1776} 2095}
1777 2096
1778sub update { 2097sub update {
1779 my ($self) = @_; 2098 my ($self) = @_;
1780 2099
1781 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2100 $self->check_size;
1782 ::refresh (); 2101 ::refresh ();
1783} 2102}
1784 2103
1785sub add { 2104sub add {
1786 my ($self, $widget) = @_; 2105 my ($self, $child) = @_;
1787 2106
2107 # integerize window positions
2108 $child->{x} = int $child->{x};
2109 $child->{y} = int $child->{y};
2110
1788 $self->SUPER::add ($widget); 2111 $self->SUPER::add ($child);
2112}
1789 2113
1790 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2114sub on_refresh {
2115 my ($self, $id, $cb) = @_;
2116
2117 $self->{refresh_hook}{$id} = $cb;
1791} 2118}
1792 2119
1793sub draw { 2120sub draw {
1794 my ($self) = @_; 2121 my ($self) = @_;
1795 2122
2123 while (my $rcb = delete $self->{refresh_hook}) {
2124 $_->() for values %$rcb;
2125 }
2126
2127 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2128 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2129 glClear GL_COLOR_BUFFER_BIT;
2130
2131 glMatrixMode GL_PROJECTION;
2132 glLoadIdentity;
2133 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2134 glMatrixMode GL_MODELVIEW;
2135 glLoadIdentity;
2136
1796 $self->_draw; 2137 $self->_draw;
1797} 2138}
1798 2139
1799############################################################################# 2140#############################################################################
1800 2141
1801package CFClient::UI; 2142package CFClient::UI;
1802 2143
1803$TOPLEVEL = new CFClient::UI::Toplevel; 2144$ROOT = new CFClient::UI::Root;
1804 2145
18051 21461
1806 2147

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines