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.106 by root, Fri Apr 14 15:14:25 2006 UTC vs.
Revision 1.140 by root, Thu Apr 20 04:20:52 2006 UTC

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

Diff Legend

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