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.103 by elmex, Fri Apr 14 13:51:36 2006 UTC vs.
Revision 1.143 by root, Thu Apr 20 21:28:51 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 $_ }
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}
970
971sub update {
972 my ($self) = @_;
973
974 delete $self->{texture};
975 $self->SUPER::update;
976} 1114}
977 1115
978sub _draw { 1116sub _draw {
979 my ($self) = @_; 1117 my ($self) = @_;
980 1118
981 my $tex = $self->{texture} ||= do { 1119 my $tex = $self->{texture} ||= do {
982 $self->{layout}->set_width ($self->{w}); 1120 $self->{layout}->set_width ($self->{w});
983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1121 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
984 new_from_layout CFClient::Texture $self->{layout} 1122 new_from_layout CFClient::Texture $self->{layout}
985 }; 1123 };
986 1124
987 glEnable GL_BLEND; 1125 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1126 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989 glEnable GL_TEXTURE_2D; 1127 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1128 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991 1129
992 glColor @{$self->{fg}}; 1130 glColor @{$self->{fg}};
993 1131
994 my $x = 1132 $self->{ox} = int (
995 $self->{align} < 0 ? $self->{padding} 1133 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1134 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5; 1135 : ($self->{w} - $tex->{w}) * 0.5
1136 );
998 1137
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1138 $self->{oy} = int (
1000 $tex->draw_quad (0, 0); 1139 $self->{valign} < 0 ? $self->{padding}
1140 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1141 : ($self->{h} - $tex->{h}) * 0.5
1142 );
1143
1144 $tex->draw_quad ($self->{ox}, $self->{oy});
1001 1145
1002 glDisable GL_TEXTURE_2D; 1146 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND; 1147 glDisable GL_BLEND;
1004} 1148}
1005 1149
1006############################################################################# 1150#############################################################################
1007 1151
1008package CFClient::UI::Entry; 1152package CFClient::UI::EntryBase;
1009 1153
1010our @ISA = CFClient::UI::Label::; 1154our @ISA = CFClient::UI::Label::;
1011 1155
1012use SDL; 1156use CFClient::OpenGL;
1013use SDL::OpenGL;
1014 1157
1015sub new { 1158sub new {
1016 my $class = shift; 1159 my $class = shift;
1017 1160
1018 $class->SUPER::new ( 1161 $class->SUPER::new (
… …
1020 bg => [0, 0, 0, 0.2], 1163 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5], 1164 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0], 1165 active_fg => [0, 0, 0],
1023 can_hover => 1, 1166 can_hover => 1,
1024 can_focus => 1, 1167 can_focus => 1,
1168 valign => 0,
1025 @_ 1169 @_
1026 ) 1170 )
1027} 1171}
1028 1172
1029sub _set_text { 1173sub _set_text {
1030 my ($self, $text) = @_; 1174 my ($self, $text) = @_;
1031 1175
1032 my $old_text = $self->{text}; 1176 delete $self->{cur_h};
1177
1178 return if $self->{text} eq $text;
1179
1180 delete $self->{texture};
1033 1181
1034 $self->{last_activity} = $::NOW; 1182 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text; 1183 $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 1184
1040 $text =~ s/./*/g if $self->{hidden}; 1185 $text =~ s/./*/g if $self->{hidden};
1186 $self->{layout}->set_text ("$text ");
1041 1187
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1188 $self->emit (changed => $self->{text});
1189}
1043 1190
1044 $text = substr $text, 0, $self->{cursor}; 1191sub get_text {
1045 utf8::encode $text; 1192 $_[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} 1193}
1052 1194
1053sub size_request { 1195sub size_request {
1054 my ($self) = @_; 1196 my ($self) = @_;
1055 1197
… …
1057 1199
1058 ($w + 1, $h) # add 1 for cursor 1200 ($w + 1, $h) # add 1 for cursor
1059} 1201}
1060 1202
1061sub size_allocate { 1203sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
1063
1064 $self->SUPER::size_allocate ($x, $y, $w, $h);
1065 1205
1066 $self->_set_text ($self->{text}); 1206 $self->_set_text ($self->{text});
1067} 1207}
1068 1208
1069sub set_text { 1209sub set_text {
… …
1075} 1215}
1076 1216
1077sub key_down { 1217sub key_down {
1078 my ($self, $ev) = @_; 1218 my ($self, $ev) = @_;
1079 1219
1080 my $mod = $ev->key_mod; 1220 my $mod = $ev->{mod};
1081 my $sym = $ev->key_sym; 1221 my $sym = $ev->{sym};
1082
1083 my $uni = $ev->key_unicode; 1222 my $uni = $ev->{unicode};
1084 1223
1085 my $text = $self->get_text; 1224 my $text = $self->get_text;
1086 1225
1087 if ($sym == SDLK_BACKSPACE) { 1226 if ($sym == 8) {
1088 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1227 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089 } elsif ($sym == SDLK_DELETE) { 1228 } elsif ($sym == 127) {
1090 substr $text, $self->{cursor}, 1, ""; 1229 substr $text, $self->{cursor}, 1, "";
1091 } elsif ($sym == SDLK_LEFT) { 1230 } elsif ($sym == CFClient::SDLK_LEFT) {
1092 --$self->{cursor} if $self->{cursor}; 1231 --$self->{cursor} if $self->{cursor};
1093 } elsif ($sym == SDLK_RIGHT) { 1232 } elsif ($sym == CFClient::SDLK_RIGHT) {
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1233 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) { 1234 } elsif ($sym == CFClient::SDLK_HOME) {
1096 $self->{cursor} = 0; 1235 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) { 1236 } elsif ($sym == CFClient::SDLK_END) {
1098 $self->{cursor} = length $text; 1237 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) { 1238 } elsif ($sym == 27) {
1100 $self->emit ('escape'); 1239 $self->emit ('escape');
1101 } elsif ($uni) { 1240 } elsif ($uni) {
1102 substr $text, $self->{cursor}++, 0, chr $uni; 1241 substr $text, $self->{cursor}++, 0, chr $uni;
1103 } 1242 }
1104 1243
… …
1159 1298
1160 $self->SUPER::_draw; 1299 $self->SUPER::_draw;
1161 1300
1162 #TODO: force update every cursor change :( 1301 #TODO: force update every cursor change :(
1163 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1302 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1303
1304 unless (exists $self->{cur_h}) {
1305 my $text = substr $self->{text}, 0, $self->{cursor};
1306 utf8::encode $text;
1307
1308 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1309 }
1310
1164 glColor @{$self->{fg}}; 1311 glColor @{$self->{fg}};
1165 glBegin GL_LINES; 1312 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1313 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1314 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1168 glEnd; 1315 glEnd;
1169 } 1316 }
1170} 1317}
1171 1318
1172package CFClient::UI::LineEntry; 1319package CFClient::UI::Entry;
1173 1320
1174our @ISA = CFClient::UI::Entry::; 1321our @ISA = CFClient::UI::EntryBase::;
1175 1322
1176use SDL; 1323use CFClient::OpenGL;
1177use SDL::OpenGL;
1178 1324
1179sub key_down { 1325sub key_down {
1180 my ($self, $ev) = @_; 1326 my ($self, $ev) = @_;
1181 1327
1182 my $sym = $ev->key_sym; 1328 my $sym = $ev->{sym};
1183 1329
1184 if ($sym == SDLK_RETURN) { 1330 if ($sym == 13) {
1185 $self->emit (activate => $self->get_text); 1331 $self->emit (activate => $self->get_text);
1186 $self->update; 1332 $self->update;
1187 1333
1188 } else { 1334 } else {
1189 $self->SUPER::key_down ($ev); 1335 $self->SUPER::key_down ($ev);
… …
1195 1341
1196package CFClient::UI::Button; 1342package CFClient::UI::Button;
1197 1343
1198our @ISA = CFClient::UI::Label::; 1344our @ISA = CFClient::UI::Label::;
1199 1345
1200use SDL; 1346use CFClient::OpenGL;
1201use SDL::OpenGL;
1202 1347
1203my @tex = 1348my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1349 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1205 qw(b1_button_active.png); 1350 qw(b1_button_active.png);
1206 1351
… …
1209 1354
1210 $class->SUPER::new ( 1355 $class->SUPER::new (
1211 padding => 4, 1356 padding => 4,
1212 fg => [1, 1, 1], 1357 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2], 1358 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0], 1359 active_fg => [0, 0, 1],
1215 can_hover => 1, 1360 can_hover => 1,
1361 align => 0,
1362 valign => 0,
1216 @_ 1363 @_
1217 ) 1364 )
1218} 1365}
1219 1366
1220sub button_up { 1367sub button_up {
… …
1228 1375
1229sub _draw { 1376sub _draw {
1230 my ($self) = @_; 1377 my ($self) = @_;
1231 1378
1232 local $self->{fg} = $self->{fg}; 1379 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 1380
1239 if ($GRAB == $self) { 1381 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg}; 1382 $self->{fg} = $self->{active_fg};
1241 } 1383 }
1242 1384
1243 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1385 glEnable GL_BLEND;
1386 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1387 glEnable GL_TEXTURE_2D;
1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1389 glColor 0, 0, 0, 1;
1245 1390
1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1391 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247 1392
1248 glDisable GL_TEXTURE_2D; 1393 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND; 1394 glDisable GL_BLEND;
1250 1395
1251 $self->SUPER::_draw; 1396 $self->SUPER::_draw;
… …
1259 1404
1260my @tex = 1405my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1407 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263 1408
1264use SDL; 1409use CFClient::OpenGL;
1265use SDL::OpenGL;
1266 1410
1267sub new { 1411sub new {
1268 my $class = shift; 1412 my $class = shift;
1269 1413
1270 $class->SUPER::new ( 1414 $class->SUPER::new (
… …
1281 my ($self) = @_; 1425 my ($self) = @_;
1282 1426
1283 ($self->{padding} * 2 + 6) x 2 1427 ($self->{padding} * 2 + 6) x 2
1284} 1428}
1285 1429
1286sub size_allocate {
1287 my ($self, $x, $y, $w, $h) = @_;
1288
1289 $self->_size_allocate ($x, $y, $w, $h);
1290}
1291
1292sub button_down { 1430sub button_down {
1293 my ($self, $ev, $x, $y) = @_; 1431 my ($self, $ev, $x, $y) = @_;
1294 1432
1295 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1433 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1434 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1322 glDisable GL_BLEND; 1460 glDisable GL_BLEND;
1323} 1461}
1324 1462
1325############################################################################# 1463#############################################################################
1326 1464
1465package CFClient::UI::VGauge;
1466
1467our @ISA = CFClient::UI::Base::;
1468
1469use CFClient::OpenGL;
1470
1471my %tex = (
1472 food => [
1473 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1474 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1475 ],
1476 grace => [
1477 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1478 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1479 ],
1480 hp => [
1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1482 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1483 ],
1484 mana => [
1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1486 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1487 ],
1488);
1489
1490# eg. VGauge->new (gauge => 'food'), default gauge: food
1491sub new {
1492 my $class = shift;
1493
1494 my $self = $class->SUPER::new (
1495 type => 'food',
1496 @_
1497 );
1498
1499 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1500
1501 $self
1502}
1503
1504sub size_request {
1505 my ($self) = @_;
1506
1507 #my $tex = $tex{$self->{type}}[0];
1508 #@$tex{qw(w h)}
1509 (0, 0)
1510}
1511
1512sub set_max {
1513 my ($self, $max) = @_;
1514
1515 $self->{max_val} = $max;
1516}
1517
1518sub set_value {
1519 my ($self, $val, $max) = @_;
1520
1521 $self->set_max ($max)
1522 if defined $max;
1523
1524 $max = $self->{max_val};
1525 $self->{val} = $val;
1526
1527 $self->update;
1528}
1529
1530sub _draw {
1531 my ($self) = @_;
1532
1533 my $tex = $tex{$self->{type}};
1534
1535 my ($w, $h) = ($self->{w}, $self->{h});
1536
1537 if ($self->{vertical}) {
1538 glRotate 90, 0, 0, 1;
1539 glTranslate 0, -$self->{w}, 0;
1540
1541 ($w, $h) = ($h, $w);
1542 }
1543
1544 my $ycut = $self->{val} / ($self->{max_val} || 1);
1545 $ycut = 1 if $self->{val} > $self->{max_val};
1546
1547 my $t1 = $tex->[0];
1548 my $t2 = $tex->[1];
1549
1550 glEnable GL_BLEND;
1551 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1552 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554
1555 my $h1 = $self->{h} - $ycut * $self->{h};
1556 my $h2 = $ycut * $self->{h};
1557
1558 glBindTexture GL_TEXTURE_2D, $t1->{name};
1559 glBegin GL_QUADS;
1560 glTexCoord 0 , 0; glVertex 0 , 0;
1561 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1562 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1563 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1564 glEnd;
1565
1566 glBindTexture GL_TEXTURE_2D, $t2->{name};
1567 glBegin GL_QUADS;
1568 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1569 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1570 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1571 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1572 glEnd;
1573
1574 glDisable GL_BLEND;
1575 glDisable GL_TEXTURE_2D;
1576}
1577
1578#############################################################################
1579
1580package CFClient::UI::Gauge;
1581
1582our @ISA = CFClient::UI::VBox::;
1583
1584sub new {
1585 my ($class, %arg) = shift;
1586
1587 my $self = $class->SUPER::new (
1588 @_,
1589 );
1590
1591 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
1592 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1593 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
1594
1595 $self
1596}
1597
1598sub set_value {
1599 my ($self, $val, $max) = @_;
1600
1601 $self->set_max ($max)
1602 if defined $max;
1603
1604 $self->{gauge}->set_value ($val, $max);
1605 $self->{value}->set_text ($val);
1606}
1607
1608sub set_max {
1609 my ($self, $max) = @_;
1610
1611 $self->{gauge}->set_max ($max);
1612 $self->{max}->set_text ($max);
1613}
1614
1615#############################################################################
1616
1327package CFClient::UI::Slider; 1617package CFClient::UI::Slider;
1328 1618
1329use strict; 1619use strict;
1330 1620
1331use SDL::OpenGL; 1621use CFClient::OpenGL;
1332 1622
1333our @ISA = CFClient::UI::DrawBG::; 1623our @ISA = CFClient::UI::DrawBG::;
1334 1624
1335my @tex = 1625my @tex =
1336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1346 # TODO: calculations are off 1636 # TODO: calculations are off
1347 my $self = $class->SUPER::new ( 1637 my $self = $class->SUPER::new (
1348 fg => [1, 1, 1], 1638 fg => [1, 1, 1],
1349 active_fg => [0, 0, 0], 1639 active_fg => [0, 0, 0],
1350 range => [0, 0, 100, 10], 1640 range => [0, 0, 100, 10],
1351 req_w => 40, 1641 req_w => 20,
1352 req_h => 13, 1642 req_h => 20,
1353 vertical => 0, 1643 vertical => 0,
1354 can_hover => 1, 1644 can_hover => 1,
1355 inner_pad => 5, 1645 inner_pad => 5,
1356 @_ 1646 @_
1357 ); 1647 );
… …
1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1714 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1715 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426 1716
1427 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1717 my ($value, $lo, $hi, $page) = @{$self->{range}};
1428 1718
1719 $hi = $value + 1 if $lo == $hi;
1720
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 1721 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1722 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431 1723
1432 $page = int $page * $inner_w / ($hi - $lo); 1724 $page = int $page * $inner_w / ($hi - $lo);
1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1725 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
… …
1459 1751
1460package CFClient::UI::TextView; 1752package CFClient::UI::TextView;
1461 1753
1462our @ISA = CFClient::UI::HBox::; 1754our @ISA = CFClient::UI::HBox::;
1463 1755
1464use SDL::OpenGL; 1756use CFClient::OpenGL;
1465 1757
1466sub new { 1758sub new {
1467 my $class = shift; 1759 my $class = shift;
1468 1760
1469 my $self = $class->SUPER::new ( 1761 my $self = $class->SUPER::new (
1762 fontsize => 1,
1763 @_,
1764
1765 layout => (new CFClient::Layout),
1470 par => [], 1766 par => [],
1471 @_, 1767 height => 0,
1472 children => [ 1768 children => [
1473 (new CFClient::UI::Empty expand => 1), 1769 (new CFClient::UI::Empty expand => 1),
1474 (new CFClient::UI::Slider vertical => 1), 1770 (new CFClient::UI::Slider vertical => 1),
1475 ], 1771 ],
1476 ); 1772 );
1477 1773
1774 $self->{children}[1]->connect (changed => sub {
1775 $self->update;
1776 });
1777
1478 $self 1778 $self
1779}
1780
1781sub set_fontsize {
1782 my ($self, $fontsize) = @_;
1783
1784 $self->{fontsize} = $fontsize;
1785 $self->reflow;
1786}
1787
1788sub text_height {
1789 my ($self, $text) = @_;
1790
1791 my $layout = $self->{layout};
1792
1793 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1794 $layout->set_width ($self->{w});
1795 $layout->set_text ($text);
1796
1797 ($layout->size)[1]
1798}
1799
1800sub reflow {
1801 my ($self) = @_;
1802
1803 $self->{need_reflow}++;
1804 $self->update;
1805}
1806
1807sub size_allocate {
1808 my ($self, $w, $h) = @_;
1809
1810 $self->SUPER::size_allocate ($w, $h);
1811
1812 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1813 $self->{layout}->set_width ($self->{children}[0]{w});
1814
1815 $self->reflow;
1479} 1816}
1480 1817
1481sub add_paragraph { 1818sub add_paragraph {
1482 my ($self, $color, $text) = @_; 1819 my ($self, $color, $text) = @_;
1483 1820
1821 #TODO: intelligently "reformat" paragraph
1822
1823 my $height = $self->text_height ($text);
1824
1825 $self->{height} += $height;
1826
1484 push @{$self->{par}}, [$color, $text]; 1827 push @{$self->{par}}, [$height, $color, $text];
1485 my $count = scalar @{$self->{par}}; 1828
1486 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 1829 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1487 $self->{children}[1]->update; 1830 $self->{children}[1]->update;
1488} 1831}
1489 1832
1833sub update {
1834 my ($self) = @_;
1835
1836 $self->SUPER::update;
1837
1838 return unless $self->{h} > 0;
1839
1840 delete $self->{texture};
1841
1842 $ROOT->on_refresh ($self, sub {
1843 if (delete $self->{need_reflow}) {
1844 my $height = 0;
1845
1846 $height += $_->[0] = $self->text_height ($_->[2])
1847 for @{$self->{par}};
1848
1849 $self->{height} = $height;
1850
1851 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1852
1853 delete $self->{texture};
1854 }
1855
1856 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1857 glClearColor 0, 0, 0, 1;
1858 glClear GL_COLOR_BUFFER_BIT;
1859
1860 glEnable GL_BLEND;
1861 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1862 glEnable GL_TEXTURE_2D;
1863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1864
1865 my $top = int $self->{children}[1]{range}[0];
1866
1867 my $y0 = $top;
1868 my $y1 = $top + $self->{h};
1869
1870 my $y = 0;
1871
1872 my $layout = $self->{layout};
1873
1874 for my $par (@{$self->{par}}) {
1875 my $h = $par->[0];
1876
1877 if ($y0 < $y + $h && $y < $y1) {
1878 $layout->set_text ($par->[2]);
1879
1880 glColor @{ $par->[1] };
1881 my ($W, $H) = $layout->size;
1882 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1883 }
1884
1885 $y += $h;
1886 }
1887
1888 glDisable GL_TEXTURE_2D;
1889 glDisable GL_BLEND;
1890 };
1891 });
1892}
1893
1490sub _draw { 1894sub _draw {
1491 my ($self) = @_; 1895 my ($self) = @_;
1492 1896
1493 my $par = $self->{par}; 1897 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; 1898 glEnable GL_TEXTURE_2D;
1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1504 1900 $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; 1901 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 ) 1902 }
1547}
1548 1903
1549sub key_down { 1904 $self->{children}[1]->draw;
1550 print "MAPKEYDOWN\n";
1551}
1552 1905
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 (exists $DIR{$sym}) {
1668 if ($mod & KMOD_SHIFT) {
1669 $self->{shft}++;
1670 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1671 } elsif ($mod & KMOD_CTRL) {
1672 $self->{ctrl}++;
1673 $::CONN->user_send ("command run $DIR{$sym}[0]");
1674 } else {
1675 $::CONN->user_send ("command $DIR{$sym}[1]");
1676 }
1677 }
1678}
1679
1680sub key_up {
1681 my ($self, $ev) = @_;
1682
1683 my $mod = $ev->key_mod;
1684 my $sym = $ev->key_sym;
1685
1686 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1687 $::CONN->user_send ("command fire_stop");
1688 }
1689 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1690 $::CONN->user_send ("command run_stop");
1691 }
1692} 1906}
1693 1907
1694############################################################################# 1908#############################################################################
1695 1909
1696package CFClient::UI::Animator; 1910package CFClient::UI::Animator;
1697 1911
1698use SDL::OpenGL; 1912use CFClient::OpenGL;
1699 1913
1700our @ISA = CFClient::UI::Bin::; 1914our @ISA = CFClient::UI::Bin::;
1701 1915
1702sub moveto { 1916sub moveto {
1703 my ($self, $x, $y) = @_; 1917 my ($self, $x, $y) = @_;
… …
1759sub toggle_flopper { 1973sub toggle_flopper {
1760 my ($self) = @_; 1974 my ($self) = @_;
1761 1975
1762 # TODO: use animation 1976 # TODO: use animation
1763 if ($self->{state} = !$self->{state}) { 1977 if ($self->{state} = !$self->{state}) {
1764 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1978 $CFClient::UI::ROOT->add ($self->{other});
1765 $self->{other}->move ( 1979 $self->{other}->move ($self->coord2global (0, $self->{h}));
1766 ($::WIDTH - $self->{other}{w}) * 0.5, 1980 $self->emit ("open");
1767 ($::HEIGHT - $self->{other}{h}) * 0.5,
1768 );
1769 } else { 1981 } else {
1770 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1982 $CFClient::UI::ROOT->remove ($self->{other});
1983 $self->emit ("close");
1771 } 1984 }
1772}
1773 1985
1774############################################################################# 1986 $self->emit (changed => $self->{state});
1987}
1775 1988
1989#############################################################################
1990
1776package CFClient::UI::Toplevel; 1991package CFClient::UI::Root;
1777 1992
1778our @ISA = CFClient::UI::Container::; 1993our @ISA = CFClient::UI::Container::;
1994
1995use CFClient::OpenGL;
1996
1997sub check_size {
1998 my ($self) = @_;
1999
2000 $self->configure (0, 0, $::WITH, $::HEIGHT);
2001}
1779 2002
1780sub size_request { 2003sub size_request {
1781 ($::WIDTH, $::HEIGHT) 2004 ($::WIDTH, $::HEIGHT)
1782} 2005}
1783 2006
1784sub size_allocate { 2007sub configure {
1785 my ($self, $x, $y, $w, $h) = @_; 2008 my ($self, $x, $y, $w, $h) = @_;
1786 2009
1787 $self->_size_allocate ($x, $y, $w, $h); 2010 $self->SUPER::configure ($x, $y, $w, $h);
1788 2011
1789 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2012 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1790 for @{$self->{children}}; 2013 for @{$self->{children}};
1791} 2014}
1792 2015
1793sub translate { 2016sub _topleft {
1794 my ($self, $x, $y) = @_; 2017 my ($self, $x, $y) = @_;
1795 2018
1796 ($x, $y) 2019 ($x, $y)
1797} 2020}
1798 2021
1799sub update { 2022sub update {
1800 my ($self) = @_; 2023 my ($self) = @_;
1801 2024
1802 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2025 $self->check_size;
1803 ::refresh (); 2026 ::refresh ();
1804} 2027}
1805 2028
1806sub add { 2029sub add {
1807 my ($self, $widget) = @_; 2030 my ($self, $child) = @_;
1808 2031
1809 $self->SUPER::add ($widget); 2032 $self->SUPER::add ($child);
2033}
1810 2034
1811 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2035sub on_refresh {
2036 my ($self, $id, $cb) = @_;
2037
2038 $self->{refresh_hook}{$id} = $cb;
1812} 2039}
1813 2040
1814sub draw { 2041sub draw {
1815 my ($self) = @_; 2042 my ($self) = @_;
1816 2043
2044 while (my $rcb = delete $self->{refresh_hook}) {
2045 $_->() for values %$rcb;
2046 }
2047
2048 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2049 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2050 glClear GL_COLOR_BUFFER_BIT;
2051
2052 glMatrixMode GL_PROJECTION;
2053 glLoadIdentity;
2054 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2055 glMatrixMode GL_MODELVIEW;
2056 glLoadIdentity;
2057
1817 $self->_draw; 2058 $self->_draw;
1818} 2059}
1819 2060
1820############################################################################# 2061#############################################################################
1821 2062
1822package CFClient::UI; 2063package CFClient::UI;
1823 2064
1824$TOPLEVEL = new CFClient::UI::Toplevel; 2065$ROOT = new CFClient::UI::Root;
1825 2066
18261 20671
1827 2068

Diff Legend

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