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

Diff Legend

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