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.104 by elmex, Fri Apr 14 14:02:52 2006 UTC vs.
Revision 1.146 by elmex, Fri Apr 21 15:03:46 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
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 += ($w - $w2) * 0.5;
158 $y += ($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};
… …
643 glColor @{ $self->{bg} }; 758 glColor @{ $self->{bg} };
644 759
645 $bg->{s} = $rep_x; 760 $bg->{s} = $rep_x;
646 $bg->{t} = $rep_y; 761 $bg->{t} = $rep_y;
647 $bg->{wrap_mode} = 1; 762 $bg->{wrap_mode} = 1;
648 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 763 $bg->draw_quad ($border, $border, $cw, $ch);
649 764
650 glDisable GL_TEXTURE_2D; 765 glDisable GL_TEXTURE_2D;
651 glDisable GL_BLEND; 766 glDisable GL_BLEND;
652 767
768 $self->{title}->draw if $self->{title};
653 $self->child->draw; 769 $self->child->draw;
654} 770}
655 771
656############################################################################# 772#############################################################################
657 773
… …
659 775
660our @ISA = CFClient::UI::Base::; 776our @ISA = CFClient::UI::Base::;
661 777
662use List::Util qw(max sum); 778use List::Util qw(max sum);
663 779
664use SDL::OpenGL; 780use CFClient::OpenGL;
665 781
666sub new { 782sub new {
667 my $class = shift; 783 my $class = shift;
668 784
669 $class->SUPER::new ( 785 $class->SUPER::new (
… …
671 @_ 787 @_
672 ) 788 )
673} 789}
674 790
675sub add { 791sub add {
676 my ($self, $x, $y, $chld) = @_; 792 my ($self, $x, $y, $child) = @_;
677 793
794 $child->set_parent ($self);
678 $self->{children}[$y][$x] = $chld; 795 $self->{children}[$y][$x] = $child;
679 $chld->set_parent ($self);
680 796
681 $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};
682 $self->update; 805 $self->update;
683} 806}
684 807
685sub get_wh { 808sub get_wh {
686 my ($self) = @_; 809 my ($self) = @_;
… …
714 (sum @$hs), 837 (sum @$hs),
715 ) 838 )
716} 839}
717 840
718sub size_allocate { 841sub size_allocate {
719 my ($self, $x, $y, $w, $h) = @_; 842 my ($self, $w, $h) = @_;
720
721 $self->_size_allocate ($x, $y, $w, $h) or return;
722 843
723 my ($ws, $hs) = $self->get_wh; 844 my ($ws, $hs) = $self->get_wh;
724 845
725 my $req_w = sum @$ws; 846 my $req_w = sum @$ws;
726 my $req_h = sum @$hs; 847 my $req_h = sum @$hs;
… …
731 my $col_expand = (sum @col_expand) || 1; 852 my $col_expand = (sum @col_expand) || 1;
732 853
733 # linearly scale sizes 854 # linearly scale sizes
734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 855 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735 $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;
736 860
737 my $y; 861 my $y;
738 862
739 for my $r (0 .. $#{$self->{children}}) { 863 for my $r (0 .. $#{$self->{children}}) {
740 my $row = $self->{children}[$r] 864 my $row = $self->{children}[$r]
… …
745 869
746 for my $c (0 .. $#$row) { 870 for my $c (0 .. $#$row) {
747 my $col_w = $ws->[$c]; 871 my $col_w = $ws->[$c];
748 872
749 if (my $widget = $row->[$c]) { 873 if (my $widget = $row->[$c]) {
750 $widget->size_allocate ($x, $y, $col_w, $row_h); 874 $widget->configure ($x, $y, $col_w, $row_h);
751 } 875 }
752 876
753 $x += $col_w; 877 $x += $col_w;
754 } 878 }
755 879
… …
800 (List::Util::max map $_->[1], @alloc), 924 (List::Util::max map $_->[1], @alloc),
801 ) 925 )
802} 926}
803 927
804sub size_allocate { 928sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
806
807 $self->_size_allocate ($x, $y, $w, $h);
808 930
809 ($h, $w) = ($w, $h); 931 ($h, $w) = ($w, $h);
810 932
811 my $children = $self->{children}; 933 my $children = $self->{children};
812 934
… …
828 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 950 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829 $h[$_] = $alloc_h; 951 $h[$_] = $alloc_h;
830 } 952 }
831 } 953 }
832 954
955 CFClient::UI::harmonize \@h;
956
833 my $y = 0; 957 my $y = 0;
834 for (0 .. $#$children) { 958 for (0 .. $#$children) {
835 my $child = $children->[$_]; 959 my $child = $children->[$_];
836 my $h = $h[$_]; 960 my $h = $h[$_];
837 $child->size_allocate ($y, 0, $h, $w); 961 $child->configure ($y, 0, $h, $w);
838 962
839 $y += $h; 963 $y += $h;
840 } 964 }
965
966 1
841} 967}
842 968
843############################################################################# 969#############################################################################
844 970
845package CFClient::UI::VBox; 971package CFClient::UI::VBox;
… …
858 (List::Util::sum map $_->[1], @alloc), 984 (List::Util::sum map $_->[1], @alloc),
859 ) 985 )
860} 986}
861 987
862sub size_allocate { 988sub size_allocate {
863 my ($self, $x, $y, $w, $h) = @_; 989 my ($self, $w, $h) = @_;
864
865 $self->_size_allocate ($x, $y, $w, $h);
866 990
867 my $children = $self->{children}; 991 my $children = $self->{children};
868 992
869 my @h = map +($_->size_request)[1], @$children; 993 my @h = map +($_->size_request)[1], @$children;
870 994
… …
882 1006
883 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1007 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
884 } 1008 }
885 } 1009 }
886 1010
1011 CFClient::UI::harmonize \@h;
1012
887 my $y = 0; 1013 my $y = 0;
888 for (0 .. $#$children) { 1014 for (0 .. $#$children) {
889 my $child = $children->[$_]; 1015 my $child = $children->[$_];
890 my $h = $h[$_]; 1016 my $h = $h[$_];
891 $child->size_allocate (0, $y, $w, $h); 1017 $child->configure (0, $y, $w, $h);
892 1018
893 $y += $h; 1019 $y += $h;
894 } 1020 }
1021
1022 1
895} 1023}
896 1024
897############################################################################# 1025#############################################################################
898 1026
899package CFClient::UI::Label; 1027package CFClient::UI::Label;
900 1028
901our @ISA = CFClient::UI::Base::; 1029our @ISA = CFClient::UI::Base::;
902 1030
903use SDL::OpenGL; 1031use CFClient::OpenGL;
904 1032
905sub new { 1033sub new {
906 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
907 1035
908 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
909 fg => [1, 1, 1], 1037 fg => [1, 1, 1],
910 height => $::FONTSIZE, 1038 fontsize => 1,
911 text => "", 1039 text => "",
912 align => -1, 1040 align => -1,
1041 valign => -1,
913 padding => 2, 1042 padding => 2,
914 layout => new CFClient::Layout, 1043 layout => new CFClient::Layout,
915 %arg 1044 %arg
916 ); 1045 );
917 1046
918 $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};
919 1055
920 $self 1056 $self
921} 1057}
922 1058
923sub escape_text { 1059sub escape_text {
… …
931} 1067}
932 1068
933sub set_text { 1069sub set_text {
934 my ($self, $text) = @_; 1070 my ($self, $text) = @_;
935 1071
936 $self->{text} = $text;
937 $self->{layout}->set_markup ($text); 1072 $self->{layout}->set_text ($text);
938 1073
939 delete $self->{texture}; 1074 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
941 $self->update; 1075 $self->update;
942} 1076}
943 1077
944sub get_text { 1078sub set_markup {
945 my ($self, $text) = @_; 1079 my ($self, $markup) = @_;
946 1080
947 $self->{text} 1081 $self->{layout}->set_markup ($markup);
1082
1083 delete $self->{texture};
1084 $self->update;
948} 1085}
949 1086
950sub size_request { 1087sub size_request {
951 my ($self) = @_; 1088 my ($self) = @_;
952 1089
953 $self->{layout}->set_width; 1090 $self->{layout}->set_width;
954 $self->{layout}->set_height ($self->{height}); 1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092
955 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 }
956 1103
957 ( 1104 (
958 $w + $self->{padding} * 2, 1105 $w + $self->{padding} * 2,
959 $h + $self->{padding} * 2, 1106 $h + $self->{padding} * 2,
960 ) 1107 )
961} 1108}
962 1109
963sub size_allocate { 1110sub size_allocate {
964 my ($self, $x, $y, $w, $h) = @_; 1111 my ($self, $w, $h) = @_;
965
966 $self->_size_allocate ($x, $y, $w, $h) or return;
967 1112
968 delete $self->{texture}; 1113 delete $self->{texture};
969} 1114}
970 1115
971sub update { 1116sub set_fontsize {
972 my ($self) = @_; 1117 my ($self, $fontsize) = @_;
973 1118
974 delete $self->{texture}; 1119 $self->{fontsize} = $fontsize;
975 $self->SUPER::update; 1120 $self->update;
976} 1121}
977 1122
978sub _draw { 1123sub _draw {
979 my ($self) = @_; 1124 my ($self) = @_;
980 1125
981 my $tex = $self->{texture} ||= do { 1126 my $tex = $self->{texture} ||= do {
982 $self->{layout}->set_width ($self->{w}); 1127 $self->{layout}->set_width ($self->{w});
983 $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);
984 new_from_layout CFClient::Texture $self->{layout} 1129 new_from_layout CFClient::Texture $self->{layout}
985 }; 1130 };
986 1131
987 glEnable GL_BLEND; 1132 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1133 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989 glEnable GL_TEXTURE_2D; 1134 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1135 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991 1136
992 glColor @{$self->{fg}}; 1137 glColor @{$self->{fg}};
993 1138
994 my $x = 1139 $self->{ox} = int (
995 $self->{align} < 0 ? $self->{padding} 1140 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1141 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5; 1142 : ($self->{w} - $tex->{w}) * 0.5
1143 );
998 1144
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1145 $self->{oy} = int (
1000 $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});
1001 1152
1002 glDisable GL_TEXTURE_2D; 1153 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND; 1154 glDisable GL_BLEND;
1004} 1155}
1005 1156
1006############################################################################# 1157#############################################################################
1007 1158
1008package CFClient::UI::Entry; 1159package CFClient::UI::EntryBase;
1009 1160
1010our @ISA = CFClient::UI::Label::; 1161our @ISA = CFClient::UI::Label::;
1011 1162
1012use SDL; 1163use CFClient::OpenGL;
1013use SDL::OpenGL;
1014 1164
1015sub new { 1165sub new {
1016 my $class = shift; 1166 my $class = shift;
1017 1167
1018 $class->SUPER::new ( 1168 $class->SUPER::new (
… …
1020 bg => [0, 0, 0, 0.2], 1170 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5], 1171 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0], 1172 active_fg => [0, 0, 0],
1023 can_hover => 1, 1173 can_hover => 1,
1024 can_focus => 1, 1174 can_focus => 1,
1175 valign => 0,
1025 @_ 1176 @_
1026 ) 1177 )
1027} 1178}
1028 1179
1029sub _set_text { 1180sub _set_text {
1030 my ($self, $text) = @_; 1181 my ($self, $text) = @_;
1031 1182
1032 my $old_text = $self->{text}; 1183 delete $self->{cur_h};
1184
1185 return if $self->{text} eq $text;
1186
1187 delete $self->{texture};
1033 1188
1034 $self->{last_activity} = $::NOW; 1189 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text; 1190 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1039 1191
1040 $text =~ s/./*/g if $self->{hidden}; 1192 $text =~ s/./*/g if $self->{hidden};
1193 $self->{layout}->set_text ("$text ");
1041 1194
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1195 $self->emit (changed => $self->{text});
1196}
1043 1197
1044 $text = substr $text, 0, $self->{cursor}; 1198sub get_text {
1045 utf8::encode $text; 1199 $_[0]{text}
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1051} 1200}
1052 1201
1053sub size_request { 1202sub size_request {
1054 my ($self) = @_; 1203 my ($self) = @_;
1055 1204
… …
1057 1206
1058 ($w + 1, $h) # add 1 for cursor 1207 ($w + 1, $h) # add 1 for cursor
1059} 1208}
1060 1209
1061sub size_allocate { 1210sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_; 1211 my ($self, $w, $h) = @_;
1063
1064 $self->SUPER::size_allocate ($x, $y, $w, $h);
1065 1212
1066 $self->_set_text ($self->{text}); 1213 $self->_set_text ($self->{text});
1067} 1214}
1068 1215
1069sub set_text { 1216sub set_text {
… …
1075} 1222}
1076 1223
1077sub key_down { 1224sub key_down {
1078 my ($self, $ev) = @_; 1225 my ($self, $ev) = @_;
1079 1226
1080 my $mod = $ev->key_mod; 1227 my $mod = $ev->{mod};
1081 my $sym = $ev->key_sym; 1228 my $sym = $ev->{sym};
1082
1083 my $uni = $ev->key_unicode; 1229 my $uni = $ev->{unicode};
1084 1230
1085 my $text = $self->get_text; 1231 my $text = $self->get_text;
1086 1232
1087 if ($sym == SDLK_BACKSPACE) { 1233 if ($sym == 8) {
1088 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1234 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089 } elsif ($sym == SDLK_DELETE) { 1235 } elsif ($sym == 127) {
1090 substr $text, $self->{cursor}, 1, ""; 1236 substr $text, $self->{cursor}, 1, "";
1091 } elsif ($sym == SDLK_LEFT) { 1237 } elsif ($sym == CFClient::SDLK_LEFT) {
1092 --$self->{cursor} if $self->{cursor}; 1238 --$self->{cursor} if $self->{cursor};
1093 } elsif ($sym == SDLK_RIGHT) { 1239 } elsif ($sym == CFClient::SDLK_RIGHT) {
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1240 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) { 1241 } elsif ($sym == CFClient::SDLK_HOME) {
1096 $self->{cursor} = 0; 1242 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) { 1243 } elsif ($sym == CFClient::SDLK_END) {
1098 $self->{cursor} = length $text; 1244 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) { 1245 } elsif ($sym == 27) {
1100 $self->emit ('escape'); 1246 $self->emit ('escape');
1101 } elsif ($uni) { 1247 } elsif ($uni) {
1102 substr $text, $self->{cursor}++, 0, chr $uni; 1248 substr $text, $self->{cursor}++, 0, chr $uni;
1103 } 1249 }
1104 1250
… …
1159 1305
1160 $self->SUPER::_draw; 1306 $self->SUPER::_draw;
1161 1307
1162 #TODO: force update every cursor change :( 1308 #TODO: force update every cursor change :(
1163 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
1164 glColor @{$self->{fg}}; 1318 glColor @{$self->{fg}};
1165 glBegin GL_LINES; 1319 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 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};
1168 glEnd; 1322 glEnd;
1169 } 1323 }
1170} 1324}
1171 1325
1172package CFClient::UI::LineEntry; 1326package CFClient::UI::Entry;
1173 1327
1174our @ISA = CFClient::UI::Entry::; 1328our @ISA = CFClient::UI::EntryBase::;
1175 1329
1176use SDL; 1330use CFClient::OpenGL;
1177use SDL::OpenGL;
1178 1331
1179sub key_down { 1332sub key_down {
1180 my ($self, $ev) = @_; 1333 my ($self, $ev) = @_;
1181 1334
1182 my $sym = $ev->key_sym; 1335 my $sym = $ev->{sym};
1183 1336
1184 if ($sym == SDLK_RETURN) { 1337 if ($sym == 13) {
1185 $self->emit (activate => $self->get_text); 1338 $self->emit (activate => $self->get_text);
1186 $self->update; 1339 $self->update;
1187 1340
1188 } else { 1341 } else {
1189 $self->SUPER::key_down ($ev); 1342 $self->SUPER::key_down ($ev);
… …
1195 1348
1196package CFClient::UI::Button; 1349package CFClient::UI::Button;
1197 1350
1198our @ISA = CFClient::UI::Label::; 1351our @ISA = CFClient::UI::Label::;
1199 1352
1200use SDL; 1353use CFClient::OpenGL;
1201use SDL::OpenGL;
1202 1354
1203my @tex = 1355my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1205 qw(b1_button_active.png); 1357 qw(b1_button_active.png);
1206 1358
1207sub new { 1359sub new {
1208 my $class = shift; 1360 my $class = shift;
1209 1361
1210 $class->SUPER::new ( 1362 $class->SUPER::new (
1211 padding => 4, 1363 padding => 4,
1212 fg => [1, 1, 1], 1364 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2], 1365 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0], 1366 active_fg => [0, 0, 1],
1215 can_hover => 1, 1367 can_hover => 1,
1368 align => 0,
1369 valign => 0,
1216 @_ 1370 @_
1217 ) 1371 )
1218} 1372}
1219 1373
1220sub button_up { 1374sub button_up {
… …
1228 1382
1229sub _draw { 1383sub _draw {
1230 my ($self) = @_; 1384 my ($self) = @_;
1231 1385
1232 local $self->{fg} = $self->{fg}; 1386 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
1234
1235 glEnable GL_BLEND;
1236 glEnable GL_TEXTURE_2D;
1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238 1387
1239 if ($GRAB == $self) { 1388 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg}; 1389 $self->{fg} = $self->{active_fg};
1241 } 1390 }
1242 1391
1243 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;
1244 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;
1245 1397
1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1398 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247 1399
1248 glDisable GL_TEXTURE_2D; 1400 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND; 1401 glDisable GL_BLEND;
1250 1402
1251 $self->SUPER::_draw; 1403 $self->SUPER::_draw;
… …
1256package CFClient::UI::CheckBox; 1408package CFClient::UI::CheckBox;
1257 1409
1258our @ISA = CFClient::UI::DrawBG::; 1410our @ISA = CFClient::UI::DrawBG::;
1259 1411
1260my @tex = 1412my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1413 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1414 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263 1415
1264use SDL; 1416use CFClient::OpenGL;
1265use SDL::OpenGL;
1266 1417
1267sub new { 1418sub new {
1268 my $class = shift; 1419 my $class = shift;
1269 1420
1270 $class->SUPER::new ( 1421 $class->SUPER::new (
… …
1281 my ($self) = @_; 1432 my ($self) = @_;
1282 1433
1283 ($self->{padding} * 2 + 6) x 2 1434 ($self->{padding} * 2 + 6) x 2
1284} 1435}
1285 1436
1286sub size_allocate {
1287 my ($self, $x, $y, $w, $h) = @_;
1288
1289 $self->_size_allocate ($x, $y, $w, $h);
1290}
1291
1292sub button_down { 1437sub button_down {
1293 my ($self, $ev, $x, $y) = @_; 1438 my ($self, $ev, $x, $y) = @_;
1294 1439
1295 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1440 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1441 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1322 glDisable GL_BLEND; 1467 glDisable GL_BLEND;
1323} 1468}
1324 1469
1325############################################################################# 1470#############################################################################
1326 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 $self->{aspect} = $tex->{w} / $tex->{h};
1494
1495 $self
1496}
1497
1498sub size_request {
1499 my ($self) = @_;
1500
1501 ($self->{tex}->{w}, $self->{tex}->{h})
1502}
1503
1504sub _draw {
1505 my ($self) = @_;
1506
1507 my $tex = $self->{tex};
1508
1509 my ($w, $h) = ($self->{w}, $self->{h});
1510
1511 if ($self->{rot90}) {
1512 glRotate 90, 0, 0, 1;
1513 glTranslate 0, -$self->{w}, 0;
1514
1515 ($w, $h) = ($h, $w);
1516 }
1517
1518 glEnable GL_BLEND;
1519 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1520 glEnable GL_TEXTURE_2D;
1521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1522
1523 $tex->draw_quad (0, 0, $w, $h);
1524
1525 glDisable GL_BLEND;
1526 glDisable GL_TEXTURE_2D;
1527}
1528
1529#############################################################################
1530
1531package CFClient::UI::VGauge;
1532
1533our @ISA = CFClient::UI::Base::;
1534
1535use CFClient::OpenGL;
1536
1537my %tex = (
1538 food => [
1539 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1540 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1541 ],
1542 grace => [
1543 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1544 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1545 ],
1546 hp => [
1547 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1548 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1549 ],
1550 mana => [
1551 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1552 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1553 ],
1554);
1555
1556# eg. VGauge->new (gauge => 'food'), default gauge: food
1557sub new {
1558 my $class = shift;
1559
1560 my $self = $class->SUPER::new (
1561 type => 'food',
1562 @_
1563 );
1564
1565 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1566
1567 $self
1568}
1569
1570sub size_request {
1571 my ($self) = @_;
1572
1573 #my $tex = $tex{$self->{type}}[0];
1574 #@$tex{qw(w h)}
1575 (0, 0)
1576}
1577
1578sub set_max {
1579 my ($self, $max) = @_;
1580
1581 $self->{max_val} = $max;
1582}
1583
1584sub set_value {
1585 my ($self, $val, $max) = @_;
1586
1587 $self->set_max ($max)
1588 if defined $max;
1589
1590 $max = $self->{max_val};
1591 $self->{val} = $val;
1592
1593 $self->update;
1594}
1595
1596sub _draw {
1597 my ($self) = @_;
1598
1599 my $tex = $tex{$self->{type}};
1600
1601 my ($w, $h) = ($self->{w}, $self->{h});
1602
1603 if ($self->{vertical}) {
1604 glRotate 90, 0, 0, 1;
1605 glTranslate 0, -$self->{w}, 0;
1606
1607 ($w, $h) = ($h, $w);
1608 }
1609
1610 my $ycut = $self->{val} / ($self->{max_val} || 1);
1611 $ycut = 1 if $self->{val} > $self->{max_val};
1612
1613 my $t1 = $tex->[0];
1614 my $t2 = $tex->[1];
1615
1616 glEnable GL_BLEND;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618 glEnable GL_TEXTURE_2D;
1619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620
1621 my $h1 = $self->{h} - $ycut * $self->{h};
1622 my $h2 = $ycut * $self->{h};
1623
1624 glBindTexture GL_TEXTURE_2D, $t1->{name};
1625 glBegin GL_QUADS;
1626 glTexCoord 0 , 0; glVertex 0 , 0;
1627 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1628 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1629 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1630 glEnd;
1631
1632 glBindTexture GL_TEXTURE_2D, $t2->{name};
1633 glBegin GL_QUADS;
1634 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1635 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1636 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1637 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1638 glEnd;
1639
1640 glDisable GL_BLEND;
1641 glDisable GL_TEXTURE_2D;
1642}
1643
1644#############################################################################
1645
1646package CFClient::UI::Gauge;
1647
1648our @ISA = CFClient::UI::VBox::;
1649
1650sub new {
1651 my ($class, %arg) = shift;
1652
1653 my $self = $class->SUPER::new (
1654 @_,
1655 );
1656
1657 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
1658 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1659 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
1660
1661 $self
1662}
1663
1664sub set_fontsize {
1665 my ($self, $fsize) = @_;
1666
1667 $self->{value}->set_fontsize ($fsize);
1668 $self->{max} ->set_fontsize ($fsize);
1669 $self->update;
1670}
1671
1672sub set_value {
1673 my ($self, $val, $max) = @_;
1674
1675 $self->set_max ($max)
1676 if defined $max;
1677
1678 $self->{gauge}->set_value ($val, $max);
1679 $self->{value}->set_text ($val);
1680}
1681
1682sub set_max {
1683 my ($self, $max) = @_;
1684
1685 $self->{gauge}->set_max ($max);
1686 $self->{max}->set_text ($max);
1687}
1688
1689#############################################################################
1690
1327package CFClient::UI::Slider; 1691package CFClient::UI::Slider;
1328 1692
1329use strict; 1693use strict;
1330 1694
1331use SDL::OpenGL; 1695use CFClient::OpenGL;
1332 1696
1333our @ISA = CFClient::UI::DrawBG::; 1697our @ISA = CFClient::UI::DrawBG::;
1334 1698
1335my @tex = 1699my @tex =
1336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1700 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1346 # TODO: calculations are off 1710 # TODO: calculations are off
1347 my $self = $class->SUPER::new ( 1711 my $self = $class->SUPER::new (
1348 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1349 active_fg => [0, 0, 0], 1713 active_fg => [0, 0, 0],
1350 range => [0, 0, 100, 10], 1714 range => [0, 0, 100, 10],
1351 req_w => 40, 1715 req_w => 20,
1352 req_h => 13, 1716 req_h => 20,
1353 vertical => 0, 1717 vertical => 0,
1354 can_hover => 1, 1718 can_hover => 1,
1355 inner_pad => 5, 1719 inner_pad => 5,
1356 @_ 1720 @_
1357 ); 1721 );
… …
1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1788 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1789 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426 1790
1427 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1791 my ($value, $lo, $hi, $page) = @{$self->{range}};
1428 1792
1793 $hi = $value + 1 if $lo == $hi;
1794
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 1795 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1796 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431 1797
1432 $page = int $page * $inner_w / ($hi - $lo); 1798 $page = int $page * $inner_w / ($hi - $lo);
1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1799 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
… …
1459 1825
1460package CFClient::UI::TextView; 1826package CFClient::UI::TextView;
1461 1827
1462our @ISA = CFClient::UI::HBox::; 1828our @ISA = CFClient::UI::HBox::;
1463 1829
1464use SDL::OpenGL; 1830use CFClient::OpenGL;
1465 1831
1466sub new { 1832sub new {
1467 my $class = shift; 1833 my $class = shift;
1468 1834
1469 my $self = $class->SUPER::new ( 1835 my $self = $class->SUPER::new (
1836 fontsize => 1,
1837 @_,
1838
1839 layout => (new CFClient::Layout),
1470 par => [], 1840 par => [],
1471 @_, 1841 height => 0,
1472 children => [ 1842 children => [
1473 (new CFClient::UI::Empty expand => 1), 1843 (new CFClient::UI::Empty expand => 1),
1474 (new CFClient::UI::Slider vertical => 1), 1844 (new CFClient::UI::Slider vertical => 1),
1475 ], 1845 ],
1476 ); 1846 );
1477 1847
1848 $self->{children}[1]->connect (changed => sub {
1849 $self->update;
1850 });
1851
1478 $self 1852 $self
1853}
1854
1855sub set_fontsize {
1856 my ($self, $fontsize) = @_;
1857
1858 $self->{fontsize} = $fontsize;
1859 $self->reflow;
1860}
1861
1862sub text_height {
1863 my ($self, $text) = @_;
1864
1865 my $layout = $self->{layout};
1866
1867 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1868 $layout->set_width ($self->{w});
1869 $layout->set_text ($text);
1870
1871 ($layout->size)[1]
1872}
1873
1874sub reflow {
1875 my ($self) = @_;
1876
1877 $self->{need_reflow}++;
1878 $self->update;
1879}
1880
1881sub size_allocate {
1882 my ($self, $w, $h) = @_;
1883
1884 $self->SUPER::size_allocate ($w, $h);
1885
1886 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1887 $self->{layout}->set_width ($self->{children}[0]{w});
1888
1889 $self->reflow;
1479} 1890}
1480 1891
1481sub add_paragraph { 1892sub add_paragraph {
1482 my ($self, $color, $text) = @_; 1893 my ($self, $color, $text) = @_;
1483 1894
1895 #TODO: intelligently "reformat" paragraph
1896
1897 my $height = $self->text_height ($text);
1898
1899 $self->{height} += $height;
1900
1484 push @{$self->{par}}, [$color, $text]; 1901 push @{$self->{par}}, [$height, $color, $text];
1485 my $count = scalar @{$self->{par}}; 1902
1486 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 1903 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1487 $self->{children}[1]->update; 1904 $self->{children}[1]->update;
1488} 1905}
1489 1906
1907sub update {
1908 my ($self) = @_;
1909
1910 $self->SUPER::update;
1911
1912 return unless $self->{h} > 0;
1913
1914 delete $self->{texture};
1915
1916 $ROOT->on_refresh ($self, sub {
1917 if (delete $self->{need_reflow}) {
1918 my $height = 0;
1919
1920 $height += $_->[0] = $self->text_height ($_->[2])
1921 for @{$self->{par}};
1922
1923 $self->{height} = $height;
1924
1925 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1926
1927 delete $self->{texture};
1928 }
1929
1930 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1931 glClearColor 0, 0, 0, 1;
1932 glClear GL_COLOR_BUFFER_BIT;
1933
1934 glEnable GL_BLEND;
1935 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1936 glEnable GL_TEXTURE_2D;
1937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1938
1939 my $top = int $self->{children}[1]{range}[0];
1940
1941 my $y0 = $top;
1942 my $y1 = $top + $self->{h};
1943
1944 my $y = 0;
1945
1946 my $layout = $self->{layout};
1947
1948 for my $par (@{$self->{par}}) {
1949 my $h = $par->[0];
1950
1951 if ($y0 < $y + $h && $y < $y1) {
1952 $layout->set_text ($par->[2]);
1953
1954 glColor @{ $par->[1] };
1955 my ($W, $H) = $layout->size;
1956 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1957 }
1958
1959 $y += $h;
1960 }
1961
1962 glDisable GL_TEXTURE_2D;
1963 glDisable GL_BLEND;
1964 };
1965 });
1966}
1967
1490sub _draw { 1968sub _draw {
1491 my ($self) = @_; 1969 my ($self) = @_;
1492 1970
1493 my $par = $self->{par}; 1971 if ($self->{texture}) {
1494
1495 my $bottom = (scalar @$par) - 1;
1496
1497 my $w = $self->{children}[0]{w};
1498 my $y = $self->{h};
1499
1500 glEnable GL_BLEND;
1501 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1502 glEnable GL_TEXTURE_2D; 1972 glEnable GL_TEXTURE_2D;
1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1973 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1504 1974 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1505 # TODO: everything!
1506 while ($y > 0 && $bottom >= 0) {
1507 my $par = $par->[$bottom--];
1508
1509 my $layout = new CFClient::Layout;
1510
1511 $layout->set_height ($::FONTSIZE);
1512 $layout->set_width ($w);
1513 $layout->set_text ($par->[1]);
1514 my $tex = new_from_layout CFClient::Texture $layout;
1515 $y -= $tex->{h};
1516
1517 glColor @{ $par->[0] };
1518 $tex->draw_quad (0, $y);
1519 }
1520
1521 glDisable GL_TEXTURE_2D; 1975 glDisable GL_TEXTURE_2D;
1522 glDisable GL_BLEND;
1523}
1524
1525#############################################################################
1526
1527package CFClient::UI::MapWidget;
1528
1529use strict;
1530
1531use List::Util qw(min max);
1532
1533use SDL;
1534use SDL::OpenGL;
1535
1536our @ISA = CFClient::UI::Base::;
1537
1538sub new {
1539 my $class = shift;
1540
1541 $class->SUPER::new (
1542 z => -1,
1543 can_focus => 1,
1544 list => (glGenLists 1),
1545 @_
1546 ) 1976 }
1547}
1548 1977
1549sub key_down { 1978 $self->{children}[1]->draw;
1550 print "MAPKEYDOWN\n";
1551}
1552 1979
1553sub key_up {
1554}
1555
1556sub size_request {
1557 (
1558 1 + 32 * int $::WIDTH / 32,
1559 1 + 32 * int $::HEIGHT / 32,
1560 )
1561}
1562
1563sub update {
1564 my ($self) = @_;
1565
1566 $self->{need_update} = 1;
1567 $self->SUPER::update;
1568}
1569
1570sub draw {
1571 my ($self) = @_;
1572
1573 $self->{need_update}++;#d#
1574 if (delete $self->{need_update}) {
1575 glNewList $self->{list}, GL_COMPILE;
1576
1577 my $sw = int $::WIDTH / 32;
1578 my $sh = int $::HEIGHT / 32;
1579
1580 if ($::MAP) {
1581 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1582
1583 if ($::CFG->{fow_enable}) {
1584 if ($::CFG->{fow_smooth}) { # smooth fog of war
1585 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1586 glConvolutionFilter2D
1587 GL_CONVOLUTION_2D,
1588 GL_ALPHA,
1589 3, 3,
1590 GL_ALPHA, GL_FLOAT,
1591 pack "f*",
1592 0.1, 0.1, 0.1,
1593 0.1, 0.2, 0.1,
1594 0.1, 0.1, 0.1,
1595 ;
1596 glEnable GL_CONVOLUTION_2D;
1597 }
1598
1599 my $tex = new CFClient::Texture
1600 w => $w,
1601 h => $h,
1602 data => $data,
1603 internalformat => GL_ALPHA,
1604 format => GL_ALPHA;
1605
1606 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1607
1608 glEnable GL_BLEND;
1609 glEnable GL_TEXTURE_2D;
1610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1611
1612 glColor +($::CFG->{fow_intensity}) x 3, 1;
1613 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1614
1615 glDisable GL_TEXTURE_2D;
1616 glDisable GL_BLEND;
1617 }
1618 }
1619
1620 glEndList;
1621 }
1622
1623 glCallList $self->{list};
1624
1625 if ($FOCUS != $self) {
1626 glColor 64/255, 64/255, 64/255;
1627 glLogicOp GL_AND;
1628 glEnable GL_COLOR_LOGIC_OP;
1629 glBegin GL_QUADS;
1630 glVertex 0, 0;
1631 glVertex 0, $::HEIGHT;
1632 glVertex $::WIDTH, $::HEIGHT;
1633 glVertex $::WIDTH, 0;
1634 glEnd;
1635 glDisable GL_COLOR_LOGIC_OP;
1636 }
1637}
1638
1639my %DIR = (
1640 SDLK_KP8, [1, "north"],
1641 SDLK_KP9, [2, "northeast"],
1642 SDLK_KP6, [3, "east"],
1643 SDLK_KP3, [4, "southeast"],
1644 SDLK_KP2, [5, "south"],
1645 SDLK_KP1, [6, "southwest"],
1646 SDLK_KP4, [7, "west"],
1647 SDLK_KP7, [8, "northwest"],
1648
1649 SDLK_UP, [1, "north"],
1650 SDLK_RIGHT, [3, "east"],
1651 SDLK_DOWN, [5, "south"],
1652 SDLK_LEFT, [7, "west"],
1653);
1654
1655sub key_down {
1656 my ($self, $ev) = @_;
1657
1658 my $mod = $ev->key_mod;
1659 my $sym = $ev->key_sym;
1660
1661 if ($sym == SDLK_KP5) {
1662 $::CONN->user_send ("command stay fire");
1663 } elsif ($sym == SDLK_a) {
1664 $::CONN->user_send ("command apply");
1665 } elsif ($sym == SDLK_QUOTE) {
1666 $self->emit ('activate_console');
1667 } elsif ($sym == SDLK_SLASH) {
1668 $self->emit ('activate_console' => '/');
1669 } elsif (exists $DIR{$sym}) {
1670 if ($mod & KMOD_SHIFT) {
1671 $self->{shft}++;
1672 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1673 } elsif ($mod & KMOD_CTRL) {
1674 $self->{ctrl}++;
1675 $::CONN->user_send ("command run $DIR{$sym}[0]");
1676 } else {
1677 $::CONN->user_send ("command $DIR{$sym}[1]");
1678 }
1679 }
1680}
1681
1682sub key_up {
1683 my ($self, $ev) = @_;
1684
1685 my $mod = $ev->key_mod;
1686 my $sym = $ev->key_sym;
1687
1688 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1689 $::CONN->user_send ("command fire_stop");
1690 }
1691 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1692 $::CONN->user_send ("command run_stop");
1693 }
1694} 1980}
1695 1981
1696############################################################################# 1982#############################################################################
1697 1983
1698package CFClient::UI::Animator; 1984package CFClient::UI::Animator;
1699 1985
1700use SDL::OpenGL; 1986use CFClient::OpenGL;
1701 1987
1702our @ISA = CFClient::UI::Bin::; 1988our @ISA = CFClient::UI::Bin::;
1703 1989
1704sub moveto { 1990sub moveto {
1705 my ($self, $x, $y) = @_; 1991 my ($self, $x, $y) = @_;
… …
1761sub toggle_flopper { 2047sub toggle_flopper {
1762 my ($self) = @_; 2048 my ($self) = @_;
1763 2049
1764 # TODO: use animation 2050 # TODO: use animation
1765 if ($self->{state} = !$self->{state}) { 2051 if ($self->{state} = !$self->{state}) {
1766 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2052 $CFClient::UI::ROOT->add ($self->{other});
1767 $self->{other}->move ( 2053 $self->{other}->move ($self->coord2global (0, $self->{h}));
1768 ($::WIDTH - $self->{other}{w}) * 0.5, 2054 $self->emit ("open");
1769 ($::HEIGHT - $self->{other}{h}) * 0.5,
1770 );
1771 } else { 2055 } else {
1772 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2056 $CFClient::UI::ROOT->remove ($self->{other});
2057 $self->emit ("close");
1773 } 2058 }
1774}
1775 2059
1776############################################################################# 2060 $self->emit (changed => $self->{state});
2061}
1777 2062
2063#############################################################################
2064
1778package CFClient::UI::Toplevel; 2065package CFClient::UI::Root;
1779 2066
1780our @ISA = CFClient::UI::Container::; 2067our @ISA = CFClient::UI::Container::;
2068
2069use CFClient::OpenGL;
2070
2071sub check_size {
2072 my ($self) = @_;
2073
2074 $self->configure (0, 0, $::WITH, $::HEIGHT);
2075}
1781 2076
1782sub size_request { 2077sub size_request {
1783 ($::WIDTH, $::HEIGHT) 2078 ($::WIDTH, $::HEIGHT)
1784} 2079}
1785 2080
1786sub size_allocate { 2081sub configure {
1787 my ($self, $x, $y, $w, $h) = @_; 2082 my ($self, $x, $y, $w, $h) = @_;
1788 2083
1789 $self->_size_allocate ($x, $y, $w, $h); 2084 $self->SUPER::configure ($x, $y, $w, $h);
1790 2085
1791 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2086 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1792 for @{$self->{children}}; 2087 for @{$self->{children}};
1793} 2088}
1794 2089
1795sub translate { 2090sub _topleft {
1796 my ($self, $x, $y) = @_; 2091 my ($self, $x, $y) = @_;
1797 2092
1798 ($x, $y) 2093 ($x, $y)
1799} 2094}
1800 2095
1801sub update { 2096sub update {
1802 my ($self) = @_; 2097 my ($self) = @_;
1803 2098
1804 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2099 $self->check_size;
1805 ::refresh (); 2100 ::refresh ();
1806} 2101}
1807 2102
1808sub add { 2103sub add {
1809 my ($self, $widget) = @_; 2104 my ($self, $child) = @_;
1810 2105
2106 # integerize window positions
2107 $child->{x} = int $child->{x};
2108 $child->{y} = int $child->{y};
2109
1811 $self->SUPER::add ($widget); 2110 $self->SUPER::add ($child);
2111}
1812 2112
1813 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2113sub on_refresh {
2114 my ($self, $id, $cb) = @_;
2115
2116 $self->{refresh_hook}{$id} = $cb;
1814} 2117}
1815 2118
1816sub draw { 2119sub draw {
1817 my ($self) = @_; 2120 my ($self) = @_;
1818 2121
2122 while (my $rcb = delete $self->{refresh_hook}) {
2123 $_->() for values %$rcb;
2124 }
2125
2126 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2127 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2128 glClear GL_COLOR_BUFFER_BIT;
2129
2130 glMatrixMode GL_PROJECTION;
2131 glLoadIdentity;
2132 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2133 glMatrixMode GL_MODELVIEW;
2134 glLoadIdentity;
2135
1819 $self->_draw; 2136 $self->_draw;
1820} 2137}
1821 2138
1822############################################################################# 2139#############################################################################
1823 2140
1824package CFClient::UI; 2141package CFClient::UI;
1825 2142
1826$TOPLEVEL = new CFClient::UI::Toplevel; 2143$ROOT = new CFClient::UI::Root;
1827 2144
18281 21451
1829 2146

Diff Legend

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