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

Diff Legend

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